fixing warnings and style #22 #3

eclipse-sumo · Apr 3, 2024 · e37bad8 · e37bad8
1 parent 2b55b2e
commit e37bad8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/src/gui/GUIViewTraffic.cpp b/src/gui/GUIViewTraffic.cpp
@@ -231,7 +231,7 @@ GUIViewTraffic::buildColorRainbow(const GUIVisualizationSettings& s, GUIColorSch
         int step = MAX2(1, 360 / (int)codes.size());
         int hue = 0;
         for (SVCPermissions p : codes) {
-            scheme.addColor(RGBColor::fromHSV(hue, 1, 1), p);
+            scheme.addColor(RGBColor::fromHSV(hue, 1, 1), (double)p);
             hue = (hue + step) % 360;
         }
         return;

diff --git a/src/libsumo/Subscription.h b/src/libsumo/Subscription.h
@@ -23,6 +23,7 @@
 #include <set>
 #include <foreign/tcpip/storage.h>
 #include <libsumo/TraCIDefs.h>
+#include <utils/common/SUMOVehicleClass.h>
 #include <utils/common/SUMOTime.h>
 
 
@@ -139,7 +140,7 @@ class Subscription {
     /// @brief vTypes specified by the vTypes filter
     std::set<std::string> filterVTypes;
     /// @brief vClasses specified by the vClasses filter, @see SVCPermissions
-    int filterVClasses;
+    SVCPermissions filterVClasses;
     /// @brief Opening angle (in deg) specified by the field of vision filter
     double filterFieldOfVisionOpeningAngle;
     /// @brief Lateral distance specified by the lateral distance filter

diff --git a/src/mesosim/MEInductLoop.cpp b/src/mesosim/MEInductLoop.cpp
@@ -67,7 +67,7 @@ MEInductLoop::writeXMLOutput(OutputDevice& dev,
     mySegment->prepareDetectorForWriting(myMeanData);
     dev.openTag(SUMO_TAG_INTERVAL).writeAttr(SUMO_ATTR_BEGIN, time2string(startTime)).writeAttr(SUMO_ATTR_END, time2string(stopTime));
     dev.writeAttr(SUMO_ATTR_ID, StringUtils::escapeXML(myID)).writeAttr("sampledSeconds", myMeanData.getSamples());
-    myMeanData.write(dev, 0, stopTime - startTime, (double)mySegment->getEdge().getLanes().size(), mySegment->getEdge().getSpeedLimit(), -1.0);
+    myMeanData.write(dev, 0, stopTime - startTime, (int)mySegment->getEdge().getLanes().size(), mySegment->getEdge().getSpeedLimit(), -1.0);
     myMeanData.reset();
 }
 

diff --git a/src/netbuild/NBEdge.cpp b/src/netbuild/NBEdge.cpp
@@ -166,7 +166,7 @@ NBEdge::MainDirections::MainDirections(const EdgeVector& outgoing, NBEdge* paren
     NBContHelper::edge_similar_direction_sorter sorter(parent);
     const NBEdge* straight = nullptr;
     for (const NBEdge* const out : outgoing) {
-        const int outPerms = out->getPermissions();
+        const SVCPermissions outPerms = out->getPermissions();
         for (const int l : availableLanes) {
             if ((parent->myLanes[l].permissions & outPerms) != 0) {
                 if (straight == nullptr || sorter(out, straight)) {
@@ -2762,9 +2762,9 @@ NBEdge::applyTurnSigns() {
             }
             // add new connections
             int allSigns = (turnSigns
-                    | turnSigns >> TURN_SIGN_SHIFT_BUS
-                    | turnSigns >> TURN_SIGN_SHIFT_TAXI
-                    | turnSigns >> TURN_SIGN_SHIFT_BICYCLE);
+                            | turnSigns >> TURN_SIGN_SHIFT_BUS
+                            | turnSigns >> TURN_SIGN_SHIFT_TAXI
+                            | turnSigns >> TURN_SIGN_SHIFT_BICYCLE);
             std::vector<LinkDirection> all = decodeTurnSigns(turnSigns);
             std::vector<LinkDirection> bus = decodeTurnSigns(turnSigns, TURN_SIGN_SHIFT_BUS);
             std::vector<LinkDirection> taxi = decodeTurnSigns(turnSigns, TURN_SIGN_SHIFT_TAXI);
@@ -2808,11 +2808,11 @@ NBEdge::applyTurnSigns() {
                         toLaneIndex[to] = toLane;
                     }
                     setConnection(i, to, toLaneIndex[to], Lane2LaneInfoType::VALIDATED, true,
-                            false, KEEPCLEAR_UNSPECIFIED, UNSPECIFIED_CONTPOS,
-                            UNSPECIFIED_VISIBILITY_DISTANCE, UNSPECIFIED_SPEED, UNSPECIFIED_FRICTION,
-                            myDefaultConnectionLength, PositionVector::EMPTY,
-                            UNSPECIFIED_CONNECTION_UNCONTROLLED,
-                            perm);
+                                  false, KEEPCLEAR_UNSPECIFIED, UNSPECIFIED_CONTPOS,
+                                  UNSPECIFIED_VISIBILITY_DISTANCE, UNSPECIFIED_SPEED, UNSPECIFIED_FRICTION,
+                                  myDefaultConnectionLength, PositionVector::EMPTY,
+                                  UNSPECIFIED_CONNECTION_UNCONTROLLED,
+                                  perm);
                     if (toLaneIndex[to] < to->getNumLanes() - 1) {
                         toLaneIndex[to]++;
                     }

diff --git a/src/netbuild/NBEdgeCont.cpp b/src/netbuild/NBEdgeCont.cpp
@@ -1436,8 +1436,8 @@ NBEdgeCont::guessRoundabouts() {
             }
 #endif
             double loopLength = 0;
-            for (NBEdge* e : loopEdges) {
-                loopLength += e->getLoadedLength();
+            for (const NBEdge* const le : loopEdges) {
+                loopLength += le->getLoadedLength();
             }
             if (formFactor(loopEdges) > 0.6
                     && loopLength < OptionsCont::getOptions().getFloat("roundabouts.guess.max-length")) {

diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp
@@ -795,7 +795,7 @@ GNEViewNet::buildColorRainbow(const GUIVisualizationSettings& s, GUIColorScheme&
         int step = MAX2(1, 360 / (int)codes.size());
         int hue = 0;
         for (SVCPermissions p : codes) {
-            scheme.addColor(RGBColor::fromHSV(hue, 1, 1), p);
+            scheme.addColor(RGBColor::fromHSV(hue, 1, 1), (double)p);
             hue = (hue + step) % 360;
         }
         return;

diff --git a/src/utils/common/SUMOVehicleClass.cpp b/src/utils/common/SUMOVehicleClass.cpp
@@ -144,7 +144,7 @@ StringBijection<SUMOVehicleShape> SumoVehicleShapeStrings(
 // static values used for cached
 // ===========================================================================
 
-static std::map<int, std::vector<std::string> > vehicleClassNamesListCached;
+static std::map<SVCPermissions, std::vector<std::string> > vehicleClassNamesListCached;
 static std::map<std::string, SVCPermissions> parseVehicleClassesCached;
 static std::map<SVCPermissions, std::string> getVehicleClassNamesCached;
 static std::string VehicleClassNameAll = "all";