Fix #3695

NCAR · Feb 24, 2025 · 0256aea · 0256aea
1 parent aba4329
commit 0256aea
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/apps/vaporgui/TFIsoValueWidget.cpp b/apps/vaporgui/TFIsoValueWidget.cpp
@@ -68,23 +68,21 @@ void TFIsoValueMap::_paintEvent(QPainter &p)
 {
     p.fillRect(rect(), Qt::lightGray);
 
-    if (getRenderParams()) {
-        for (int i = 0; i < _isoValues.size(); i++) {
-            float v = _isoValues[i];
-            bool  invalid = false;
-            if (v < 0 || v > 1) {
-                v = glm::clamp(v, 0.f, 1.f);
-                invalid = true;
-            }
-            drawControl(p, controlQPositionForValue(v), i == _selectedId, invalid);
+    for (int i = 0; i < _isoValues.size(); i++) {
+        float v = _isoValues[i];
+        bool  invalid = false;
+        if (v < 0 || v > 1) {
+            v = glm::clamp(v, 0.f, 1.f);
+            invalid = true;
         }
+        drawControl(p, controlQPositionForValue(v), i == _selectedId, invalid);
+    }
 
-        if (_isoValues.size() == 0) {
-            QFont font = getFont();
-            font.setPixelSize(rect().height());
-            p.setFont(font);
-            p.drawText(rect(), Qt::AlignCenter, "doubleclick to add isovalues");
-        }
+    if (_isoValues.size() == 0) {
+        QFont font = getFont();
+        font.setPixelSize(rect().height());
+        p.setFont(font);
+        p.drawText(rect(), Qt::AlignCenter, "doubleclick to add isovalues");
     }
 }
 

diff --git a/apps/vaporgui/TFMappingRangeSelector.cpp b/apps/vaporgui/TFMappingRangeSelector.cpp
@@ -68,6 +68,7 @@ void TFMappingRangeSelector::_rangeChangedBegin()
     if (!_rParams || !_paramsMgr) return;
 
     _paramsMgr->BeginSaveStateGroup("Change tf mapping range");
+    _insideIntermediateChangeGroup = true;
 }
 
 void TFMappingRangeSelector::_rangeChangedIntermediate(float left, float right)
@@ -86,7 +87,9 @@ void TFMappingRangeSelector::_rangeChanged(float left, float right)
     if (!_rParams || !_paramsMgr) return;
 
     _rParams->GetMapperFunc(_getVariableName())->setMinMaxMapValue(left, right);
-    _paramsMgr->EndSaveStateGroup();
+    if (_insideIntermediateChangeGroup)
+        _paramsMgr->EndSaveStateGroup();
+    _insideIntermediateChangeGroup = false;
 }
 
 void TFMappingRangeSelector::_sliderRangeChanged(float left, float right)

diff --git a/apps/vaporgui/TFMappingRangeSelector.h b/apps/vaporgui/TFMappingRangeSelector.h
@@ -21,6 +21,7 @@ class TFMappingRangeSelector : public QRangeSliderTextCombo {
     VAPoR::RenderParams *_rParams = nullptr;
     VAPoR::ParamsMgr *   _paramsMgr = nullptr;
     const std::string &  _variableNameTag;
+    bool                 _insideIntermediateChangeGroup = false;
 
     void                   _getDefaultRange(VAPoR::DataMgr *dataMgr, VAPoR::RenderParams *rParams, float *min, float *max) const;
     void                   _getDataRange(VAPoR::DataMgr *dataMgr, VAPoR::RenderParams *rParams, float *min, float *max) const;