Set point size and opacity same as color

Remove double call to addColorDataset

Author: alxvth

src/ColoringAction.cpp

@@ -179,6 +179,9 @@ Dataset<DatasetImpl> ColoringAction::getCurrentColorDataset() const
 
 void ColoringAction::setCurrentColorDataset(const Dataset<DatasetImpl>& colorDataset)
 {
+    if (!colorDataset.isValid())
+        return;
+
     addColorDataset(colorDataset);
 
     const auto colorDatasetRowIndex = _colorByModel.rowIndex(colorDataset);

src/PointPlotAction.cpp

@@ -210,6 +210,24 @@ void PointPlotAction::addPointOpacityDataset(const Dataset<DatasetImpl>& pointOp
     _opacityAction.addDataset(pointOpacityDataset);
 }
 
+void PointPlotAction::setCurrentPointSizeDataset(const Dataset<DatasetImpl>& pointSizeDataset)
+{
+    if (!pointSizeDataset.isValid())
+        return;
+
+    addPointSizeDataset(pointSizeDataset);
+    _sizeAction.setCurrentDataset(pointSizeDataset);
+}
+
+void PointPlotAction::setCurrentPointOpacityDataset(const Dataset<DatasetImpl>& pointOpacityDataset)
+{
+    if (!pointOpacityDataset.isValid())
+        return;
+
+    addPointOpacityDataset(pointOpacityDataset);
+    _opacityAction.setCurrentDataset(pointOpacityDataset);
+}
+
 void PointPlotAction::updateDefaultDatasets()
 {
     if (_scatterplotPlugin == nullptr)

src/PointPlotAction.h

@@ -58,6 +58,18 @@ class PointPlotAction : public VerticalGroupAction
      */
     void addPointOpacityDataset(const Dataset<DatasetImpl>& pointOpacityDataset);
 
+    /**
+     * Set the current point size dataset
+     * @param pointSizeDataset Smart pointer to point size dataset
+     */
+    void setCurrentPointSizeDataset(const Dataset<DatasetImpl>& pointSizeDataset);
+
+    /**
+     * Set the current opacity size dataset
+     * @param pointOpacityDataset Smart pointer to opacity size dataset
+     */
+    void setCurrentPointOpacityDataset(const Dataset<DatasetImpl>& pointOpacityDataset);
+
 protected:
 
     /** Update default datasets (candidates are children of points type and with matching number of points) */

src/ScalarAction.cpp

@@ -38,6 +38,9 @@ void ScalarAction::addDataset(const Dataset<DatasetImpl>& dataset)
 {
     auto& sourceModel = _sourceAction.getModel();
 
+    if (sourceModel.hasDataset(dataset))
+        return;
+
     sourceModel.addDataset(dataset);
 
     connect(&sourceModel.getDatasets().last(), &Dataset<DatasetImpl>::dataChanged, this, [this, dataset]() {

src/ScalarSourceModel.cpp

@@ -74,6 +74,8 @@ QVariant ScalarSourceModel::data(const QModelIndex& index, int role) const
                 if (row == DefaultRow::Selection)
                     return "Selection";
             }
+
+            break;
         }
 
         default:
@@ -86,7 +88,7 @@ QVariant ScalarSourceModel::data(const QModelIndex& index, int role) const
 void ScalarSourceModel::addDataset(const Dataset<DatasetImpl>& dataset)
 {
     // Avoid duplicates
-    if (rowIndex(dataset) >= DefaultRow::DatasetStart)
+    if (hasDataset(dataset))
         return;
 
     // Insert row into model
@@ -127,6 +129,11 @@ void ScalarSourceModel::addDataset(const Dataset<DatasetImpl>& dataset)
     });
 }
 
+bool ScalarSourceModel::hasDataset(const Dataset<DatasetImpl>& dataset) const
+{
+    return rowIndex(dataset) >= DefaultRow::DatasetStart;
+}
+
 void ScalarSourceModel::removeDataset(const Dataset<DatasetImpl>& dataset)
 {
     // Get row index of the dataset

src/ScalarSourceModel.h

@@ -65,6 +65,13 @@ class ScalarSourceModel : public QAbstractListModel
      */
     void addDataset(const Dataset<DatasetImpl>& dataset);
 
+    /**
+     * Determines whether a given dataset is already loaded
+     * @param dataset Smart pointer to dataset
+     * @return whether the dataset is already loaded
+     */
+    bool hasDataset(const Dataset<DatasetImpl>& dataset) const;
+
     /**
      * Remove a dataset
      * @param dataset Smart pointer to dataset

src/ScatterplotPlugin.cpp

@@ -184,22 +184,19 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
 
                 if (sameNumPoints || sameNumPointsAsFull) {
 
-                    // The number of points is equal, so offer the option to use the points dataset as source for points colors
+                    // Offer the option to use the points dataset as source for points colors
                     dropRegions << new DropWidget::DropRegion(this, "Point color", QString("Colorize %1 points with %2").arg(_positionDataset->text(), candidateDataset->text()), "palette", true, [this, candidateDataset]() {
-                        _settingsAction.getColoringAction().addColorDataset(candidateDataset);
-                        _settingsAction.getColoringAction().setCurrentColorDataset(candidateDataset);
+                        _settingsAction.getColoringAction().setCurrentColorDataset(candidateDataset);   // calls addColorDataset internally
                         });
 
-                    // The number of points is equal, so offer the option to use the points dataset as source for points size
+                    // Offer the option to use the points dataset as source for points size
                     dropRegions << new DropWidget::DropRegion(this, "Point size", QString("Size %1 points with %2").arg(_positionDataset->text(), candidateDataset->text()), "ruler-horizontal", true, [this, candidateDataset]() {
-                        _settingsAction.getPlotAction().getPointPlotAction().addPointSizeDataset(candidateDataset);
-                        _settingsAction.getPlotAction().getPointPlotAction().getSizeAction().setCurrentDataset(candidateDataset);
+                        _settingsAction.getPlotAction().getPointPlotAction().setCurrentPointSizeDataset(candidateDataset);
                         });
 
-                    // The number of points is equal, so offer the option to use the points dataset as source for points opacity
+                    // Offer the option to use the points dataset as source for points opacity
                     dropRegions << new DropWidget::DropRegion(this, "Point opacity", QString("Set %1 points opacity with %2").arg(_positionDataset->text(), candidateDataset->text()), "brush", true, [this, candidateDataset]() {
-                        _settingsAction.getPlotAction().getPointPlotAction().addPointOpacityDataset(candidateDataset);
-                        _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().setCurrentDataset(candidateDataset);
+                        _settingsAction.getPlotAction().getPointPlotAction().setCurrentPointOpacityDataset(candidateDataset);
                         });
                 }
             }