Allow recoloring of hsne embeddings

Author: alxvth

src/ScatterplotPlugin.cpp

@@ -172,17 +172,17 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
                         });
                 }
 
-                //const auto numPointsCand = candidateDataset->getNumPoints();
-                //const auto numPointsPos = _positionDataset->getNumPoints();
-                //const bool sameNumPoints = numPointsCand == numPointsPos;
-                //bool sameNumPointsAsFull = false;
-
-                //if (_positionDataset->isDerivedData()) {
-                //    const auto numPointsSor = _positionDataset->getSourceDataset<Points>()->getNumPoints();
-                //    sameNumPointsAsFull = numPointsCand == numPointsSor;
-                //}
-
-                //if (sameNumPoints || sameNumPointsAsFull) {
+                // Accept both data with the same number if points and data which is derived from
+                // a parent that has the same number of points (e.g. for HSNE embeddings)
+                const auto numPointsCandidate   = candidateDataset->getNumPoints();
+                const auto numPointsPosition    = _positionDataset->getNumPoints();
+                const bool sameNumPoints        = numPointsPosition == numPointsCandidate;
+                const bool sameNumPointsAsFull  = 
+                    /*if*/   _positionDataset->isDerivedData() ?
+                    /*then*/ _positionDataset->getSourceDataset<Points>()->getFullDataset<Points>()->getNumPoints() == numPointsCandidate :
+                    /*else*/ false;
+
+                if (sameNumPoints || sameNumPointsAsFull) {
 
                     // The number of points is equal, so 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]() {
@@ -201,7 +201,7 @@ ScatterplotPlugin::ScatterplotPlugin(const PluginFactory* factory) :
                         _settingsAction.getPlotAction().getPointPlotAction().addPointOpacityDataset(candidateDataset);
                         _settingsAction.getPlotAction().getPointPlotAction().getOpacityAction().setCurrentDataset(candidateDataset);
                         });
-                //}
+                }
             }
         }
 
@@ -580,9 +580,9 @@ void ScatterplotPlugin::samplePoints()
         if (getSamplerAction().getRestrictNumberOfElementsAction().isChecked() && numberOfPoints >= getSamplerAction().getMaximumNumberOfElementsAction().getValue())
             break;
 
-        const auto& distance            = sampledPoint.first;
-        const auto& localPointIndex     = sampledPoint.second;
-        const auto& globalPointIndex    = localGlobalIndices[localPointIndex];
+        const auto& distance = sampledPoint.first;
+        const auto& localPointIndex = sampledPoint.second;
+        const auto& globalPointIndex = localGlobalIndices[localPointIndex];
 
         distances << distance;
         localPointIndices << localPointIndex;
@@ -659,24 +659,33 @@ void ScatterplotPlugin::loadColors(const Dataset<Points>& points, const std::uin
 
     points->extractDataForDimension(scalars, dimensionIndex);
 
-    //if (_positionSourceDataset->getNumPoints() == points->getNumPoints())
-    //{
-        std::vector<std::uint32_t> globalIndices;
-        _positionDataset->getGlobalIndices(globalIndices);
+    const auto numColorPoints = points->getNumPoints();
 
-        std::vector<float> localScalars(_numPoints, 0);
-        std::int32_t localColorIndex = 0;
 
-        for (const auto& globalIndex : globalIndices)
-            localScalars[localColorIndex++] = scalars[globalIndex];
+    if (numColorPoints != _numPoints) {
+
+        const bool sameNumPointsAsFull =
+            /*if*/   _positionDataset->isDerivedData() ?
+            /*then*/ _positionSourceDataset->getFullDataset<Points>()->getNumPoints() == numColorPoints :
+            /*else*/ false;
 
-        std::swap(localScalars, scalars);
+        if (sameNumPointsAsFull) {
+            std::vector<std::uint32_t> globalIndices;
+            _positionDataset->getGlobalIndices(globalIndices);
 
-    //}
-    //else if (points->getNumPoints() != _numPoints) {
-    //    qWarning("Number of points used for coloring does not match number of points in data, aborting attempt to color plot");
-    //    return;
-    //}
+            std::vector<float> localScalars(_numPoints, 0);
+            std::int32_t localColorIndex = 0;
+
+            for (const auto& globalIndex : globalIndices)
+                localScalars[localColorIndex++] = scalars[globalIndex];
+
+            std::swap(localScalars, scalars);
+           }
+        else {
+            qWarning("Number of points used for coloring does not match number of points in data, aborting attempt to color plot");
+            return;
+        }
+    }
 
     assert(scalars.size() == _numPoints);