Updated additionals. Refs #13894

eclipse-sumo · Dec 19, 2023 · e7195b1 · e7195b1
1 parent 2680d5f
commit e7195b1
Show file tree

Hide file tree

Showing 30 changed files with 561 additions and 476 deletions.
diff --git a/src/netedit/elements/additional/GNEAccess.cpp b/src/netedit/elements/additional/GNEAccess.cpp
@@ -238,9 +238,8 @@ GNEAccess::drawGL(const GUIVisualizationSettings& s) const {
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidthSmall, true);
         }
-        // check object in view
-        myContour.calculateContourCircleShape2(s, d, myAdditionalGeometry.getShape().front(), 1, accessExaggeration,
-                                              s.dottedContourSettings.segmentWidthSmall);
+        // calculate contour
+        myContour.calculateContourCircleShape(s, d, myAdditionalGeometry.getShape().front(), 1, accessExaggeration);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEAdditional.cpp b/src/netedit/elements/additional/GNEAdditional.cpp
@@ -720,9 +720,8 @@ GNEAdditional::drawSquaredAdditional(const GUIVisualizationSettings& s, const Po
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
-        // draw squared shape
-        myContour.calculateContourRectangleShape2(s, d, pos, size, size, 0, 0, 0, exaggeration,
-                                             s.dottedContourSettings.segmentWidth);
+        // calculate contour
+        myContour.calculateContourRectangleShape(s, d, pos, size, size, 0, 0, 0, exaggeration);
     }
 }
 
@@ -821,9 +820,8 @@ GNEAdditional::drawListedAdditional(const GUIVisualizationSettings& s, const Pos
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
-        // draw squared shape
-        myContour.calculateContourRectangleShape2(s, d, signPosition, 0.56, 2.75, 0, -2.3, 0, 1,
-                                             s.dottedContourSettings.segmentWidth);
+        // calculate contour
+        myContour.calculateContourRectangleShape(s, d, signPosition, 0.56, 2.75, 0, -2.3, 0, 1);
     }
 }
 
@@ -842,6 +840,17 @@ GNEAdditional::drawMovingGeometryPoints(const bool ignoreShift) const {
 }
 
 
+void
+GNEAdditional::drawDemandElementChildren(const GUIVisualizationSettings& s) const {
+    // draw child demand elements
+    for (const auto& demandElement : getChildDemandElements()) {
+        if (!demandElement->getTagProperty().isPlacedInRTree()) {
+            demandElement->drawGL(s);
+        }
+    }
+}
+
+
 GNEMoveOperation*
 GNEAdditional::getMoveOperationSingleLane(const double startPos, const double endPos) {
     // get allow change lane
@@ -982,6 +991,29 @@ GNEAdditional::getJuPedSimIcon(SumoXMLTag tag) {
 }
 
 
+void
+GNEAdditional::calculateContourPolygons(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
+                                        const double exaggeration, const bool contouredShape) const {
+    // calculate contour depenidng of contoured shape
+    if (contouredShape) {
+        myContour.calculateContourClosedShape(s, d, myAdditionalGeometry.getShape(), 1);
+    } else {
+        myContour.calculateContourExtrudedShape(s, d, myAdditionalGeometry.getShape(), s.neteditSizeSettings.polylineWidth,
+                                                 exaggeration, true, true, 0);
+    }
+    // get edit modes
+    const auto &editModes = myNet->getViewNet()->getEditModes();
+    // check if draw geometry points
+    if (editModes.isCurrentSupermodeNetwork() && !myNet->getViewNet()->getViewParent()->getMoveFrame()->getNetworkModeOptions()->getMoveWholePolygons()) {
+        // get geometry point radius (size depends if we're in move mode)
+        const double geometryPointRaidus = s.neteditSizeSettings.additionalGeometryPointRadius * ((editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE)? 1 : 0.5);
+        // calculate contour geometry points
+        myContour.calculateContourGeometryPoints(s, d, myAdditionalGeometry.getShape(), GNEContour::GeometryPoint::ALL,
+                                                 geometryPointRaidus, exaggeration, s.dottedContourSettings.segmentWidth);
+    }
+}
+
+
 GNELane*
 GNEAdditional::getFirstPathLane() const {
     return getParentLanes().front();

diff --git a/src/netedit/elements/additional/GNEAdditional.h b/src/netedit/elements/additional/GNEAdditional.h
@@ -410,6 +410,9 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
     /// @brief check if draw additional extrem geometry points
     bool drawMovingGeometryPoints(const bool ignoreShift) const;
 
+    /// @brief draw demand element children
+    void drawDemandElementChildren(const GUIVisualizationSettings& s) const;
+
     /// @brief get moveOperation for an element over single lane
     GNEMoveOperation* getMoveOperationSingleLane(const double startPos, const double endPos);
 
@@ -439,6 +442,15 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
 
     /// @}
 
+    /// @name calculate contours
+    /// @{
+
+    /// @brief calculate contour for polygons
+    void calculateContourPolygons(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
+                                  const double exaggeration, const bool contouredShape) const;
+
+    /// @}
+
 private:
     /**@brief check restriction with the number of children
      * @throw ProcessError if is called without be reimplemented in child class

diff --git a/src/netedit/elements/additional/GNEBusStop.cpp b/src/netedit/elements/additional/GNEBusStop.cpp
@@ -125,7 +125,7 @@ GNEBusStop::drawGL(const GUIVisualizationSettings& s) const {
         // Obtain exaggeration of the draw
         const double busStopExaggeration = getExaggeration(s);
         // check if draw moving geometry points
-        const int movingGeometryPoints = drawMovingGeometryPoints(false);
+        const bool movingGeometryPoints = drawMovingGeometryPoints(false);
         // get width
         const double stopWidth = (myTagProperty.getTag() == SUMO_TAG_BUS_STOP) ? s.stoppingPlaceSettings.busStopWidth : s.stoppingPlaceSettings.trainStopWidth;
         // get detail level
@@ -187,10 +187,10 @@ GNEBusStop::drawGL(const GUIVisualizationSettings& s) const {
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
-        // draw stoppingPlace children
-        drawStoppingPlaceChildren(s);
-        // check object in view
-        checkViewObject(s, d, stopWidth, movingGeometryPoints);
+        // draw demand element children
+        drawDemandElementChildren(s);
+        // calculate contour
+        calculateStoppingPlaceContour(s, d, stopWidth, movingGeometryPoints);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNECalibrator.cpp b/src/netedit/elements/additional/GNECalibrator.cpp
@@ -481,8 +481,9 @@ GNECalibrator::drawCalibratorSymbol(const GUIVisualizationSettings& s, const GUI
         myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
     }
     // draw dotted contour
-    myContour.calculateContourRectangleShape2(s, d, pos, s.additionalSettings.calibratorWidth, s.additionalSettings.calibratorHeight * 0.5, 0,
-                                         s.additionalSettings.calibratorHeight * 0.5, rot, exaggeration, s.dottedContourSettings.segmentWidth);
+    myContour.calculateContourRectangleShape(s, d, pos, s.additionalSettings.calibratorWidth,
+                                             s.additionalSettings.calibratorHeight * 0.5, 0, 0,
+                                             rot, exaggeration);
 }
 
 void

diff --git a/src/netedit/elements/additional/GNEChargingStation.cpp b/src/netedit/elements/additional/GNEChargingStation.cpp
@@ -180,9 +180,9 @@ GNEChargingStation::drawGL(const GUIVisualizationSettings& s) const {
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
         // draw stoppingPlace children
-        drawStoppingPlaceChildren(s);
-        // check object in view
-        checkViewObject(s, d, s.stoppingPlaceSettings.chargingStationWidth, movingGeometryPoints);
+        drawDemandElementChildren(s);
+        // calculate contour
+        calculateStoppingPlaceContour(s, d, s.stoppingPlaceSettings.chargingStationWidth, movingGeometryPoints);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEContainerStop.cpp b/src/netedit/elements/additional/GNEContainerStop.cpp
@@ -176,10 +176,10 @@ GNEContainerStop::drawGL(const GUIVisualizationSettings& s) const {
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
-        // draw stoppingPlace children
-        drawStoppingPlaceChildren(s);
-        // check object in view
-        checkViewObject(s, d, s.stoppingPlaceSettings.containerStopWidth, movingGeometryPoints);
+        // draw demand element children
+        drawDemandElementChildren(s);
+        // calculate contour
+        calculateStoppingPlaceContour(s, d, s.stoppingPlaceSettings.containerStopWidth, movingGeometryPoints);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEEntryExitDetector.cpp b/src/netedit/elements/additional/GNEEntryExitDetector.cpp
@@ -160,10 +160,9 @@ GNEEntryExitDetector::drawGL(const GUIVisualizationSettings& s) const {
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
-        // draw dotted contour
-        myContour.calculateContourRectangleShape2(s, d, myAdditionalGeometry.getShape().front(), 2.7, 1.6, 2, 0,
-                                             myAdditionalGeometry.getShapeRotations().front(), entryExitExaggeration,
-                                             s.dottedContourSettings.segmentWidth);
+        // calculate contour
+        myContour.calculateContourRectangleShape(s, d, myAdditionalGeometry.getShape().front(), 2.7, 1.6, 2, 0,
+                                                 myAdditionalGeometry.getShapeRotations().front(), entryExitExaggeration);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEInductionLoopDetector.cpp b/src/netedit/elements/additional/GNEInductionLoopDetector.cpp
@@ -198,10 +198,9 @@ GNEInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const {
             // draw dotted contour
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
-        // draw dotted contour
-        myContour.calculateContourRectangleShape2(s, d, myAdditionalGeometry.getShape().front(), 2, 1, 0, 0,
-                                                myAdditionalGeometry.getShapeRotations().front(), E1Exaggeration,
-                                                s.dottedContourSettings.segmentWidth);
+        // calculate contour rectangle
+        myContour.calculateContourRectangleShape(s, d, myAdditionalGeometry.getShape().front(), 2, 1, 0, 0,
+                                                myAdditionalGeometry.getShapeRotations().front(), E1Exaggeration);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp b/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp
@@ -181,9 +181,8 @@ GNEInstantInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const
             myContour.drawDottedContours(s, d, s.dottedContourSettings.segmentWidth, true);
         }
         // draw dotted contour
-        myContour.calculateContourRectangleShape2(s, d, myAdditionalGeometry.getShape().front(), 2, 1, 0, 0,
-                                                  myAdditionalGeometry.getShapeRotations().front(), E1InstantExaggeration,
-                                                  s.dottedContourSettings.segmentWidth);
+        myContour.calculateContourRectangleShape(s, d, myAdditionalGeometry.getShape().front(), 2, 1, 0, 0,
+                                                  myAdditionalGeometry.getShapeRotations().front(), E1InstantExaggeration);
     }
 }