Added DottedContourType::WALKINGAREA. Fixed #15794

eclipse-sumo · Dec 5, 2024 · e5619f4 · e5619f4
1 parent 509c22f
commit e5619f4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/netedit/elements/network/GNEWalkingArea.cpp b/src/netedit/elements/network/GNEWalkingArea.cpp
@@ -176,7 +176,7 @@ GNEWalkingArea::drawGL(const GUIVisualizationSettings& s) const {
                 }
                 // draw dotted contour
                 if (contourMode) {
-                    myNetworkElementContour.drawDottedContour(s, GUIDottedGeometry::DottedContourType::REMOVE, s.dottedContourSettings.segmentWidth, false);
+                    myNetworkElementContour.drawDottedContour(s, GUIDottedGeometry::DottedContourType::WALKINGAREA, s.dottedContourSettings.segmentWidth, false);
                 } else {
                     myNetworkElementContour.drawDottedContours(s, d, this, s.dottedContourSettings.segmentWidth, true);
                 }

diff --git a/src/utils/gui/div/GUIDottedGeometry.cpp b/src/utils/gui/div/GUIDottedGeometry.cpp
@@ -115,6 +115,8 @@ GUIDottedGeometry::DottedGeometryColor::getColor(const GUIVisualizationSettings&
                 myColorFlag = true;
                 return RGBColor::CYAN.changedBrightness(-30);
             }
+        case DottedContourType::WALKINGAREA:
+            return settings.junctionColorer.getScheme().getColor(6);
         default:
             return RGBColor::BLACK;
     }

diff --git a/src/utils/gui/div/GUIDottedGeometry.h b/src/utils/gui/div/GUIDottedGeometry.h
@@ -32,15 +32,16 @@ class GUIDottedGeometry {
 public:
     /// @enum for dotted cotour type
     enum class DottedContourType {
-        INSPECT,    // Inspecting element
-        REMOVE,     // Mouse over element to remove
-        SELECT,     // Mouse over element to select
-        MOVE,       // Mouse over element to move
-        FRONT,      // Element marked as "front element"
-        OVER,       // Mouse over element (orange)
-        FROM,       // Element marked as from (green)
-        TO,         // Element marked as to (magenta)
-        RELATED,    // Element marked as related (cyan)
+        INSPECT,        // Inspecting element
+        REMOVE,         // Mouse over element to remove
+        SELECT,         // Mouse over element to select
+        MOVE,           // Mouse over element to move
+        FRONT,          // Element marked as "front element"
+        OVER,           // Mouse over element (orange)
+        FROM,           // Element marked as from (green)
+        TO,             // Element marked as to (magenta)
+        RELATED,        // Element marked as related (cyan)
+        WALKINGAREA,    // Used if we're drawing walking areas in contour mode 
         NOTHING
     };