updated drawing steps. Refs #13894

eclipse-sumo · Dec 19, 2023 · b1ab211 · b1ab211
1 parent e4597c7
commit b1ab211
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/netedit/elements/network/GNEEdge.cpp b/src/netedit/elements/network/GNEEdge.cpp
@@ -564,17 +564,10 @@ GNEEdge::drawGL(const GUIVisualizationSettings& s) const {
         GLHelper::drawBoundary(s, getCenteringBoundary());
         // get detail level from the first lane
         const auto d = myLanes.front()->getDrawingConstants()->getDetail();
-        // draw draw lanes
-        for (const auto& lane : myLanes) {
-            lane->drawGL(s);
-        }
-        // draw junctions
-        getFromJunction()->drawGL(s);
-        getToJunction()->drawGL(s);
-        // draw geometry points
-        drawEdgeGeometryPoints(s, d);
         // check if draw details
         if (!s.drawForObjectUnderCursor) {
+            // draw geometry points
+            drawEdgeGeometryPoints(s, d);
             // draw edge shape (a red line only visible if lane shape is strange)
             drawEdgeShape(s, d);
             // draw edge stopOffset
@@ -586,10 +579,17 @@ GNEEdge::drawGL(const GUIVisualizationSettings& s) const {
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
+        // calculate edge contour (always before children)
+        calculateEdgeContour(s, d);
+        // draw lanes
+        for (const auto& lane : myLanes) {
+            lane->drawGL(s);
+        }
+        // draw junctions
+        getFromJunction()->drawGL(s);
+        getToJunction()->drawGL(s);
         // draw childrens
         drawChildrens(s, d);
-        // calculate contours
-        calculateContours(s, d);
     }
 }
 
@@ -2733,7 +2733,7 @@ GNEEdge::drawChildrens(const GUIVisualizationSettings& s, const GUIVisualization
 
 
 void
-GNEEdge::calculateContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const {
+GNEEdge::calculateEdgeContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const {
     // calculate contour and draw dotted geometry
     myContour.calculateContourEdge(s, d, this, true, true);
     // get snap radius

diff --git a/src/netedit/elements/network/GNEEdge.h b/src/netedit/elements/network/GNEEdge.h
@@ -489,7 +489,7 @@ class GNEEdge : public GNENetworkElement, public GNECandidateElement {
     void drawChildrens(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const;
 
     /// @brief calculate contours
-    void calculateContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const;
+    void calculateEdgeContour(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d) const;
 
     /// @brief draw TAZElements
     void drawTAZElements(const GUIVisualizationSettings& s) const;

diff --git a/src/netedit/elements/network/GNEJunction.cpp b/src/netedit/elements/network/GNEJunction.cpp
@@ -644,13 +644,13 @@ GNEJunction::drawGL(const GUIVisualizationSettings& s) const {
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
             // draw dotted contour for bubble
             if (drawBubble) {
-                myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
+                myCircleContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
             }
         }
+        // calculate junction contour (always before children)
+        calculateJunctioncontour(s, d, junctionExaggeration, drawBubble);
         // draw Junction childs
         drawJunctionChildren(s, d);
-        // calculate junction contour
-        calculateJunctioncontour(s, d, junctionExaggeration, drawBubble);
     }
 }
 

diff --git a/src/netedit/elements/network/GNELane.cpp b/src/netedit/elements/network/GNELane.cpp
@@ -461,10 +461,10 @@ GNELane::drawGL(const GUIVisualizationSettings& s) const {
         // draw dotted contour
         myContour.drawDottedContours(s, myDrawingConstants->getDetail(), s.dottedContourSettings.segmentWidth, true);
     }
+    // calculate contour (always before children)
+    calculateLaneContour(s);
     // draw children
     drawChildren(s);
-    // calculate contour
-    calculateLaneContour(s);
 }