Renamed Detail. Refs #13894

eclipse-sumo · Dec 19, 2023 · 7d6b818 · 7d6b818
1 parent aec1ab0
commit 7d6b818
Show file tree

Hide file tree

Showing 41 changed files with 181 additions and 181 deletions.
diff --git a/src/netedit/GNEPathManager.cpp b/src/netedit/GNEPathManager.cpp
@@ -808,10 +808,10 @@ GNEPathManager::removePath(PathElement* pathElement) {
 
 
 void
-GNEPathManager::drawLanePathElements(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEPathManager::drawLanePathElements(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const GNELane* lane) const {
     // check detail level and lane segments
-    if ((d <= GUIVisualizationSettings::DetailLevel::Level2) && (myLaneSegments.count(lane) > 0)) {
+    if ((d <= GUIVisualizationSettings::Detail::Level2) && (myLaneSegments.count(lane) > 0)) {
         int numRoutes = 0;
         // first draw selected elements (for drawing over other elements)
         for (const auto& segment : myLaneSegments.at(lane)) {
@@ -844,10 +844,10 @@ GNEPathManager::drawLanePathElements(const GUIVisualizationSettings& s, GUIVisua
 
 
 void
-GNEPathManager::drawJunctionPathElements(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEPathManager::drawJunctionPathElements(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const GNEJunction* junction) const {
     // check detail level and junction segments
-    if ((d <= GUIVisualizationSettings::DetailLevel::Level2) && (myJunctionSegments.count(junction) > 0)) {
+    if ((d <= GUIVisualizationSettings::Detail::Level2) && (myJunctionSegments.count(junction) > 0)) {
         // first draw selected elements (for drawing over other elements)
         for (const auto& segment : myJunctionSegments.at(junction)) {
             if (segment->getPathElement()->isPathElementSelected()) {

diff --git a/src/netedit/GNEPathManager.h b/src/netedit/GNEPathManager.h
@@ -333,10 +333,10 @@ class GNEPathManager {
     void removePath(PathElement* pathElement);
 
     /// @brief draw lane path elements
-    void drawLanePathElements(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const GNELane* lane) const;
+    void drawLanePathElements(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const GNELane* lane) const;
 
     /// @brief draw junction path elements
-    void drawJunctionPathElements(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const GNEJunction* junction) const;
+    void drawJunctionPathElements(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const GNEJunction* junction) const;
 
     /// @brief force draw path (used carefully, ONLY when we're inspecting a path element, due slowdowns)
     void forceDrawPath(const GUIVisualizationSettings& s, const PathElement* pathElement) const;

diff --git a/src/netedit/elements/GNEContour.cpp b/src/netedit/elements/GNEContour.cpp
@@ -69,7 +69,7 @@ GNEContour::reset() const {
 
 
 void
-GNEContour::drawDottedContourClosed(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEContour::drawDottedContourClosed(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const PositionVector& shape, const double scale, const bool addOffset, const double lineWidth) const {
     // check if mouse is within geometry (only in rectangle selection mode)
     if (s.drawForObjectUnderCursor) {
@@ -83,7 +83,7 @@ GNEContour::drawDottedContourClosed(const GUIVisualizationSettings& s, GUIVisual
 
 
 void
-GNEContour::drawDottedContourExtruded(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEContour::drawDottedContourExtruded(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const PositionVector& shape, const double extrusionWidth, const double scale, const bool drawFirstExtrem,
         const bool drawLastExtrem, const double lineWidth) const {
     // check if mouse is within two lines (only in rectangle selection mode)
@@ -98,7 +98,7 @@ GNEContour::drawDottedContourExtruded(const GUIVisualizationSettings& s, GUIVisu
 
 
 void
-GNEContour::drawDottedContourRectangle(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEContour::drawDottedContourRectangle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const Position& pos, const double width, const double height, const double offsetX, const double offsetY,
         const double rot, const double scale, const double lineWidth) const {
     // check if mouse is within geometry (only in rectangle selection mode)
@@ -113,7 +113,7 @@ GNEContour::drawDottedContourRectangle(const GUIVisualizationSettings& s, GUIVis
 
 
 void
-GNEContour::drawDottedContourCircle(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEContour::drawDottedContourCircle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const Position& pos, double radius, const double scale, const double lineWidth) const {
     // check if mouse is within geometry (only in rectangle selection mode)
     if (s.drawForObjectUnderCursor) {
@@ -127,7 +127,7 @@ GNEContour::drawDottedContourCircle(const GUIVisualizationSettings& s, GUIVisual
 
 
 void
-GNEContour::drawDottedContourEdge(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEContour::drawDottedContourEdge(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const GNEEdge* edge, const bool drawFirstExtrem, const bool drawLastExtrem, const double lineWidth) const {
     // check if mouse is within two lines (only in rectangle selection mode)
     if (s.drawForObjectUnderCursor) {
@@ -141,7 +141,7 @@ GNEContour::drawDottedContourEdge(const GUIVisualizationSettings& s, GUIVisualiz
 
 
 void
-GNEContour::drawDottedContourEdges(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEContour::drawDottedContourEdges(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const GNEEdge* fromEdge, const GNEEdge* toEdge, const double lineWidth) const {
     // first build dotted contour (only in rectangle selection mode)
     buildDottedContourEdges(s, fromEdge, toEdge);
@@ -333,10 +333,10 @@ GNEContour::buildDottedContourEdges(const GUIVisualizationSettings& /*s*/,const
 
 
 void
-GNEContour::drawDottedContours(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEContour::drawDottedContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const double scale, const bool addOffset, const double lineWidth) const {
     // first check if draw dotted contour
-    if (!s.disableDottedContours && (d <= GUIVisualizationSettings::DetailLevel::Level2)) {
+    if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::Level2)) {
         // basic contours
         if (myAC->checkDrawFromContour()) {
             drawDottedContour(s, GUIDottedGeometry::DottedContourType::FROM, addOffset, lineWidth);

diff --git a/src/netedit/elements/GNEContour.h b/src/netedit/elements/GNEContour.h
@@ -53,31 +53,31 @@ class GNEContour {
     /// @{
 
     /// @brief draw dotted contour (for closed shapes)
-    void drawDottedContourClosed(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawDottedContourClosed(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                  const PositionVector& shape, const double scale, const bool addOffset,
                                  const double lineWidth) const;
 
     /// @brief draw dotted contour extruded (used in elements formed by a central shape)
-    void drawDottedContourExtruded(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawDottedContourExtruded(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                    const PositionVector& shape, const double extrusionWidth, const double scale,
                                    const bool drawFirstExtrem, const bool drawLastExtrem, const double lineWidth) const;
 
     /// @brief draw dotted contour (for rectangled elements)
-    void drawDottedContourRectangle(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawDottedContourRectangle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                     const Position& pos, const double width, const double height, const double offsetX,
                                     const double offsetY, const double rot, const double scale, const double lineWidth) const;
 
     /// @brief draw dotted contour (circle)
-    void drawDottedContourCircle(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawDottedContourCircle(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                  const Position& pos, double radius, const double scale, const double lineWidth) const;
 
     /// @brief draw dotted contour edge
-    void drawDottedContourEdge(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawDottedContourEdge(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                const GNEEdge* edge, const bool drawFirstExtrem, const bool drawLastExtrem,
                                const double lineWidth) const;
 
     /// @brief draw dotted contour between two edges
-    void drawDottedContourEdges(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawDottedContourEdges(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                 const GNEEdge* fromEdge, const GNEEdge* toEdge, const double lineWidth) const;
 
     /// @}
@@ -124,7 +124,7 @@ class GNEContour {
     PositionVector buildDottedContourEdges(const GUIVisualizationSettings& s, const GNEEdge* fromEdge, const GNEEdge* toEdge) const;
 
     /// @brief draw dotted contours
-    void drawDottedContours(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawDottedContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                             const double scale, const bool addOffset, const double lineWidth) const;
 
     /// @brief draw dotted contour

diff --git a/src/netedit/elements/additional/GNEAdditional.cpp b/src/netedit/elements/additional/GNEAdditional.cpp
@@ -1051,26 +1051,26 @@ GNEAdditional::drawParentChildLines(const GUIVisualizationSettings& s, const RGB
 
 
 void
-GNEAdditional::drawUpGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+GNEAdditional::drawUpGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                                    const double rot, const RGBColor& baseColor, const bool ignoreShift) const {
     drawSemiCircleGeometryPoint(s, d, pos, rot, baseColor, -90, 90, ignoreShift);
 }
 
 void
-GNEAdditional::drawDownGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+GNEAdditional::drawDownGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                                      const double rot, const RGBColor& baseColor, const bool ignoreShift) const {
     drawSemiCircleGeometryPoint(s, d, pos, rot, baseColor, 90, 270, ignoreShift);
 }
 
 void
-GNEAdditional::drawLeftGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+GNEAdditional::drawLeftGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                                      const double rot, const RGBColor& baseColor, const bool ignoreShift) const {
     drawSemiCircleGeometryPoint(s, d, pos, rot, baseColor, -90, 90, ignoreShift);
 }
 
 
 void
-GNEAdditional::drawRightGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+GNEAdditional::drawRightGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                                       const double rot, const RGBColor& baseColor, const bool ignoreShift) const {
     drawSemiCircleGeometryPoint(s, d, pos, rot, baseColor, 270, 90, ignoreShift);
 }
@@ -1169,7 +1169,7 @@ GNEAdditional::checkChildAdditionalRestriction() const {
 
 
 void
-GNEAdditional::drawSemiCircleGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEAdditional::drawSemiCircleGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const Position& pos, const double rot, const RGBColor& baseColor, const double fromAngle, const double toAngle,
         const bool ignoreShift) const {
     // first check that we're in move mode and shift key is pressed
@@ -1180,7 +1180,7 @@ GNEAdditional::drawSemiCircleGeometryPoint(const GUIVisualizationSettings& s, GU
         const bool mouseOverPos = gPostDrawing.positionWithinCircle(this, myNet->getViewNet()->getPositionInformation(), pos,
                                                                     s.neteditSizeSettings.additionalGeometryPointRadius);
         // check if draw geometry point
-        if (!s.drawForObjectUnderCursor && (d <= GUIVisualizationSettings::DetailLevel::Level3)) {
+        if (!s.drawForObjectUnderCursor && (d <= GUIVisualizationSettings::Detail::Level3)) {
             // push matrix
             GLHelper::pushMatrix();
             // translated to front

diff --git a/src/netedit/elements/additional/GNEAdditional.h b/src/netedit/elements/additional/GNEAdditional.h
@@ -313,19 +313,19 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
     void drawParentChildLines(const GUIVisualizationSettings& s, const RGBColor& color, const bool onlySymbols = false) const;
 
     /// @brief draw up geometry point
-    void drawUpGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+    void drawUpGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                              const double rot, const RGBColor& baseColor, const bool ignoreShift = false) const;
 
     /// @brief draw down geometry point
-    void drawDownGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+    void drawDownGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                                const double rot, const RGBColor& baseColor, const bool ignoreShift = false) const;
 
     /// @brief draw left geometry point
-    void drawLeftGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+    void drawLeftGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                                const double rot, const RGBColor& baseColor, const bool ignoreShift = false) const;
 
     /// @brief draw right geometry point
-    void drawRightGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const Position& pos,
+    void drawRightGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const Position& pos,
                                 const double rot, const RGBColor& baseColor, const bool ignoreShift = false) const;
 
     /// @brief get draw position index (used in rerouters and VSS)
@@ -453,7 +453,7 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
     virtual void commitMoveShape(const GNEMoveResult& moveResult, GNEUndoList* undoList) = 0;
 
     /// @brief draw geometry point
-    void drawSemiCircleGeometryPoint(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+    void drawSemiCircleGeometryPoint(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                      const Position& pos, const double rot, const RGBColor& baseColor,
                                      const double fromAngle, const double toAngle, const bool ignoreShift) const;
 

diff --git a/src/netedit/elements/additional/GNECalibrator.cpp b/src/netedit/elements/additional/GNECalibrator.cpp
@@ -433,7 +433,7 @@ GNECalibrator::getHierarchyName() const {
 // ===========================================================================
 
 void
-GNECalibrator::drawCalibratorSymbol(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const double exaggeration,
+GNECalibrator::drawCalibratorSymbol(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const double exaggeration,
         const Position& pos, const double rot) const {
     // draw geometry only if we'rent in drawForObjectUnderCursor mode
     if (!s.drawForObjectUnderCursor) {
@@ -463,7 +463,7 @@ GNECalibrator::drawCalibratorSymbol(const GUIVisualizationSettings& s, GUIVisual
         glVertex2d(0 + s.additionalSettings.calibratorWidth, s.additionalSettings.calibratorHeight);
         glEnd();
         // draw text if isn't being drawn for selecting
-        if (d <= GUIVisualizationSettings::DetailLevel::Level2) {
+        if (d <= GUIVisualizationSettings::Detail::Level2) {
             // set color depending of selection status
             RGBColor textColor = drawUsingSelectColor() ? s.colorSettings.selectionColor : RGBColor::BLACK;
             // draw "C"

diff --git a/src/netedit/elements/additional/GNECalibrator.h b/src/netedit/elements/additional/GNECalibrator.h
@@ -228,7 +228,7 @@ class GNECalibrator : public GNEAdditional, public Parameterised {
 
 private:
     /// @brief draw calibrator symbol
-    void drawCalibratorSymbol(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d, const double exaggeration, const Position& pos, const double rot) const;
+    void drawCalibratorSymbol(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const double exaggeration, const Position& pos, const double rot) const;
 
     /// @brief set attribute after validation
     void setAttribute(SumoXMLAttr key, const std::string& value);

diff --git a/src/netedit/elements/additional/GNEDetector.cpp b/src/netedit/elements/additional/GNEDetector.cpp
@@ -158,7 +158,7 @@ GNEDetector::getHierarchyName() const {
 
 
 void
-GNEDetector::drawE1Shape(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEDetector::drawE1Shape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                          const double exaggeration, const double scaledWidth, const RGBColor& mainColor,
                          const RGBColor& secondColor) const {
     // push matrix
@@ -192,7 +192,7 @@ GNEDetector::drawE1Shape(const GUIVisualizationSettings& s, GUIVisualizationSett
     // end draw line
     glEnd();
     // draw center only in draw in level 2
-    if (d <= GUIVisualizationSettings::DetailLevel::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::Level2) {
         // set main color
         GLHelper::setColor(secondColor);
         // set polygon mode
@@ -228,10 +228,10 @@ GNEDetector::drawE1Shape(const GUIVisualizationSettings& s, GUIVisualizationSett
 
 
 void
-GNEDetector::drawE1DetectorLogo(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEDetector::drawE1DetectorLogo(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                 const double exaggeration, const std::string& logo, const RGBColor& textColor) const {
     // only draw in level 2
-    if (d <= GUIVisualizationSettings::DetailLevel::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::Level2) {
         // calculate position
         const Position pos = myAdditionalGeometry.getShape().front();
         // calculate rotation
@@ -251,10 +251,10 @@ GNEDetector::drawE1DetectorLogo(const GUIVisualizationSettings& s, GUIVisualizat
 
 
 void
-GNEDetector::drawE2DetectorLogo(const GUIVisualizationSettings& s, GUIVisualizationSettings::DetailLevel d,
+GNEDetector::drawE2DetectorLogo(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                                 const double exaggeration, const std::string& logo, const RGBColor& textColor) const {
     // only draw in level 2
-    if (d <= GUIVisualizationSettings::DetailLevel::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::Level2) {
         // calculate middle point
         const double middlePoint = (myAdditionalGeometry.getShape().length2D() * 0.5);
         // calculate position