Remove point size restriction (#234)

* Remove point size restriction

* Check scalar source dataset point count

When the source picker index points to a dataset, verify that the selected scalar source dataset has the same number of points as the ScatterplotPlugin's position dataset. If the counts differ, suppress emitting sourceSelectionChanged and add a user notification explaining the mismatch to prevent invalid selection. Also fix a parameter name in ScalarSourceAction.h's doc comment (variantMap).

* Show point counts in dataset mismatch warning

Cache the number of points for the scalar source and position datasets and use those values in the mismatch notification. This avoids repeated getNumPoints() calls and provides a clearer notification message (includes numPositions and numScalars) when the two datasets have different sizes.

Author: ThomasKroes

src/DatasetsAction.cpp

@@ -181,17 +181,10 @@ void DatasetsAction::setupPointSizeDatasetPickerAction(ScatterplotPlugin* scatte
     auto& pointSizeAction       = pointPlotAction.getSizeAction();
 
     _pointSizeDatasetPickerAction.setFilterFunction([this, scatterplotPlugin](mv::Dataset<DatasetImpl> dataset) -> bool {
-        if (dataset->getDataType() != PointType)
+        if (!scatterplotPlugin->getPositionDataset().isValid())
             return false;
 
-        const auto positionDataset = scatterplotPlugin->getPositionDataset();
-
-        if (!positionDataset.isValid())
-            return false;
-
-        const mv::Dataset<Points> candidatePoints(dataset);
-
-        if (candidatePoints->getNumPoints() != positionDataset->getNumPoints())
+    	if (dataset->getDataType() != PointType)
             return false;
 
         return true;
@@ -228,19 +221,12 @@ void DatasetsAction::setupPointOpacityDatasetPickerAction(ScatterplotPlugin* sca
     auto& pointOpacityAction    = pointPlotAction.getOpacityAction();
 
     _pointOpacityDatasetPickerAction.setFilterFunction([this, scatterplotPlugin](mv::Dataset<DatasetImpl> dataset) -> bool {
-        if (dataset->getDataType() != PointType)
-            return false;
-        
-        const auto positionDataset = scatterplotPlugin->getPositionDataset();
-
-        if (!positionDataset.isValid())
+        if (!scatterplotPlugin->getPositionDataset().isValid())
             return false;
 
-        const mv::Dataset<Points> candidatePoints(dataset);
-
-        if (candidatePoints->getNumPoints() != positionDataset->getNumPoints())
+    	if (dataset->getDataType() != PointType)
             return false;
-
+        
         return true;
     });
 

src/ScalarAction.cpp

@@ -18,7 +18,25 @@ ScalarAction::ScalarAction(QObject* parent, const QString& title, const float& m
     addAction(&_sourceAction);
 
     connect(&_sourceAction.getPickerAction(), &OptionAction::currentIndexChanged, this, [this](const std::uint32_t& currentIndex) {
-        emit sourceSelectionChanged(currentIndex);
+        bool emitSourceSelectionChanged = true;
+
+        if (currentIndex >= ScalarSourceModel::DefaultRow::DatasetStart) {
+            if (auto scatterplotPlugin = dynamic_cast<ScatterplotPlugin*>(findPluginAncestor())) {
+                auto positionDataset            = scatterplotPlugin->getPositionDataset();
+                auto scalarSourcePointsDataset  = Dataset<Points>(getCurrentDataset());
+                const auto numScalars           = scalarSourcePointsDataset->getNumPoints();
+                const auto numPositions         = positionDataset->getNumPoints();
+
+                if (numScalars != numPositions) {
+                    emitSourceSelectionChanged = false;
+
+                    scatterplotPlugin->addNotification(QString("The number of points in the scalar source dataset does not match the number of points in the position dataset. (numPositions=%1, numScalars:%2)").arg(QString::number(numPositions), QString::number(numScalars)));
+                }
+            }
+        }
+
+        if (emitSourceSelectionChanged)
+            emit sourceSelectionChanged(currentIndex);
     });
 
     connect(&_magnitudeAction, &DecimalAction::valueChanged, this, [this](const float& value) {

src/ScalarSourceAction.h

@@ -54,7 +54,7 @@ class ScalarSourceAction : public GroupAction
 
     /**
      * Load widget action from variant map
-     * @param Variant map representation of the widget action
+     * @param variantMap Variant map representation of the widget action
      */
     void fromVariantMap(const QVariantMap& variantMap) override;