Fixed warnings. Refs #13894

eclipse-sumo · Dec 19, 2023 · 7dc12d7 · 7dc12d7
1 parent cdb9b12
commit 7dc12d7
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 30 deletions.
diff --git a/src/netedit/elements/GNEContour.cpp b/src/netedit/elements/GNEContour.cpp
@@ -73,7 +73,7 @@ GNEContour::drawDottedContourClosed(const GUIVisualizationSettings& s, const GUI
         const auto closedShape = buildDottedContourClosed(s, d, shape, scale);
         gObjectsInPosition.positionWithinShape(myAC->getGUIGlObject(), myAC->getNet()->getViewNet()->getPositionInformation(), closedShape);
     } else {
-        drawDottedContours(s, d, scale, addOffset, lineWidth);
+        drawDottedContours(s, d, addOffset, lineWidth);
     }
 }
 
@@ -88,7 +88,7 @@ GNEContour::drawDottedContourExtruded(const GUIVisualizationSettings& s, const G
         const auto extrudedShape = buildDottedContourExtruded(s, d, shape, extrusionWidth, scale, drawFirstExtrem, drawLastExtrem, offset);
         gObjectsInPosition.positionWithinShape(myAC->getGUIGlObject(), myAC->getNet()->getViewNet()->getPositionInformation(), extrudedShape);
     } else {
-        drawDottedContours(s, d, scale, true, lineWidth);
+        drawDottedContours(s, d, true, lineWidth);
     }
 }
 
@@ -103,7 +103,7 @@ GNEContour::drawDottedContourRectangle(const GUIVisualizationSettings& s, const
         const auto rectangleShape = buildDottedContourRectangle(s, d, pos, width, height, offsetX, offsetY, rot, scale);
         gObjectsInPosition.positionWithinShape(myAC->getGUIGlObject(), myAC->getNet()->getViewNet()->getPositionInformation(), rectangleShape);
     } else {
-        drawDottedContours(s, d, scale, true, lineWidth);
+        drawDottedContours(s, d, true, lineWidth);
     }
 }
 
@@ -117,7 +117,7 @@ GNEContour::drawDottedContourCircle(const GUIVisualizationSettings& s, const GUI
         buildDottedContourCircle(s, d, pos, radius, scale);
         gObjectsInPosition.positionWithinCircle(myAC->getGUIGlObject(), myAC->getNet()->getViewNet()->getPositionInformation(), pos, (radius * scale));
     } else {
-        drawDottedContours(s, d, scale, true, lineWidth);
+        drawDottedContours(s, d, true, lineWidth);
     }
 }
 
@@ -186,7 +186,7 @@ GNEContour::drawDottedContourEdge(const GUIVisualizationSettings& s, const GUIVi
         const auto contourShape = buildDottedContourEdge(s, d, edge, drawFirstExtrem, drawLastExtrem);
         gObjectsInPosition.positionWithinShape(myAC->getGUIGlObject(), myAC->getNet()->getViewNet()->getPositionInformation(), contourShape);
     } else {
-        drawDottedContours(s, d, 1, true, lineWidth);
+        drawDottedContours(s, d, true, lineWidth);
     }
 }
 
@@ -197,7 +197,7 @@ GNEContour::drawDottedContourEdges(const GUIVisualizationSettings& s, const GUIV
     // first build dotted contour (only in rectangle selection mode)
     buildDottedContourEdges(s, d, fromEdge, toEdge);
     // draw dotted contours
-    drawDottedContours(s, d, 1, true, lineWidth);
+    drawDottedContours(s, d, true, lineWidth);
 }
 
 
@@ -374,7 +374,7 @@ GNEContour::buildDottedContourEdges(const GUIVisualizationSettings& /*s*/, const
 
 void
 GNEContour::drawDottedContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
-        const double scale, const bool addOffset, const double lineWidth) const {
+                               const bool addOffset, const double lineWidth) const {
     // first check if draw dotted contour
     if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::DottedContours)) {
         // basic contours

diff --git a/src/netedit/elements/GNEContour.h b/src/netedit/elements/GNEContour.h
@@ -139,7 +139,7 @@ class GNEContour {
 
     /// @brief draw dotted contours
     void drawDottedContours(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
-                            const double scale, const bool addOffset, const double lineWidth) const;
+                            const bool addOffset, const double lineWidth) const;
 
     /// @brief draw dotted contour
     void drawDottedContour(const GUIVisualizationSettings& s, GUIDottedGeometry::DottedContourType type, const bool addOffset, const double lineWidth) const;

diff --git a/src/netedit/elements/additional/GNEDetector.cpp b/src/netedit/elements/additional/GNEDetector.cpp
@@ -158,9 +158,8 @@ GNEDetector::getHierarchyName() const {
 
 
 void
-GNEDetector::drawE1Shape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
-                         const double exaggeration, const double scaledWidth, const RGBColor& mainColor,
-                         const RGBColor& secondColor) const {
+GNEDetector::drawE1Shape(const GUIVisualizationSettings::Detail d, const double exaggeration,
+                         const RGBColor& mainColor, const RGBColor& secondColor) const {
     // push matrix
     GLHelper::pushMatrix();
     // set line width

diff --git a/src/netedit/elements/additional/GNEDetector.h b/src/netedit/elements/additional/GNEDetector.h
@@ -192,9 +192,8 @@ class GNEDetector : public GNEAdditional, public Parameterised {
     bool myFriendlyPosition;
 
     /// @brief draw E1 shape
-    void drawE1Shape(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
-                     const double exaggeration, const double scaledWidth, const RGBColor& mainColor,
-                     const RGBColor& secondColor) const;
+    void drawE1Shape(const GUIVisualizationSettings::Detail d, const double exaggeration,
+                     const RGBColor& mainColor, const RGBColor& secondColor) const;
 
     /// @brief draw E1 detector Logo
     void drawE1DetectorLogo(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,

diff --git a/src/netedit/elements/additional/GNEInductionLoopDetector.cpp b/src/netedit/elements/additional/GNEInductionLoopDetector.cpp
@@ -165,8 +165,6 @@ GNEInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const {
         const auto d = s.getDetailLevel(E1Exaggeration);
         // draw geometry only if we'rent in drawForObjectUnderCursor mode
         if (!s.drawForObjectUnderCursor) {
-            // obtain scaledSize
-            const double scaledWidth = s.detectorSettings.E1Width * 0.5 * s.scale;
             // declare colors
             RGBColor mainColor, secondColor, textColor;
             // set color
@@ -186,7 +184,7 @@ GNEInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const {
             // translate to front
             myNet->getViewNet()->drawTranslateFrontAttributeCarrier(this, GLO_E1DETECTOR);
             // draw E1 shape
-            drawE1Shape(s, d, E1Exaggeration, scaledWidth, mainColor, secondColor);
+            drawE1Shape(d, E1Exaggeration, mainColor, secondColor);
             // draw E1 Logo
             drawE1DetectorLogo(s, d, E1Exaggeration, "E1", textColor);
             // pop layer matrix

diff --git a/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp b/src/netedit/elements/additional/GNEInstantInductionLoopDetector.cpp
@@ -147,8 +147,6 @@ GNEInstantInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const
         const auto d = s.getDetailLevel(E1InstantExaggeration);
         // draw geometry only if we'rent in drawForObjectUnderCursor mode
         if (!s.drawForObjectUnderCursor) {
-            // obtain scaledSize
-            const double scaledWidth = s.detectorSettings.E1InstantWidth * 0.5 * s.scale;
             // declare colors
             RGBColor mainColor, secondColor, textColor;
             // set color
@@ -168,7 +166,7 @@ GNEInstantInductionLoopDetector::drawGL(const GUIVisualizationSettings& s) const
             // translate to front
             myNet->getViewNet()->drawTranslateFrontAttributeCarrier(this, GLO_E1DETECTOR_INSTANT);
             // draw E1Instant shape
-            drawE1Shape(s, d, E1InstantExaggeration, scaledWidth, mainColor, secondColor);
+            drawE1Shape(d, E1InstantExaggeration, mainColor, secondColor);
             // draw E1 Logo
             drawE1DetectorLogo(s, d, E1InstantExaggeration, "E1", textColor);
             // pop layer matrix

diff --git a/src/netedit/elements/additional/GNEPoly.cpp b/src/netedit/elements/additional/GNEPoly.cpp
@@ -112,8 +112,6 @@ GNEPoly::getMoveOperation() {
         // move entire shape
         return new GNEMoveOperation(this, myShape);
     } else {
-        // get geometry point radius
-        const auto radius = myNet->getViewNet()->getVisualisationSettings().neteditSizeSettings.polygonGeometryPointRadius;
         // continue depending of tag
         switch (getTagProperty().getTag()) {
             case GNE_TAG_JPS_WALKABLEAREA:

diff --git a/src/netedit/elements/demand/GNEContainer.cpp b/src/netedit/elements/demand/GNEContainer.cpp
@@ -347,9 +347,6 @@ GNEContainer::drawGL(const GUIVisualizationSettings& s) const {
         const Position containerPosition = getAttributePosition(SUMO_ATTR_DEPARTPOS);
         // draw geometry only if we'rent in drawForObjectUnderCursor mode
         if (!s.drawForObjectUnderCursor) {
-            // obtain width and length
-            const double length = getTypeParent()->getAttributeDouble(SUMO_ATTR_LENGTH);
-            const double width = getTypeParent()->getAttributeDouble(SUMO_ATTR_WIDTH);
             // obtain img file
             const std::string file = getTypeParent()->getAttribute(SUMO_ATTR_IMGFILE);
             // push draw matrix

diff --git a/src/netedit/elements/network/GNECrossing.cpp b/src/netedit/elements/network/GNECrossing.cpp
@@ -209,8 +209,6 @@ GNECrossing::getNBCrossing() const {
 
 void
 GNECrossing::drawGL(const GUIVisualizationSettings& s) const {
-    // declare flag
-    bool drawExtremeSymbols = false;
     // continue depending of drawCrossing flag
     if (checkDrawCrossing(s)) {
         // get NBCrossing
@@ -244,9 +242,6 @@ GNECrossing::drawGL(const GUIVisualizationSettings& s) const {
                     s.drawMovingGeometryPoint(crossingExaggeration, s.neteditSizeSettings.crossingGeometryPointRadius)) {
                     // get edit modes
                     const auto& editModes = myNet->getViewNet()->getEditModes();
-                    // check if draw start und end
-                    const bool drawExtremeSymbols = editModes.isCurrentSupermodeNetwork() &&
-                        (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE);
                     // color
                     const RGBColor darkerColor = crossingColor.changedBrightness(-32);
                     // draw geometry points