Improve crossingScenario queries + small ease-of-use adjustments

2 files changed, 25 insertions, 3 deletions

diff --git a/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java b/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java
index ed227f7a..5bf70b3a 100644
--- a/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java
+++ b/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java
@@ -30,13 +30,16 @@ public class CrossingScenarioMain {
                 }

                 

                 Path pathStats = Paths.get("outputs/statistics.csv");

-                String pathXmi = "outputs/models/1.xmi";

-                String savePath = "outputs/drawnModel1.png";

+//              String pathXmi = "outputs/models/1.xmi";

+//              String savePath = "outputs/drawnModel1.png";

 //              Path target = Paths.get("../..//Tests/MODELS2020-CaseStudies/case.study.pledge.run/measurements1/stats.csv");

 //              Files.copy(path, target, StandardCopyOption.REPLACE_EXISTING);

                 

                 printStats(pathStats);

-                DrawScenario.drawScenario(pathXmi, savePath);

+                for (int i = 1; i <= 10; i++) {

+                        DrawScenario.drawScenario("outputs/models/"+i+".xmi", "outputs/drawnModel"+i+".png");

+                        System.out.println("DONE " + i);

+                }

                 

 //              String p1 = "outputs/models/1.xmi";

 //              String p2 = "outputs/simplePrevLane.tgf";

diff --git a/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java b/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java
index 572fea68..daf294f4 100644
--- a/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java
+++ b/Domains/crossingScenario/src/crossingScenario/run/DrawScenario.java
@@ -135,6 +135,25 @@ public class DrawScenario {
                         
                         }                       
                 }
+                
+                g.setPaint(Color.GREEN);
+                for (Relation ce : cs.getRelations().stream().
+                                filter(r -> r instanceof VisionBlocked).collect(Collectors.toList())) {
+                        Actor a1 = ce.getSource();
+                        Actor a2 = ce.getTarget();
+                        Actor b = ((VisionBlocked) ce).getBlockedBy();
+                        
+
+                        int x1 = (int) (a1.getXPos() * multiplier);
+                        int y1 = (int) (a1.getYPos() * multiplier);
+                        int x2 = (int) (a2.getXPos() * multiplier);
+                        int y2 = (int) (a2.getYPos() * multiplier);
+                        int xb = (int) (b.getXPos() * multiplier);
+                        int yb = (int) (b.getYPos() * multiplier);
+                        
+                        g.drawLine(x1, y1, xb, yb);
+                        g.drawLine(x2, y2, xb, yb);
+                }
                 g.dispose();
                 
                 File f = new File(saveToPath);