Customise aviso rendering

.gitignore

@@ -21,6 +21,7 @@ ecflow_*.files
 ecflow_*.cflags
 ecflow_*.cxxflags
 CMakeLists.txt.user
+.qtc_clangd/
 
 #vscode
 .vscode

Viewer/ecflowUI/src/NodeViewDelegate.cpp

@@ -10,6 +10,8 @@
 
 #include "NodeViewDelegate.hpp"
 
+#include <algorithm>
+
 #include <QApplication>
 #include <QDebug>
 #include <QImageReader>
@@ -84,6 +86,8 @@ NodeViewDelegate::NodeViewDelegate(QWidget* parent) : QStyledItemDelegate(parent
         errPix_    = QPixmap(QPixmap::fromImage(img));
     }
 
+    avisoPixId_ = IconProvider::add(":/viewer/aviso.svg", "aviso");
+
     grad_.setCoordinateMode(QGradient::ObjectBoundingMode);
     grad_.setStart(0, 0);
     grad_.setFinalStop(0, 1);
@@ -666,13 +670,14 @@ void NodeViewDelegate::renderAviso(QPainter* painter,
                                    QStringList data,
                                    const QStyleOptionViewItem& option,
                                    QSize& size) const {
+
     int totalWidth = 0;
     size           = QSize(totalWidth, attrBox_->fullHeight);
 
     if (data.count() < 2)
         return;
 
-    QString name = data.at(1) + ":";
+    QString name = data.at(1); // + ":";
     QString val;
     if (data.count() > 2)
         val = data.at(2);
@@ -688,6 +693,7 @@ void NodeViewDelegate::renderAviso(QPainter* painter,
     int currentRight = contRect.x();
     int multiCnt     = val.count('\n');
 
+    QRect avisoRect;
     QRect nameRect;
     QRect valRect, valRestRect;
 
@@ -697,11 +703,16 @@ void NodeViewDelegate::renderAviso(QPainter* painter,
     QString valFirst, valRest;
     QString full;
 
+    auto avisoPix = IconProvider::pixmapToHeight(avisoPixId_,  contRect.height());
+    avisoRect  = contRect.adjusted(attrBox_->leftPadding, 0, 0, 0);
+    avisoRect.setWidth(avisoPix.width());
+
     if (multiCnt == 0) {
         // The text rectangle
         QFontMetrics fm(nameFont);
         int nameWidth = ViewerUtil::textWidth(fm, name);
-        nameRect      = contRect.adjusted(attrBox_->leftPadding, 0, 0, 0);
+        nameRect      = contRect;
+        nameRect.setX(avisoRect.x() + avisoRect.width() + attrBox_->spacing);
         nameRect.setWidth(nameWidth);
 
         // The value rectangle
@@ -718,7 +729,8 @@ void NodeViewDelegate::renderAviso(QPainter* painter,
         // The text rectangle
         QFontMetrics fm(nameFont);
         int nameWidth = ViewerUtil::textWidth(fm, name);
-        nameRect      = contRect.adjusted(attrBox_->leftPadding, 0, 0, 0);
+        nameRect      = contRect;
+        nameRect.setX(avisoRect.x() + avisoRect.width() + attrBox_->spacing);
         nameRect.setWidth(nameWidth);
         nameRect.setHeight(attrBox_->height - attrBox_->topPadding - attrBox_->bottomPadding);
 
@@ -781,6 +793,9 @@ void NodeViewDelegate::renderAviso(QPainter* painter,
         }
     }
 
+    // aviso pixmap
+    painter->drawPixmap(avisoRect, avisoPix);
+
     // Draw name
     painter->setPen(fontPen);
     painter->setFont(nameFont);

Viewer/ecflowUI/src/NodeViewDelegate.hpp

@@ -246,6 +246,7 @@ class NodeViewDelegate : public QStyledItemDelegate, public VPropertyObserver {
     QPen holdingTimeFontPen_;
     QPen holdingDateFontPen_;
 
+    int avisoPixId_;
     int holdingTimePixId_;
     int holdingDatePixId_;
 

Viewer/ecflowUI/src/viewer.qrc

@@ -43,6 +43,7 @@
     <file alias="add_tab.svg">../images/add_tab.svg</file> 
     <file alias="add_variable_column.svg">../images/add_variable_column.svg</file>    
     <file alias="attribute.svg">../images/attribute.svg</file>
+    <file alias="aviso.svg">../images/aviso.svg</file>
     <file alias="autoscroll.svg">../images/autoscroll.svg</file>
     <file alias="autoscroll_off.svg">../images/autoscroll_off.svg</file>
     <file alias="chain.svg">../images/chain.svg</file>