Reduced calls to lane drawing constants. Refs #13894

eclipse-sumo · Dec 19, 2023 · 21d1da3 · 21d1da3
1 parent b084f04
commit 21d1da3
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 99 deletions.
diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp
@@ -5357,10 +5357,9 @@ GNEViewNet::drawTemporalSplitJunction() const {
             (gPostDrawing.markedEdge != nullptr)) {
         // calculate split position
         const auto lane = gPostDrawing.markedEdge->getLanes().back();
-        const auto laneDrawingConstants = GNELane::LaneDrawingConstants(*myVisualizationSettings, lane);
         auto shape = lane->getLaneShape();
         // move shape to side
-        shape.move2side(laneDrawingConstants.width * -1);
+        shape.move2side(lane->getLaneDrawingConstants()->getWidth() * -1);
         const auto offset = shape.nearest_offset_to_point2D(snapToActiveGrid(getPositionInformation()));
         const auto splitPosition = shape.positionAtOffset2D(offset);
         // get junction exaggeration

diff --git a/src/netedit/elements/GNEContour.cpp b/src/netedit/elements/GNEContour.cpp
@@ -287,15 +287,12 @@ GNEContour::buildDottedContourEdge(const GUIVisualizationSettings& s, const GNEE
     // obtain lanes
     const GNELane* topLane = lefthand ? edge->getLanes().front() : edge->getLanes().back();
     const GNELane* botLane = lefthand ? edge->getLanes().back() : edge->getLanes().front();
-    // obtain both LaneDrawingConstants
-    GNELane::LaneDrawingConstants laneDrawingConstantsTop(s, topLane);
-    GNELane::LaneDrawingConstants laneDrawingConstantsBot(s, botLane);
     // create top and bot geometries
     myDottedGeometries->at(0) = GUIDottedGeometry(s, topLane->getLaneGeometry().getShape(), false, true);
     myDottedGeometries->at(2) = GUIDottedGeometry(s, botLane->getLaneGeometry().getShape().reverse(), false, true);
     // move geometries top and bot
-    myDottedGeometries->at(0).moveShapeToSide((laneDrawingConstantsTop.width * laneDrawingConstantsTop.exaggeration) * -1);
-    myDottedGeometries->at(2).moveShapeToSide((laneDrawingConstantsBot.width * laneDrawingConstantsBot.exaggeration) * -1);
+    myDottedGeometries->at(0).moveShapeToSide(topLane->getLaneDrawingConstants()->getWidth() * topLane->getLaneDrawingConstants()->getExaggeration() * -1);
+    myDottedGeometries->at(2).moveShapeToSide(botLane->getLaneDrawingConstants()->getWidth() * botLane->getLaneDrawingConstants()->getExaggeration() * -1);
     // create left and right geometries
     if (drawFirstExtrem) {
         myDottedGeometries->at(3) = GUIDottedGeometry(s, {

diff --git a/src/netedit/elements/demand/GNEStopPlan.cpp b/src/netedit/elements/demand/GNEStopPlan.cpp
@@ -161,15 +161,14 @@ GNEStopPlan::updateGeometry() {
         // get front and back lane
         const GNELane* frontLane = getParentEdges().front()->getLanes().front();
         const GNELane* backLane = getParentEdges().front()->getLanes().back();
-        // get lane drawing constants
-        GNELane::LaneDrawingConstants laneDrawingConstantsFront(myNet->getViewNet()->getVisualisationSettings(), frontLane);
-        GNELane::LaneDrawingConstants laneDrawingConstantBack(myNet->getViewNet()->getVisualisationSettings(), backLane);
         // calculate front position
-        const Position frontPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), laneDrawingConstantsFront.width);
+        const Position frontPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS),
+                                                                                    frontLane->getLaneDrawingConstants()->getWidth());
         // calulate length between both shapes
         const double length = backLane->getLaneShape().distance2D(frontPosition, true);
         // calculate back position
-        const Position backPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), (length + laneDrawingConstantBack.width - laneDrawingConstantsFront.width) * -1);
+        const Position backPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS),
+                                                                                   (length + backLane->getLaneDrawingConstants()->getWidth() - frontLane->getLaneDrawingConstants()->getWidth()) * -1);
         // update demand element geometry using both positions
         myDemandElementGeometry.updateGeometry({frontPosition, backPosition});
     }

diff --git a/src/netedit/elements/network/GNEEdge.cpp b/src/netedit/elements/network/GNEEdge.cpp
@@ -2751,8 +2751,6 @@ GNEEdge::drawTAZElements(const GUIVisualizationSettings& s) const {
             }
             // iterate over lanes
             for (const auto& lane : myLanes) {
-                // get lane drawing constants
-                GNELane::LaneDrawingConstants laneDrawingConstants(s, lane);
                 // Push layer matrix
                 GLHelper::pushMatrix();
                 // translate to front (note: Special case)
@@ -2772,8 +2770,8 @@ GNEEdge::drawTAZElements(const GUIVisualizationSettings& s) const {
                     GLHelper::setColor(RGBColor::CYAN);
                 }
                 // draw as box lines
-                GUIGeometry::drawGeometry(s, myNet->getViewNet()->getPositionInformation(),
-                                          lane->getLaneGeometry(), laneDrawingConstants.width);
+                GUIGeometry::drawGeometry(s, myNet->getViewNet()->getPositionInformation(), lane->getLaneGeometry(),
+                                          lane->getLaneDrawingConstants()->getWidth());
                 // Pop layer matrix
                 GLHelper::popMatrix();
             }