Merge pull request #41 from movsim/issue-#38

Fixes viewer initialization. Project gets parsed just once instead tw…
movsim · Aug 24, 2018 · 711c71f · 711c71f
2 parents 18bd468 + aec8f91
commit 711c71f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/core/src/main/java/org/movsim/simulator/Simulator.java b/core/src/main/java/org/movsim/simulator/Simulator.java
@@ -232,14 +232,6 @@ public SimulationRunnable getSimulationRunnable() {
         return simulationRunnable;
     }
 
-    // TODO Apparently the viewer needs a second initialization to work. Investigate and remove!
-    public void loadScenarioFromXml(String scenario, String path) throws JAXBException, SAXException {
-        roadNetwork.clear();
-        ProjectMetaData.getInstance().setProjectName(scenario);
-        ProjectMetaData.getInstance().setPathToProjectXmlFile(path);
-        initialize();
-    }
-
     private void matchRoadSegmentsAndRoadInput(List<Road> roads,
             MicroscopicBoundaryConditions microBoundaryConditions) {
         for (Road roadInput : roads) {

diff --git a/viewer/src/main/java/org/movsim/viewer/graphics/TrafficCanvas.java b/viewer/src/main/java/org/movsim/viewer/graphics/TrafficCanvas.java
@@ -287,23 +287,9 @@ protected void toogleDrawRoadId() {
         drawRoadId = !drawRoadId;
     }
 
-    /**
-     * Sets up the given traffic scenario.
-     *
-     * @param scenario
-     * @throws SAXException
-     * @throws JAXBException
-     */
     public void setupTrafficScenario(String scenario, String path) {
-        reset();
-        try {
-            simulator.loadScenarioFromXml(scenario, path);
-        } catch (JAXBException | SAXException e) {
-            throw new IllegalArgumentException(e.toString());
-        }
         properties = ViewProperties.loadProperties(scenario, path);
-        initGraphicSettings();
-        forceRepaintBackground();
+        reset();
     }
 
     private void initGraphicSettings() {

diff --git a/viewer/src/main/java/org/movsim/viewer/ui/AppFrame.java b/viewer/src/main/java/org/movsim/viewer/ui/AppFrame.java
@@ -84,8 +84,7 @@ public void componentResized(ComponentEvent e) {
         initFrameSize(properties);
 
         if (projectMetaData.hasProjectName()) {
-            trafficCanvas
-                    .setupTrafficScenario(projectMetaData.getProjectName(), projectMetaData.getPathToProjectFile());
+            trafficCanvas.setupTrafficScenario(projectMetaData.getProjectName(), projectMetaData.getPathToProjectFile());
         } else {
             System.out.println("Please provide scenario via -f option");
         }