Move dataset picker setup into ScatterplotPlugin

Move control of dataset picker initialization from DatasetsAction to ScatterplotPlugin so the plugin can defer or re-run setup during project open. Make setupDatasetPickerActions protected and add ScatterplotPlugin as a friend so the plugin can call it. Refactor point-size dataset picker: tighten the filter to require PointType, a valid position dataset, and matching point counts; rework signal wiring to keep the DatasetPickerAction and ScalarAction synchronized and to set a default constant source when no dataset is selected. Minor debug logging added to aid troubleshooting.

Author: ThomasKroes

src/DatasetsAction.cpp

@@ -40,10 +40,6 @@ DatasetsAction::DatasetsAction(QObject* parent, const QString& title) :
         return;
 
     setupDatasetPickerActions(scatterplotPlugin);
-
-    connect(&mv::projects(), &AbstractProjectManager::projectOpened, this, [this, scatterplotPlugin]() -> void {
-        setupDatasetPickerActions(scatterplotPlugin);
-    });
 }
 
 void DatasetsAction::connectToPublicAction(WidgetAction* publicAction, bool recursive)
@@ -152,35 +148,53 @@ void DatasetsAction::setupColorDatasetPickerAction(ScatterplotPlugin* scatterplo
 
 void DatasetsAction::setupPointSizeDatasetPickerAction(ScatterplotPlugin* scatterplotPlugin)
 {
-    auto& settingsAction = scatterplotPlugin->getSettingsAction();
+    auto& settingsAction        = scatterplotPlugin->getSettingsAction();
+    auto& pointPlotAction       = settingsAction.getPlotAction().getPointPlotAction();
+    auto& pointSizeAction       = pointPlotAction.getSizeAction();
 
-    _pointSizeDatasetPickerAction.setFilterFunction([this](mv::Dataset<DatasetImpl> dataset) -> bool {
-        return dataset->getDataType() == PointType;
-	});
+    _pointSizeDatasetPickerAction.setFilterFunction([this, scatterplotPlugin](mv::Dataset<DatasetImpl> dataset) -> bool {
+        if (dataset->getDataType() != PointType)
+            return false;
 
-    auto& pointPlotAction   = settingsAction.getPlotAction().getPointPlotAction();
-    auto& pointSizeAction   = pointPlotAction.getSizeAction();
+        qDebug() << dataset->getGuiName() << "A";
+        const auto positionDataset = scatterplotPlugin->getPositionSourceDataset();
+
+        if (!positionDataset.isValid())
+            return false;
 
+        qDebug() << dataset->getGuiName() << "B";
 
-    connect(&pointSizeAction, &ScalarAction::sourceSelectionChanged, this, [this, &pointSizeAction, scatterplotPlugin](const uint32_t& sourceSelectionIndex) -> void {
-        if (_pointSizeDataset.isValid())
+        const mv::Dataset<Points> candidatePoints(dataset);
+
+        if (candidatePoints->getNumPoints() != positionDataset->getNumPoints())
+            return false;
+
+        qDebug() << dataset->getGuiName() << "C";
+
+        return true;
+    });
+
+    connect(&_pointSizeDatasetPickerAction, &DatasetPickerAction::currentIndexChanged, this, [this, &pointPlotAction, &pointSizeAction, scatterplotPlugin](const int32_t& currentIndex) -> void {
+        const auto& pointSizeDataset = _pointSizeDatasetPickerAction.getCurrentDataset();
+
+        if (pointSizeDataset.isValid())
             disconnect(&_pointSizeDataset, &Dataset<>::guiNameChanged, this, nullptr);
 
-        _pointSizeDataset = pointSizeAction.getCurrentDataset();
+        _pointSizeDataset = pointSizeDataset;
 
         connect(&_pointSizeDataset, &Dataset<>::guiNameChanged, scatterplotPlugin, &ScatterplotPlugin::updateHeadsUpDisplay);
 
+        pointPlotAction.setCurrentPointSizeDataset(_pointSizeDataset);
+
+        if (!_pointSizeDataset.isValid())
+            pointSizeAction.setCurrentSourceIndex(ScalarSourceModel::DefaultRow::Constant);
+    });
+
+    connect(&pointSizeAction, &ScalarAction::sourceSelectionChanged, this, [this, &pointSizeAction](const uint32_t& sourceSelectionIndex) -> void {
         _pointSizeDatasetPickerAction.setCurrentDataset(pointSizeAction.isSourceDataset() ? pointSizeAction.getCurrentDataset() : nullptr);
 
         if (!pointSizeAction.isSourceDataset())
             _pointSizeDatasetPickerAction.setCurrentIndex(-1);
-	});
-
-    connect(&_pointSizeDatasetPickerAction, &DatasetPickerAction::currentIndexChanged, this, [this, &pointSizeAction](const int32_t& currentIndex) -> void {
-        pointSizeAction.setCurrentDataset(_pointSizeDatasetPickerAction.getCurrentDataset());
-
-        if (currentIndex < 0)
-            pointSizeAction.setCurrentSourceIndex(ScalarSourceModel::DefaultRow::Constant);
     });
 }
 

src/DatasetsAction.h

@@ -53,7 +53,7 @@ class DatasetsAction : public GroupAction
      */
     QVariantMap toVariantMap() const override;
 
-private: // Dataset picker action setup
+protected: // Dataset picker action setup
 
     /**
      * Set up the dataset picker actions with the datasets from the scatter plot plugin
@@ -103,6 +103,7 @@ class DatasetsAction : public GroupAction
     mv::Dataset<mv::DatasetImpl>    _pointOpacityDataset;             /** Smart pointer to dataset for driving point opacity (if any) */
 
     friend class mv::AbstractActionsManager;
+    friend class ScatterplotPlugin;
 };
 
 Q_DECLARE_METATYPE(DatasetsAction)

src/ScatterplotPlugin.cpp

@@ -408,6 +408,14 @@ void ScatterplotPlugin::init()
 
     updateHeadsUpDisplay();
     updateHeadsUpDisplayTextColor();
+
+    if (mv::projects().isOpeningProject()) {
+        connect(&mv::projects(), &AbstractProjectManager::projectOpened, this, [this, &datasetsAction]() -> void {
+            datasetsAction.setupDatasetPickerActions(this);
+        });
+    } else {
+        datasetsAction.setupDatasetPickerActions(this);
+    }
 }
 
 void ScatterplotPlugin::loadData(const Datasets& datasets)