Updated Details. Refs #13894

src/netedit/GNEPathManager.cpp

@@ -811,7 +811,7 @@ void
 GNEPathManager::drawLanePathElements(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const GNELane* lane) const {
     // check detail level and lane segments
-    if ((d <= GUIVisualizationSettings::Detail::Level2) && (myLaneSegments.count(lane) > 0)) {
+    if (myLaneSegments.count(lane) > 0) {
         int numRoutes = 0;
         // first draw selected elements (for drawing over other elements)
         for (const auto& segment : myLaneSegments.at(lane)) {
@@ -847,7 +847,7 @@ void
 GNEPathManager::drawJunctionPathElements(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const GNEJunction* junction) const {
     // check detail level and junction segments
-    if ((d <= GUIVisualizationSettings::Detail::Level2) && (myJunctionSegments.count(junction) > 0)) {
+    if (myJunctionSegments.count(junction) > 0) {
         // first draw selected elements (for drawing over other elements)
         for (const auto& segment : myJunctionSegments.at(junction)) {
             if (segment->getPathElement()->isPathElementSelected()) {

src/netedit/elements/GNEContour.cpp

@@ -336,7 +336,7 @@ void
 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::Detail::Level2)) {
+    if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::DottedContours)) {
         // basic contours
         if (myAC->checkDrawFromContour()) {
             drawDottedContour(s, GUIDottedGeometry::DottedContourType::FROM, addOffset, lineWidth);

src/netedit/elements/additional/GNEAdditional.cpp

@@ -1180,7 +1180,7 @@ GNEAdditional::drawSemiCircleGeometryPoint(const GUIVisualizationSettings& s, co
         const bool mouseOverPos = gPostDrawing.positionWithinCircle(this, myNet->getViewNet()->getPositionInformation(), pos,
                                                                     s.neteditSizeSettings.additionalGeometryPointRadius);
         // check if draw geometry point
-        if (!s.drawForObjectUnderCursor && (d <= GUIVisualizationSettings::Detail::Level3)) {
+        if (!s.drawForObjectUnderCursor && (d <= GUIVisualizationSettings::Detail::GeometryPoint)) {
             // push matrix
             GLHelper::pushMatrix();
             // translated to front

src/netedit/elements/additional/GNECalibrator.cpp

@@ -463,7 +463,7 @@ GNECalibrator::drawCalibratorSymbol(const GUIVisualizationSettings& s, const GUI
         glVertex2d(0 + s.additionalSettings.calibratorWidth, s.additionalSettings.calibratorHeight);
         glEnd();
         // draw text if isn't being drawn for selecting
-        if (d <= GUIVisualizationSettings::Detail::Level2) {
+        if (d <= GUIVisualizationSettings::Detail::Text) {
             // set color depending of selection status
             RGBColor textColor = drawUsingSelectColor() ? s.colorSettings.selectionColor : RGBColor::BLACK;
             // draw "C"

src/netedit/elements/additional/GNEDetector.cpp

@@ -192,7 +192,7 @@ GNEDetector::drawE1Shape(const GUIVisualizationSettings& s, const GUIVisualizati
     // end draw line
     glEnd();
     // draw center only in draw in level 2
-    if (d <= GUIVisualizationSettings::Detail::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
         // set main color
         GLHelper::setColor(secondColor);
         // set polygon mode
@@ -231,7 +231,7 @@ void
 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::Detail::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::Text) {
         // calculate position
         const Position pos = myAdditionalGeometry.getShape().front();
         // calculate rotation
@@ -254,7 +254,7 @@ void
 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::Detail::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::Text) {
         // calculate middle point
         const double middlePoint = (myAdditionalGeometry.getShape().length2D() * 0.5);
         // calculate position

src/netedit/elements/additional/GNEEntryExitDetector.cpp

@@ -249,7 +249,7 @@ void
 GNEEntryExitDetector::drawBody(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const RGBColor &color, const double exaggeration) const {
     // check detail level
-    if (d <= GUIVisualizationSettings::Detail::Level3) {
+    if (d <= GUIVisualizationSettings::Detail::Additionals) {
         // Push polygon matrix
         GLHelper::pushMatrix();
         // set color
@@ -263,7 +263,7 @@ GNEEntryExitDetector::drawBody(const GUIVisualizationSettings& s, const GUIVisua
         // scale
         glScaled(exaggeration, exaggeration, 1);
         // check detail level
-        if (d <= GUIVisualizationSettings::Detail::Level2) {
+        if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
             // Draw polygon
             glBegin(GL_LINES);
             glVertex2d(1.7, 0);
@@ -302,7 +302,7 @@ void
 GNEEntryExitDetector::drawEntryLogo(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const RGBColor &color, const double exaggeration) const {
     // check detail level
-    if (d <= GUIVisualizationSettings::Detail::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
         // Push matrix
         GLHelper::pushMatrix();
         // set color
@@ -320,14 +320,14 @@ GNEEntryExitDetector::drawEntryLogo(const GUIVisualizationSettings& s, const GUI
         // rotate 90 degrees lane
         glRotated(90, 0, 0, 1);
         // draw Entry or Exit text if isn't being drawn for selecting
-        if (d <= GUIVisualizationSettings::Detail::Level1) {
-            GLHelper::drawBoxLine(Position(0, 1), 0, 2, 1);
-        } else {
+        if (d <= GUIVisualizationSettings::Detail::Text) {
             if (myTagProperty.getTag() == SUMO_TAG_DET_ENTRY) {
                 GLHelper::drawText("Entry", Position(), .1, 1, color, 180);
             } else if (myTagProperty.getTag() == SUMO_TAG_DET_EXIT) {
                 GLHelper::drawText("Exit", Position(), .1, 1, color, 180);
             }
+        } else {
+            GLHelper::drawBoxLine(Position(0, 1), 0, 2, 1);
         }
         // pop matrix
         GLHelper::popMatrix();
@@ -339,7 +339,7 @@ void
 GNEEntryExitDetector::drawE3Logo(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const RGBColor &color, const double exaggeration) const {
     // check detail level
-    if (d <= GUIVisualizationSettings::Detail::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::Text) {
         // Push matrix
         GLHelper::pushMatrix();
         // set color

src/netedit/elements/additional/GNEParkingArea.cpp

@@ -189,7 +189,7 @@ GNEParkingArea::drawGL(const GUIVisualizationSettings& s) const {
             // Traslate to front
             glTranslated(0, 0, 0.1);
             // draw lotSpaceDefinitions
-            if (d <= GUIVisualizationSettings::Detail::Level2) {
+            if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
                 for (const auto& lsd : myLotSpaceDefinitions) {
                     GLHelper::drawSpaceOccupancies(parkingAreaExaggeration, lsd.position, lsd.rotation, lsd.width, lsd.length, true);
                 }

src/netedit/elements/additional/GNEParkingSpace.cpp

@@ -217,7 +217,7 @@ GNEParkingSpace::drawGL(const GUIVisualizationSettings& s) const {
             RGBColor contourColor = s.colorSettings.parkingSpaceColorContour;
             if (drawUsingSelectColor()) {
                 contourColor = s.colorSettings.selectedAdditionalColor;
-            } else if (d <= GUIVisualizationSettings::Detail::Level3) {
+            } else if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
                 contourColor = s.colorSettings.parkingSpaceColorContour;
             }
             // draw parent and child lines
@@ -236,7 +236,7 @@ GNEParkingSpace::drawGL(const GUIVisualizationSettings& s) const {
             PositionVector shapeLengthInner = myShapeLength;
             shapeLengthInner.scaleAbsolute(-0.1);
             // draw intern
-            if (d <= GUIVisualizationSettings::Detail::Level2) {
+            if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
                 // Traslate to front
                 glTranslated(0, 0, 0.1);
                 // set base color

src/netedit/elements/additional/GNERouteProbe.cpp

@@ -185,7 +185,7 @@ GNERouteProbe::drawGL(const GUIVisualizationSettings& s) const {
             // rotate over lane
             GUIGeometry::rotateOverLane(myAdditionalGeometry.getShapeRotations().front() * -1);
             // Draw icon depending of level of detail
-            if (d <= GUIVisualizationSettings::Detail::Level2) {
+            if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
                 // set color
                 glColor3d(1, 1, 1);
                 // rotate texture

src/netedit/elements/additional/GNEStoppingPlace.cpp

@@ -282,10 +282,10 @@ GNEStoppingPlace::getHierarchyName() const {
 
 
 void
-GNEStoppingPlace::drawLines(const GUIVisualizationSettings& s, const const GUIVisualizationSettings::Detail d,
+GNEStoppingPlace::drawLines(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
         const std::vector<std::string>& lines, const RGBColor& color) const {
     // only draw in level 1
-    if (d <= GUIVisualizationSettings::Detail::Level1) {
+    if (d <= GUIVisualizationSettings::Detail::Text) {
         // calculate middle point
         const double middlePoint = (myAdditionalGeometry.getShape().length2D() * 0.5);
         // calculate rotation
@@ -312,10 +312,10 @@ GNEStoppingPlace::drawLines(const GUIVisualizationSettings& s, const const GUIVi
 
 
 void
-GNEStoppingPlace::drawSign(const GUIVisualizationSettings& s, const const GUIVisualizationSettings::Detail d, const double exaggeration,
+GNEStoppingPlace::drawSign(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const double exaggeration,
                            const RGBColor& baseColor, const RGBColor& signColor, const std::string& word) const {
     // only draw in level 2
-    if (d <= GUIVisualizationSettings::Detail::Level2) {
+    if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
         // calculate middle point
         const double middlePoint = (myAdditionalGeometry.getShape().length2D() * 0.5);
         // calculate rotation
@@ -333,7 +333,7 @@ GNEStoppingPlace::drawSign(const GUIVisualizationSettings& s, const const GUIVis
         // Draw circle
         GLHelper::drawFilledCircleDetailled(d, myCircleWidth);
         // continue depending of rectangle selection
-        if (d <= GUIVisualizationSettings::Detail::Level1) {
+        if (d <= GUIVisualizationSettings::Detail::Text) {
             // Traslate to front
             glTranslated(0, 0, .1);
             // set color

src/netedit/elements/additional/GNEStoppingPlace.h

@@ -167,11 +167,11 @@ class GNEStoppingPlace : public GNEAdditional, public Parameterised {
     void setStoppingPlaceGeometry(double movingToSide);
 
     /// @brief draw lines
-    void drawLines(const GUIVisualizationSettings& s, const const GUIVisualizationSettings::Detail d,
+    void drawLines(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
                    const std::vector<std::string>& lines, const RGBColor& color) const;
 
     /// @brief draw sign
-    void drawSign(const GUIVisualizationSettings& s, const const GUIVisualizationSettings::Detail d, const double exaggeration,
+    void drawSign(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d, const double exaggeration,
                   const RGBColor& baseColor, const RGBColor& signColor, const std::string& word) const;
 
     // draw stoppingPlace children

src/netedit/elements/additional/GNEVaporizer.cpp

@@ -172,7 +172,7 @@ GNEVaporizer::drawGL(const GUIVisualizationSettings& s) const {
             // rotate over lane
             GUIGeometry::rotateOverLane(myAdditionalGeometry.getShapeRotations().front() * -1);
             // Draw icon depending of level of detail
-            if (d <= GUIVisualizationSettings::Detail::Level2) {
+            if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
                 // set color
                 glColor3d(1, 1, 1);
                 // rotate texture

src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp

@@ -142,14 +142,14 @@ GNEVariableSpeedSignSymbol::drawGL(const GUIVisualizationSettings& s) const {
             // set color
             RGBColor color;
             if (getParentAdditionals().front()->isAttributeCarrierSelected()) {
-                color = s.colorSettings.selectedAdditionalColor;
+                GLHelper::setColor(s.colorSettings.selectedAdditionalColor);
             } else {
-                color = RGBColor::RED;
+                GLHelper::setColor(RGBColor::RED);
             }
             // draw circle
             GLHelper::drawFilledCircleDetailled(d, (double) 1.3);
             // draw details
-            if (d <= GUIVisualizationSettings::Detail::Level2) {
+            if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
                 // move to front
                 glTranslated(0, 0, 0.1);
                 // set color
@@ -163,10 +163,12 @@ GNEVariableSpeedSignSymbol::drawGL(const GUIVisualizationSettings& s) const {
                 // move to front
                 glTranslated(0, 0, 0.1);
                 // draw speed
-                if (getParentAdditionals().front()->isAttributeCarrierSelected()) {
-                    GLHelper::drawText("S", Position(0, 0), .1, 1.2, s.colorSettings.selectedAdditionalColor, 180);
-                } else {
-                    GLHelper::drawText("S", Position(0, 0), .1, 1.2, RGBColor::YELLOW, 180);
+                if (d <= GUIVisualizationSettings::Detail::Text) {
+                    if (getParentAdditionals().front()->isAttributeCarrierSelected()) {
+                        GLHelper::drawText("S", Position(0, 0), .1, 1.2, s.colorSettings.selectedAdditionalColor, 180);
+                    } else {
+                        GLHelper::drawText("S", Position(0, 0), .1, 1.2, RGBColor::YELLOW, 180);
+                    }
                 }
             }
             // Pop symbol matrix

src/netedit/elements/demand/GNEStop.cpp

@@ -1041,13 +1041,11 @@ GNEStop::drawStopOverLane(const GUIVisualizationSettings& s, const GUIVisualizat
     glTranslated(0, exaggeration * 0.5, 0);
     // draw stop front
     GLHelper::drawBoxLine(Position(0, 0), 0, exaggeration * 0.5, width);
-    // move to "S" position
+    // move to symbol position
     glTranslated(0, 1, 0.1);
-    // only draw text if isn't being drawn for selecting
-    if (s.drawForRectangleSelection) {
-        GLHelper::drawBoxLine(Position(0, 1), 0, 2, 1);
-    } else if (d <= GUIVisualizationSettings::Detail::Level2) {
-        // draw "S" symbol
+    // draw text depending of detail
+    if (d <= GUIVisualizationSettings::Detail::Text) {
+        // draw symbol
         GLHelper::drawText(myTagProperty.isVehicleWaypoint() ? "W" : "S", Position(), .1, 2.8, color, 180);
         // move to subtitle position
         glTranslated(0, 1.4, 0);
@@ -1061,6 +1059,8 @@ GNEStop::drawStopOverLane(const GUIVisualizationSettings& s, const GUIVisualizat
             // draw index
             GLHelper::drawText(getAttribute(GNE_ATTR_STOPINDEX), Position(0, getAttributeDouble(GNE_ATTR_STOPINDEX) * -1, 0), .1, 1, color, 180);
         }
+    } else {
+        GLHelper::drawBoxLine(Position(0, 1), 0, 2, 1);
     }
     // pop detail matrix
     GLHelper::popMatrix();
@@ -1075,7 +1075,7 @@ GNEStop::drawStopOverStoppingPlace(const GUIVisualizationSettings& s, const GUIV
     // Draw the area using shape, shapeRotations, shapeLengths and value of exaggeration taked from stoppingPlace parent
     GUIGeometry::drawGeometry(s, myNet->getViewNet()->getPositionInformation(), myDemandElementGeometry, width);
     // only draw text if isn't being drawn for selecting
-    if (drawIndex() && (d <= GUIVisualizationSettings::Detail::Level2)) {
+    if ((d <= GUIVisualizationSettings::Detail::Text) && drawIndex()) {
         // Add a detail matrix
         GLHelper::pushMatrix();
         // move to geometry front

src/netedit/elements/demand/GNEStopPlan.cpp

@@ -425,7 +425,7 @@ GNEStopPlan::drawStopOverEdge(const GUIVisualizationSettings& s, const GUIVisual
         // move again
         glTranslated(0, s.additionalSettings.vaporizerSize * exaggeration, 0);
         // draw icon depending of detail level
-        if (d <= GUIVisualizationSettings::Detail::Level2) {
+        if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
             // set color
             glColor3d(1, 1, 1);
             // rotate texture
@@ -444,7 +444,7 @@ GNEStopPlan::drawStopOverEdge(const GUIVisualizationSettings& s, const GUIVisual
             // move matrix
             glTranslated(0, 0, 0);
             // draw filled circle
-            GLHelper::drawFilledCircle(0.1 + s.additionalSettings.vaporizerSize, 8);
+            GLHelper::drawFilledCircleDetailled(d, 0.1 + s.additionalSettings.vaporizerSize);
         }
         // pop layer matrix
         GLHelper::popMatrix();
@@ -486,7 +486,7 @@ GNEStopPlan::drawStopOverStoppingPlace(const GUIVisualizationSettings& s, const
         // move again
         glTranslated(s.stoppingPlaceSettings.busStopWidth * exaggeration * -2, 0, 0);
         // draw icon depending of detail level
-        if (d <= GUIVisualizationSettings::Detail::Level2) {
+        if (d <= GUIVisualizationSettings::Detail::AdditionalDetails) {
             // set color
             glColor3d(1, 1, 1);
             // rotate texture

src/netedit/elements/demand/GNEVehicle.cpp

@@ -926,11 +926,11 @@ GNEVehicle::drawGL(const GUIVisualizationSettings& s) const {
                     GUIBaseVehicleHelper::drawAction_drawVehicleAsBoxPlus(width, length);
                 } else {
                     // draw the vehicle depending of detail level
-                    if (d <= GUIVisualizationSettings::Detail::Level1) {
+                    if (d <= GUIVisualizationSettings::Detail::VehiclePoly) {
                         GUIBaseVehicleHelper::drawAction_drawVehicleAsPoly(s, shape, width, length);
-                    } else if (d <= GUIVisualizationSettings::Detail::Level2) {
+                    } else if (d <= GUIVisualizationSettings::Detail::VehicleBox) {
                         GUIBaseVehicleHelper::drawAction_drawVehicleAsBoxPlus(width, length);
-                    } else if (d <= GUIVisualizationSettings::Detail::Level3) {
+                    } else if (d <= GUIVisualizationSettings::Detail::VehicleTriangle) {
                         GUIBaseVehicleHelper::drawAction_drawVehicleAsTrianglePlus(width, length);
                     }
                     // check if min gap has to be drawn