updating to jupedsim 1.1, making jps version accessible from the GUI #…

…14497
eclipse-sumo · Mar 13, 2024 · 9de5804 · 9de5804
1 parent 66f285b
commit 9de5804
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         build_type: [full, minimal]
         compiler: [gcc, clang]
-        jps_version: ['v1.0.6']
+        jps_version: ['v1.1.0']
         # include:
         #   - build_type: full
         #     jps_version: master

diff --git a/.github/workflows/jupedsim-windows.yml b/.github/workflows/jupedsim-windows.yml
@@ -22,7 +22,7 @@ jobs:
       # Allow all other matrix-jobs to continue running, even if one of the jobs fails
       fail-fast: false
       matrix:
-        jps_version: ['rls-1.0', 'master']
+        jps_version: ['rls-1.1', 'master']
         build_config: ['Release', 'Debug']
 
     steps:

diff --git a/src/gui/dialogs/GUIDialog_AboutSUMO.cpp b/src/gui/dialogs/GUIDialog_AboutSUMO.cpp
@@ -52,6 +52,9 @@ GUIDialog_AboutSUMO::GUIDialog_AboutSUMO(FXWindow* parent) :
     (new FXLabel(descriptionFrame, "SUMO sumo-gui " VERSION_STRING, nullptr, GUIDesignLabelAboutInfo))->setFont(myHeadlineFont);
     new FXLabel(descriptionFrame, "Eclipse SUMO - Simulation of Urban MObility", nullptr, GUIDesignLabelAboutInfo);
     new FXLabel(descriptionFrame, TL("Graphical user interface for the microscopic, multi-modal traffic simulation SUMO."), nullptr, GUIDesignLabelAboutInfo);
+#ifdef JPS_VERSION
+    new FXLabel(descriptionFrame, TLF("includes JuPedSim %.%.%", int(JPS_VERSION / 100), int(JPS_VERSION % 100 / 10), JPS_VERSION % 10).c_str(), nullptr, GUIDesignLabelAboutInfo);
+#endif
     new FXLabel(descriptionFrame, HAVE_ENABLED, nullptr, GUIDesignLabelAboutInfo);
 
     // copyright notice

diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp
@@ -28,9 +28,6 @@
 #include <fstream>
 #include <geos_c.h>
 #include <jupedsim/jupedsim.h>
-#if JPS_VERSION >= 110
-#include <jupedsim/simulation.h>
-#endif
 #include <microsim/MSEdge.h>
 #include <microsim/MSLane.h>
 #include <microsim/MSLink.h>
@@ -473,21 +470,17 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
                 dumpGeometry(pedestrianNetworkWithTrainsAndRampsLargestComponent, "pedestrianNetworkWithTrainsAndRamps.wkt");
 #endif
                 myJPSGeometryWithTrainsAndRamps = buildJPSGeometryFromGEOSGeometry(pedestrianNetworkWithTrainsAndRampsLargestComponent);
-#if JPS_VERSION >= 110
                 JPS_Simulation_SwitchGeometry(myJPSSimulation, myJPSGeometryWithTrainsAndRamps, nullptr, nullptr);
-#endif
                 removePolygonFromDrawing(PEDESTRIAN_NETWORK_ID);
                 preparePolygonForDrawing(pedestrianNetworkWithTrainsAndRampsLargestComponent, PEDESTRIAN_NETWORK_CARRIAGES_AND_RAMPS_ID, PEDESTRIAN_NETWORK_CARRIAGES_AND_RAMPS_COLOR);
                 GEOSGeom_destroy(pedestrianNetworkWithTrainsAndRamps);
                 GEOSGeom_destroy(rampsCollection);
                 GEOSGeom_destroy(carriagesCollection);
             }
         } else {
-#if JPS_VERSION >= 110
             JPS_Simulation_SwitchGeometry(myJPSSimulation, myJPSGeometry, nullptr, nullptr);
             removePolygonFromDrawing(PEDESTRIAN_NETWORK_CARRIAGES_AND_RAMPS_ID);
             preparePolygonForDrawing(myGEOSPedestrianNetworkLargestComponent, PEDESTRIAN_NETWORK_ID, PEDESTRIAN_NETWORK_COLOR);
-#endif
         }
         myAllStoppedTrainIDs = allStoppedTrainIDs;
     }

diff --git a/src/utils/gui/windows/GUIDialog_ViewSettings.cpp b/src/utils/gui/windows/GUIDialog_ViewSettings.cpp
@@ -1976,10 +1976,14 @@ GUIDialog_ViewSettings::buildPersonsFrame(FXTabBook* tabbook) {
     myShowPedestrianNetwork = new FXCheckButton(m105, TL("Show JuPedSim pedestrian network"), this, MID_SIMPLE_VIEW_COLORCHANGE);
     myShowPedestrianNetwork->setCheck(mySettings->showPedestrianNetwork);
     myPedestrianNetworkColor = new FXColorWell(m105, MFXUtils::getFXColor(mySettings->pedestrianNetworkColor), this, MID_SIMPLE_VIEW_COLORCHANGE, GUIDesignViewSettingsColorWell);
+#ifdef JPS_VERSION
     if (mySettings->netedit) {
+#endif
         myShowPedestrianNetwork->disable();
         myPedestrianNetworkColor->disable();
+#ifdef JPS_VERSION
     }
+#endif
 }