Fix pixel selection tool visibility

Author: ThomasKroes

src/ScatterplotPlugin.cpp

@@ -374,37 +374,30 @@ void ScatterplotPlugin::selectPoints()
 
     _positionDataset->getGlobalIndices(localGlobalIndices);
 
-    auto& zoomRectangleAction = _scatterPlotWidget->getNavigationAction().getZoomRectangleAction();
-
-    const auto width        = selectionAreaImage.width();
-    const auto height       = selectionAreaImage.height();
-    const auto size         = width < height ? width : height;
-    const auto uvOffset     = QPoint((selectionAreaImage.width() - size) / 2.0f, (selectionAreaImage.height() - size) / 2.0f);
-
-    QPointF uvNormalized    = {};
-    QPoint uv               = {};
-
-    auto& navigator = _scatterPlotWidget->_pointRenderer.getNavigator();
+    auto& pointRenderer = _scatterPlotWidget->_pointRenderer;
+    auto& navigator     = pointRenderer.getNavigator();
 
-    auto zoomRectangleWorld = navigator.getZoomRectangleWorld();
-
-    const auto margin = _scatterPlotWidget->_pointRenderer.getNavigator().getZoomRectangleMargin();
-
-    //zoomRectangleWorld.setSize(zoomRectangleWorld.size() - QSize(2 * margin, 2 * margin));
-
-    qDebug() << zoomRectangleWorld;
+    const auto zoomRectangleWorld   = navigator.getZoomRectangleWorld();
+    const auto screenRectangle      = QRect(QPoint(), pointRenderer.getRenderSize());
 
+    // Go over all points in the dataset to see if they are selected
     for (std::uint32_t localPointIndex = 0; localPointIndex < _positions.size(); localPointIndex++) {
-        //const auto screenPoint = _scatterPlotWidget->getPointRenderer().getWorldPositionToScreenPoint(QVector3D(_positions[localPointIndex].x, _positions[localPointIndex].y, 0.f));
+        
+        // Compute the offset of the point in the world space
+    	const auto pointOffsetWorld = QPointF(_positions[localPointIndex].x - zoomRectangleWorld.left(), _positions[localPointIndex].y - zoomRectangleWorld.top());
+
+        // Normalize it 
+        const auto pointOffsetWorldNormalized = QPointF(pointOffsetWorld.x() / zoomRectangleWorld.width(), pointOffsetWorld.y() / zoomRectangleWorld.height());
 
-        uvNormalized = QPointF((_positions[localPointIndex].x - zoomRectangleWorld.left()) / zoomRectangleWorld.width(), (zoomRectangleWorld.bottom() - _positions[localPointIndex].y) / zoomRectangleWorld.height());
-        //uvNormalized = QPointF(static_cast<float>(screenPoint.x()) / static_cast<float>(_scatterPlotWidget->width()), static_cast<float>(screenPoint.y()) / static_cast<float>(_scatterPlotWidget->height()));
-        uv           = uvOffset + QPoint(uvNormalized.x() * size, uvNormalized.y() * size);
+        // Convert it to screen space
+        const auto pointOffsetScreen = QPoint(pointOffsetWorldNormalized.x() * screenRectangle.width(), screenRectangle.height() - pointOffsetWorldNormalized.y() * screenRectangle.height());
 
-        if (uv.x() >= selectionAreaImage.width()  || uv.x() < 0 || uv.y() >= selectionAreaImage.height() || uv.y() < 0)
+        // Continue to next point if the point is outside the screen
+        if (!screenRectangle.contains(pointOffsetScreen))
             continue;
 
-        if (selectionAreaImage.pixelColor(uv).alpha() > 0)
+        // If the corresponding pixel is not transparent, add the point to the selection
+        if (selectionAreaImage.pixelColor(pointOffsetScreen).alpha() > 0)
 	        targetSelectionIndices.push_back(localGlobalIndices[localPointIndex]);
     }
 

src/ScatterplotWidget.cpp

@@ -167,18 +167,6 @@ ScatterplotWidget::ScatterplotWidget(mv::plugin::ViewPlugin* parentPlugin) :
 	    update();
     });
 
-    //auto setIsNavigating = [this](bool isNavigating) -> void {
-    //    _isNavigating = isNavigating;
-    //    _pixelSelectionTool.setEnabled(!isNavigating);
-    //    if (isNavigating) {
-    //        _samplerPixelSelectionTool.setEnabled(false);
-    //    }
-    //    else if (_parentPlugin) { // reset to UI-setting
-    //        _samplerPixelSelectionTool.setEnabled(_parentPlugin->getSamplerAction().getEnabledAction().isChecked());
-    //    }
-
-    //    };
-
     _pointRenderer.getNavigator().initialize(this);
     _densityRenderer.getNavigator().initialize(this);
 }
@@ -199,6 +187,37 @@ bool ScatterplotWidget::event(QEvent* event)
         }
     }
 
+    auto setIsNavigating = [this](bool isNavigating) -> void {
+        _pixelSelectionTool.setEnabled(getRenderMode() == RenderMode::SCATTERPLOT && !isNavigating);
+
+        if (isNavigating) {
+            _samplerPixelSelectionTool.setEnabled(false);
+        }
+        else if (_parentPlugin) {
+            _samplerPixelSelectionTool.setEnabled(_parentPlugin->getSamplerAction().getEnabledAction().isChecked());
+        }
+	};
+
+    if (event->type() == QEvent::KeyPress) {
+        const auto keyEvent = dynamic_cast<QKeyEvent*>(event);
+
+        if (keyEvent->key() == Qt::Key_Alt) {
+            setIsNavigating(true);
+
+            return QOpenGLWidget::event(event);
+        }
+    }
+
+    if (event->type() == QEvent::KeyRelease) {
+        const auto keyEvent = dynamic_cast<QKeyEvent*>(event);
+
+        if (keyEvent->key() == Qt::Key_Alt) {
+            setIsNavigating(false);
+
+            return QOpenGLWidget::event(event);
+        }
+    }
+
     return QOpenGLWidget::event(event);
 }
 
@@ -285,18 +304,13 @@ void ScatterplotWidget::computeDensity()
 // by reference then we can upload the data to the GPU, but not store it in the widget.
 void ScatterplotWidget::setData(const std::vector<Vector2f>* points)
 {
-    auto dataBounds = getDataBounds(*points);
-
-    // pass un-adjusted data bounds to renderer for 2D colormapping
-    _pointRenderer.setDataBounds(QRectF(dataBounds.getLeft(), dataBounds.getTop(), dataBounds.getWidth(), dataBounds.getHeight()));
-
-    const auto shouldSetBounds = (mv::projects().isOpeningProject() || mv::projects().isImportingProject()) ? false : !_navigationAction.getFreezeZoomAction().isChecked();
+    auto bounds = getDataBounds(*points);
 
-    //if (shouldSetBounds)
-    //    _pointRenderer.setViewBounds(dataBounds);
+    const auto dataBounds = QRectF(bounds.getLeft(), bounds.getTop(), bounds.getWidth(), bounds.getHeight());
 
-    _densityRenderer.setBounds(dataBounds);
-    _dataRectangleAction.setBounds(dataBounds);
+    _pointRenderer.setDataBounds(dataBounds);
+    _densityRenderer.setDataBounds(dataBounds);
+    _dataRectangleAction.setBounds(bounds);
 
     _pointRenderer.setData(*points);
     _densityRenderer.setData(points);
@@ -316,7 +330,6 @@ void ScatterplotWidget::setData(const std::vector<Vector2f>* points)
             break;
         }
     }
-   // _pointRenderer.setSelectionOutlineColor(Vector3f(1, 0, 0));
 
     update();
 }