Adhere to improved view plugin sampler action (#148)

* Adhere to changes in the view plugin sampler action

* Adhere to added SamplingMode::Selection

* View sampler action is now positioned in the primary toolbar

* Small change in comment

Author: ThomasKroes

src/ScatterplotPlugin.cpp

@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
+#include <actions/ViewPluginSamplerAction.h>
 
 Q_PLUGIN_METADATA(IID "nl.tudelft.ScatterplotPlugin")
 
@@ -78,6 +79,7 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
     _primaryToolbarAction.addAction(&_settingsAction.getSubsetAction());
     _primaryToolbarAction.addAction(&_settingsAction.getClusteringAction());
     _primaryToolbarAction.addAction(&_settingsAction.getSelectionAction());
+    _primaryToolbarAction.addAction(&getSamplerAction());
 
     _secondaryToolbarAction.addAction(&_settingsAction.getColoringAction().getColorMap1DAction(), 1);
 
@@ -231,7 +233,7 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
     auto& selectionAction = _settingsAction.getSelectionAction();
 
     getSamplerAction().initialize(this, &selectionAction.getPixelSelectionAction(), &selectionAction.getSamplerPixelSelectionAction());
-    getSamplerAction().setTooltipGeneratorFunction([this](const ViewPluginSamplerAction::SampleContext& toolTipContext) -> QString {
+    getSamplerAction().setViewGeneratorFunction([this](const ViewPluginSamplerAction::SampleContext& toolTipContext) -> QString {
         QStringList localPointIndices, globalPointIndices;
 
         for (const auto& localPointIndex : toolTipContext["LocalPointIndices"].toList())
@@ -251,6 +253,9 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
                    </table>").arg(globalPointIndices.join(", "));
     });
 
+    //getSamplerAction().setViewingMode(ViewPluginSamplerAction::ViewingMode::Tooltip);
+    getSamplerAction().getEnabledAction().setChecked(false);
+    
     getLearningCenterAction().setPluginTitle("Scatterplot view");
 
     getLearningCenterAction().setShortDescription("Scatterplot view plugin");
@@ -367,7 +372,7 @@ void ScatterplotPlugin::selectPoints()
             continue;
 
         if (selectionAreaImage.pixelColor(uv).alpha() > 0)
-            targetSelectionIndices.push_back(localGlobalIndices[localPointIndex]);
+	        targetSelectionIndices.push_back(localGlobalIndices[localPointIndex]);
     }
 
     switch (const auto selectionModifier = pixelSelectionTool.isAborted() ? PixelSelectionModifierType::Subtract : pixelSelectionTool.getModifier())
@@ -414,9 +419,6 @@ void ScatterplotPlugin::selectPoints()
 
             break;
         }
-
-        default:
-            break;
     }
 
     _positionDataset->setSelectionIndices(targetSelectionIndices);
@@ -687,6 +689,59 @@ void ScatterplotPlugin::updateSelection()
         highlights[i] = selected[i] ? 1 : 0;
 
     _scatterPlotWidget->setHighlights(highlights, static_cast<std::int32_t>(selection->indices.size()));
+
+    if (getSamplerAction().getSamplingMode() == ViewPluginSamplerAction::SamplingMode::Selection) {
+        std::vector<std::uint32_t> localGlobalIndices;
+
+        _positionDataset->getGlobalIndices(localGlobalIndices);
+
+        std::vector<std::uint32_t> sampledPoints;
+
+        sampledPoints.reserve(_positions.size());
+
+        for (auto selectionIndex : selection->indices)
+            sampledPoints.push_back(selectionIndex);
+
+        std::int32_t numberOfPoints = 0;
+
+        QVariantList localPointIndices, globalPointIndices;
+
+        const auto numberOfSelectedPoints = selection->indices.size();
+
+        localPointIndices.reserve(static_cast<std::int32_t>(numberOfSelectedPoints));
+        globalPointIndices.reserve(static_cast<std::int32_t>(numberOfSelectedPoints));
+
+        for (const auto& sampledPoint : sampledPoints) {
+            if (getSamplerAction().getRestrictNumberOfElementsAction().isChecked() && numberOfPoints >= getSamplerAction().getMaximumNumberOfElementsAction().getValue())
+                break;
+
+            const auto& localPointIndex = sampledPoint;
+            const auto& globalPointIndex = localGlobalIndices[localPointIndex];
+
+            localPointIndices << localPointIndex;
+            globalPointIndices << globalPointIndex;
+
+            numberOfPoints++;
+        }
+
+        _scatterPlotWidget->update();
+
+        auto& coloringAction = _settingsAction.getColoringAction();
+
+        getSamplerAction().setSampleContext({
+            { "PositionDatasetID", _positionDataset.getDatasetId() },
+            { "ColorDatasetID", _settingsAction.getColoringAction().getCurrentColorDataset().getDatasetId() },
+            { "LocalPointIndices", localPointIndices },
+            { "GlobalPointIndices", globalPointIndices },
+            { "Distances", QVariantList()},
+            { "ColorBy", coloringAction.getColorByAction().getCurrentText() },
+            { "ConstantColor", coloringAction.getConstantColorAction().getColor() },
+            { "ColorMap1D", coloringAction.getColorMap1DAction().getColorMapImage() },
+            { "ColorMap2D", coloringAction.getColorMap2DAction().getColorMapImage() },
+            { "ColorDimensionIndex", coloringAction.getDimensionAction().getCurrentDimensionAction().getCurrentIndex() },
+            { "RenderMode", _settingsAction.getRenderModeAction().getCurrentText() }
+		});
+    }
 }
 
 void ScatterplotPlugin::fromVariantMap(const QVariantMap& variantMap)

src/ScatterplotPlugin.h

@@ -101,7 +101,7 @@ class ScatterplotPlugin : public ViewPlugin
 
     /**
      * Load plugin from variant map
-     * @param Variant map representation of the plugin
+     * @param variantMap Variant map representation of the plugin
      */
     void fromVariantMap(const QVariantMap& variantMap) override;
 

src/SelectionAction.cpp

@@ -130,8 +130,6 @@ void SelectionAction::initialize(ScatterplotPlugin* scatterplotPlugin)
     updateReadOnly();
 
     connect(&scatterplotPlugin->getPositionDataset(), &Dataset<Points>::changed, this, updateReadOnly);
-
-    addAction(&scatterplotPlugin->getSamplerAction());
 }
 
 void SelectionAction::connectToPublicAction(WidgetAction* publicAction, bool recursive)

src/SettingsAction.h

@@ -45,7 +45,7 @@ class SettingsAction : public GroupAction
 
     /**
      * Load plugin from variant map
-     * @param Variant map representation of the plugin
+     * @param variantMap Variant map representation of the plugin
      */
     void fromVariantMap(const QVariantMap& variantMap) override;
 
@@ -69,15 +69,15 @@ class SettingsAction : public GroupAction
     DatasetsAction& getDatasetsAction() { return _datasetsAction; }
 
 protected:
-    ScatterplotPlugin*      _scatterplotPlugin;         /** Pointer to scatter plot plugin */
-    RenderModeAction        _renderModeAction;          /** Action for configuring render mode */
-    PositionAction          _positionAction;            /** Action for configuring point positions */
-    PlotAction              _plotAction;                /** Action for configuring plot settings */
-    ColoringAction          _coloringAction;            /** Action for configuring point coloring */
-    SubsetAction            _subsetAction;              /** Action for creating subset(s) */
-    ClusteringAction        _clusteringAction;          /** Action for creating clusters */
-    SelectionAction         _selectionAction;           /** Action for selecting points */
-    ExportAction            _exportAction;              /** Action for exporting */
-    MiscellaneousAction     _miscellaneousAction;       /** Action for miscellaneous settings */
-    DatasetsAction          _datasetsAction;            /** Action for picking dataset(s) */
+    ScatterplotPlugin*          _scatterplotPlugin;         /** Pointer to scatter plot plugin */
+    RenderModeAction            _renderModeAction;          /** Action for configuring render mode */
+    PositionAction              _positionAction;            /** Action for configuring point positions */
+    PlotAction                  _plotAction;                /** Action for configuring plot settings */
+    ColoringAction              _coloringAction;            /** Action for configuring point coloring */
+    SubsetAction                _subsetAction;              /** Action for creating subset(s) */
+    ClusteringAction            _clusteringAction;          /** Action for creating clusters */
+    SelectionAction             _selectionAction;           /** Action for selecting points */
+    ExportAction                _exportAction;              /** Action for exporting */
+    MiscellaneousAction         _miscellaneousAction;       /** Action for miscellaneous settings */
+    DatasetsAction              _datasetsAction;            /** Action for picking dataset(s) */
 };