Release 5.13.1

ecmwf · Jun 28, 2024 · cd9a1c3 · cd9a1c3
2 parents bca22b9 + dae5d82
commit cd9a1c3
Show file tree

Hide file tree

Showing 35 changed files with 637 additions and 109 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,8 +24,9 @@ endif()
 
 find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild /workspace/ecbuild) # Before project()
 
-# this will generate variables, see ACore/ecflow_version.h.in
-project( ecflow LANGUAGES CXX VERSION 5.13.0 )
+project( ecflow LANGUAGES CXX VERSION 5.13.1 )
+
+# Important: the project version is used, as generated CMake variables, to filter .../ecflow/core/ecflow_version.h.in
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 

diff --git a/Viewer/ecflowUI/images/mirrorvar.svg b/Viewer/ecflowUI/images/mirrorvar.svg
diff --git a/Viewer/ecflowUI/src/NodeExpression.cpp b/Viewer/ecflowUI/src/NodeExpression.cpp
@@ -821,7 +821,7 @@ bool NodeAttributeCondition::execute(VItem* item) {
             return !node->avisos().empty();
         }
         else if (nodeAttrName_ == "has_mirror") {
-            return !node->mirrors().empty();
+            return node->isMirror();
         }
     }
 

diff --git a/Viewer/ecflowUI/src/NodeQueryViewDelegate.cpp b/Viewer/ecflowUI/src/NodeQueryViewDelegate.cpp
@@ -130,9 +130,11 @@ void NodeQueryViewDelegate::paint(QPainter* painter,
             if (lst.count() > 0) {
                 QMap<QString, AttributeRendererProc>::const_iterator it = attrRenderers_.find(lst.at(0));
                 if (it != attrRenderers_.end()) {
+                    auto fg = index.data(Qt::ForegroundRole).value<QColor>();
+
                     QSize size;
                     AttributeRendererProc a = it.value();
-                    (this->*a)(painter, lst, vopt, size);
+                    (this->*a)(painter, lst, vopt, size, fg);
                 }
             }
         }