Properly sync HUD with loaded color, point size and point opacity dataset(s)

Author: ThomasKroes

src/ScatterplotPlugin.cpp

@@ -344,9 +344,6 @@ void ScatterplotPlugin::init()
     connect(&_positionDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
 
     const auto currentColorDatasetChanged = [this](Dataset<DatasetImpl> currentColorDataset) -> void {
-        if (_colorDataset == currentColorDataset)
-            return;
-
         if (_colorDataset.isValid())
             disconnect(&_colorDataset, &Dataset<>::guiNameChanged, this, nullptr);
 
@@ -362,8 +359,35 @@ void ScatterplotPlugin::init()
         currentColorDatasetChanged(_settingsAction.getColoringAction().getCurrentColorDataset());
     });
 
-    connect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
-    connect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), &ScalarAction::sourceDataChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+    const auto currentPointSizeDatasetChanged = [this]() -> void {
+        auto currentPointSizeDataset = _settingsAction.getPlotAction().getPointPlotAction().getSizeAction().getCurrentDataset();
+
+        if (_pointSizeDataset.isValid())
+            disconnect(&_pointSizeDataset, &Dataset<>::guiNameChanged, this, nullptr);
+
+        _pointSizeDataset = currentPointSizeDataset;
+
+        connect(&_pointSizeDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+
+        updateHeadsUpDisplay();
+    };
+
+    connect(&_settingsAction.getPlotAction().getPointPlotAction().getSizeAction(), &ScalarAction::sourceSelectionChanged, this, currentPointSizeDatasetChanged);
+
+    const auto currentPointOpacityDatasetChanged = [this]() -> void {
+        auto currentPointOpacityDataset = _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().getCurrentDataset();
+
+        if (_pointOpacityDataset.isValid())
+            disconnect(&_pointOpacityDataset, &Dataset<>::guiNameChanged, this, nullptr);
+
+        _pointOpacityDataset = currentPointOpacityDataset;
+
+        connect(&_pointOpacityDataset, &Dataset<>::guiNameChanged, this, &ScatterplotPlugin::updateHeadsUpDisplay);
+
+        updateHeadsUpDisplay();
+    };
+
+    connect(&_settingsAction.getPlotAction().getPointPlotAction().getOpacityAction(), &ScalarAction::sourceSelectionChanged, this, currentPointOpacityDatasetChanged);
 
     connect(&_settingsAction.getMiscellaneousAction().getBackgroundColorAction(), &ColorAction::colorChanged, this, &ScatterplotPlugin::updateHeadsUpDisplayTextColor);
 
@@ -1038,11 +1062,9 @@ void ScatterplotPlugin::updateHeadsUpDisplay()
 
         addMetaDataToHeadsUpDisplay("Size",    _settingsAction.getPlotAction().getPointPlotAction().getSizeAction().getCurrentDataset(), datasetsItem);
         addMetaDataToHeadsUpDisplay("Opacity", _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().getCurrentDataset(), datasetsItem);
-
     } else {
         getHeadsUpDisplayAction().addHeadsUpDisplayItem("No datasets loaded", "", "");
     }
-
 }
 
 void ScatterplotPlugin::updateHeadsUpDisplayTextColor()

src/ScatterplotPlugin.h

@@ -116,7 +116,9 @@ class ScatterplotPlugin : public ViewPlugin
     ScatterplotWidget*              _scatterPlotWidget;         /** The visualization widget */
     Dataset<Points>                 _positionDataset;           /** Smart pointer to points dataset for point position */
     Dataset<Points>                 _positionSourceDataset;     /** Smart pointer to source of the points dataset for point position (if any) */
-    Dataset<DatasetImpl>            _colorDataset;              /** Smart pointer to dataset used for coloring (if any) */   
+    Dataset<DatasetImpl>            _colorDataset;              /** Smart pointer to dataset used for coloring (if any) */
+    Dataset<DatasetImpl>            _pointSizeDataset;          /** Smart pointer to dataset for driving point size (if any) */
+    Dataset<DatasetImpl>            _pointOpacityDataset;       /** Smart pointer to dataset for driving point opacity (if any) */
     std::vector<mv::Vector2f>       _positions;                 /** Point positions */
     unsigned int                    _numPoints;                 /** Number of point positions */
     SettingsAction                  _settingsAction;            /** Group action for all settings */