Merge branch 'master' of github.com:jessegeens/swop1920

jessegeens · Mar 13, 2020 · 29c0251 · 29c0251
2 parents 4c72fe5 + 5324c07
commit 29c0251
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/diagrams/structural_overview/SWOP_Structural_Overview.pdf b/diagrams/structural_overview/SWOP_Structural_Overview.pdf
diff --git a/diagrams/structural_overview/SWOP_Structural_Overview.vpp b/diagrams/structural_overview/SWOP_Structural_Overview.vpp
diff --git a/diagrams/structural_overview/SWOP_Structural_Overview.vpp.bak_000d b/diagrams/structural_overview/SWOP_Structural_Overview.vpp.bak_000d
diff --git a/diagrams/structural_overview/SWOP_Structural_Overview.vpp.bak_001f b/diagrams/structural_overview/SWOP_Structural_Overview.vpp.bak_001f
diff --git a/src/main/GlobalController.java b/src/main/GlobalController.java
@@ -93,6 +93,7 @@ public void execute(){
             startRunning();
             setCurrent(this.modelController.getPWindow().getStartBlock());
         }
+        System.out.println("now executing: " + getCurrent().getBlockType().getType());
         step();
         if(this.getCurrent().equals(this.getModelController().getPWindow().getFinishBlock())) stopRunning();
         else{
@@ -152,6 +153,7 @@ public void startRunning(){
     public void stopRunning(){
         this.running = false;
         if(!this.getCurrent().equals(this.getModelController().getPWindow().getFinishBlock())) findNextBlock().setUnHighlight();
+        else this.getCurrent().setUnHighlight();
         this.getModelController().setGrid(new ModelGrid(MyCanvasWindow.WIDTH/3, MyCanvasWindow.HEIGHT, GOAL_CELL, ROBOT_START_LOCATION, ROBOT_START_DIRECTION, new ArrayList<Location>(), CELL_SIZE));
         this.getCurrent().setUnHighlight();
     }