From 02b1c971e80cdad0e7750186aaae3f52779ca7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Herje?= <jorgen.herje@ceetronsolutions.com>
Date: Thu, 26 Jan 2023 14:42:00 +0100
Subject: [PATCH] Fix bug in QwtPlotWidget highlight reset

QwtPlotShapeItem objects were not reset
---
 .../UserInterface/RiuQwtPlotWidget.cpp        | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
index 0fa1a47c80..81d821df76 100644
--- a/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
@@ -1055,7 +1055,7 @@ void RiuQwtPlotWidget::resetPlotItemHighlighting( bool doUpdateCurveOrder )
 {
     if ( !m_originalZValues.empty() )
     {
-        auto plotItemList = m_plot->itemList();
+        const auto& plotItemList = m_plot->itemList();
         for ( QwtPlotItem* plotItem : plotItemList )
         {
             if ( auto* plotCurve = dynamic_cast<QwtPlotCurve*>( plotItem ) )
@@ -1071,23 +1071,27 @@ void RiuQwtPlotWidget::resetPlotItemHighlighting( bool doUpdateCurveOrder )
                     continue;
                 }
             }
-
-            auto* plotShapeItem = dynamic_cast<QwtPlotShapeItem*>( plotItem );
-            if ( plotShapeItem )
-            {
-                QPen pen = plotShapeItem->pen();
-
-                auto color = RiuGuiTheme::getColorByVariableName( "markerColor" );
-
-                pen.setColor( color );
-                pen.setWidth( 1 );
-                plotShapeItem->setPen( pen );
-                plotShapeItem->setZ( plotShapeItem->z() - 100.0 );
-            }
         }
         m_originalZValues.clear();
     }
 
+    const auto& plotItemList = m_plot->itemList();
+    for ( QwtPlotItem* plotItem : plotItemList )
+    {
+        auto* plotShapeItem = dynamic_cast<QwtPlotShapeItem*>( plotItem );
+        if ( plotShapeItem )
+        {
+            QPen pen = plotShapeItem->pen();
+
+            auto color = RiuGuiTheme::getColorByVariableName( "markerColor" );
+
+            pen.setColor( color );
+            pen.setWidth( 1 );
+            plotShapeItem->setPen( pen );
+            plotShapeItem->setZ( plotShapeItem->z() - 100.0 );
+        }
+    }
+
     resetPlotAxisHighlighting();
 
     if ( doUpdateCurveOrder ) updateCurveOrder();