updated data elements. Refs #13894

eclipse-sumo · Dec 19, 2023 · 77b949f · 77b949f
1 parent deb3589
commit 77b949f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/netedit/elements/data/GNEEdgeData.cpp b/src/netedit/elements/data/GNEEdgeData.cpp
@@ -237,8 +237,7 @@ GNEEdgeData::drawLanePartialGL(const GUIVisualizationSettings& s, const GNEPathM
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
         // calculate contour and draw dotted geometry
-        myContour.calculateContourEdge2(s, d, segment->getLane()->getParentEdge(), true, true,
-                                        s.dottedContourSettings.segmentWidth);
+        myContour.calculateContourEdge(s, d, segment->getLane()->getParentEdge(), true, true);
     }
 }
 

diff --git a/src/netedit/elements/data/GNEEdgeRelData.cpp b/src/netedit/elements/data/GNEEdgeRelData.cpp
@@ -204,10 +204,10 @@ GNEEdgeRelData::drawLanePartialGL(const GUIVisualizationSettings& s, const GNEPa
         }
         // draw dotted contour
         if (getParentEdges().front() == segment->getLane()->getParentEdge()) {
-            myContour.calculateContourEdge2(s, d, getParentEdges().front(), true, false, s.dottedContourSettings.segmentWidth);
+            myContour.calculateContourEdge(s, d, getParentEdges().front(), true, false);
         }
         if (getParentEdges().back() == segment->getLane()->getParentEdge()) {
-            myContour.calculateContourEdge2(s, d, getParentEdges().back(), false, true, s.dottedContourSettings.segmentWidth);
+            myContour.calculateContourEdge(s, d, getParentEdges().back(), false, true);
         }
     }
 }
@@ -226,7 +226,7 @@ GNEEdgeRelData::drawJunctionPartialGL(const GUIVisualizationSettings& s, const G
 
         // draw dotted contour
         if (segment->getPreviousLane() && segment->getNextLane()) {
-            myContour.calculateContourEdges2(s, d, segment->getPreviousLane()->getParentEdge(), segment->getNextLane()->getParentEdge(), s.dottedContourSettings.segmentWidth);
+            myContour.calculateContourEdges(s, d, segment->getPreviousLane()->getParentEdge(), segment->getNextLane()->getParentEdge());
         }
     }
 }

diff --git a/src/netedit/elements/data/GNETAZRelData.cpp b/src/netedit/elements/data/GNETAZRelData.cpp
@@ -297,12 +297,10 @@ GNETAZRelData::drawGL(const GUIVisualizationSettings& s) const {
         }
         if (myNet->getViewNet()->getDataViewOptions().TAZRelDrawing()) {
             // calculate contour and draw dotted geometry
-            myContour.calculateContourExtrudedShape2(s, d, myTAZRelGeometryCenter.getShape(), 0.5, 1, true, true, 0,
-                                                s.dottedContourSettings.segmentWidth);
+            myContour.calculateContourExtrudedShape(s, d, myTAZRelGeometryCenter.getShape(), 0.5, 1, true, true, 0);
         } else {
             // calculate contour and draw dotted geometry
-            myContour.calculateContourExtrudedShape2(s, d, myTAZRelGeometry.getShape(), 0.5, 1, true, true, 0,
-                                                s.dottedContourSettings.segmentWidth);
+            myContour.calculateContourExtrudedShape(s, d, myTAZRelGeometry.getShape(), 0.5, 1, true, true, 0);
         }
     }
 }