Updated GNEContour. Refs #13894

eclipse-sumo · Dec 19, 2023 · 7eecda0 · 7eecda0
1 parent 6003800
commit 7eecda0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/netedit/elements/GNEContour.cpp b/src/netedit/elements/GNEContour.cpp
@@ -126,6 +126,20 @@ GNEContour::drawDottedContourCircle(const GUIVisualizationSettings& s, const GUI
 }
 
 
+void
+GNEContour::drawDottedContourGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
+        const Position& pos, const int index, double radius, const double scale, const double lineWidth) const {
+    // check if mouse is within geometry (only in rectangle selection mode)
+    if (s.drawForObjectUnderCursor) {
+        // build dotted contour
+        buildDottedContourCircle(s, pos, radius, scale);
+        gPostDrawing.positionWithinGeometryPoint(myAC->getGUIGlObject(), myAC->getNet()->getViewNet()->getPositionInformation(), index, pos, (radius * scale));
+    } else {
+        drawDottedContours(s, d, scale, true, lineWidth);
+    }
+}
+
+
 void
 GNEContour::drawDottedContourEdge(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const GNEEdge* edge, const bool drawFirstExtrem, const bool drawLastExtrem, const double lineWidth) const {

diff --git a/src/netedit/elements/GNEContour.h b/src/netedit/elements/GNEContour.h
@@ -76,10 +76,14 @@ class GNEContour {
                                     const Position& pos, const double width, const double height, const double offsetX,
                                     const double offsetY, const double rot, const double scale, const double lineWidth) const;
 
-    /// @brief draw dotted contour (circle)
+    /// @brief draw dotted contour (circle elements)
     void drawDottedContourCircle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                  const Position& pos, double radius, const double scale, const double lineWidth) const;
 
+    /// @brief draw dotted contour (geometry points elements)
+    void drawDottedContourGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
+                                         const Position& pos, const int index, double radius, const double scale, const double lineWidth) const;
+
     /// @brief draw dotted contour edge
     void drawDottedContourEdge(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                const GNEEdge* edge, const bool drawFirstExtrem, const bool drawLastExtrem,