From 84b66279bfae87c280f0a9083f6514d959b9844a Mon Sep 17 00:00:00 2001
From: Niels Vistisen <nielswps@gmail.com>
Date: Tue, 27 Jul 2021 10:07:42 +0200
Subject: [PATCH 1/5] Prohibited location visualization implemented

---
 .../java/ecdar/abstractions/Location.java     |  2 +-
 .../ecdar/controllers/LocationController.java |  1 +
 .../presentations/LocationPresentation.java   | 23 +++++++++++++++----
 .../presentations/LocationPresentation.fxml   |  2 ++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ecdar/abstractions/Location.java b/src/main/java/ecdar/abstractions/Location.java
index d5b21990..0586b88b 100644
--- a/src/main/java/ecdar/abstractions/Location.java
+++ b/src/main/java/ecdar/abstractions/Location.java
@@ -441,7 +441,7 @@ public enum Type {
     }
 
     public enum Urgency {
-        NORMAL, URGENT, COMMITTED
+        NORMAL, URGENT, COMMITTED, PROHIBITED
     }
 
     public enum Reachability {
diff --git a/src/main/java/ecdar/controllers/LocationController.java b/src/main/java/ecdar/controllers/LocationController.java
index 238a1c07..d097ba31 100644
--- a/src/main/java/ecdar/controllers/LocationController.java
+++ b/src/main/java/ecdar/controllers/LocationController.java
@@ -63,6 +63,7 @@ public class LocationController implements Initializable, SelectHelper.ItemSelec
     public Label idLabel;
     public Line nameTagLine;
     public Line invariantTagLine;
+    public Line crossOut;
 
     private DropDownMenu dropDownMenu;
     private boolean dropDownMenuInitialized = false;
diff --git a/src/main/java/ecdar/presentations/LocationPresentation.java b/src/main/java/ecdar/presentations/LocationPresentation.java
index b0847d50..6ef3cf71 100644
--- a/src/main/java/ecdar/presentations/LocationPresentation.java
+++ b/src/main/java/ecdar/presentations/LocationPresentation.java
@@ -350,7 +350,6 @@ private void initializeLocationShapes() {
 
         final Location location = controller.getLocation();
 
-
         BiConsumer<Location.Urgency, Location.Urgency> updateUrgencies = (oldUrgency, newUrgency) -> {
             final Transition toUrgent = new Transition() {
                 {
@@ -374,10 +373,11 @@ protected void interpolate(final double frac) {
                 }
             };
 
-            if(oldUrgency.equals(Location.Urgency.NORMAL) && !newUrgency.equals(Location.Urgency.NORMAL)) {
-                toUrgent.play();
+            boolean normalOrProhibited = newUrgency.equals(Location.Urgency.NORMAL) || newUrgency.equals(Location.Urgency.PROHIBITED);
 
-            } else if(newUrgency.equals(Location.Urgency.NORMAL)) {
+            if(oldUrgency.equals(Location.Urgency.NORMAL) && !(normalOrProhibited)) {
+                toUrgent.play();
+            } else if(normalOrProhibited) {
                 toNormal.play();
             }
 
@@ -388,6 +388,16 @@ protected void interpolate(final double frac) {
                 committedShape.setVisible(false);
                 notCommittedShape.setVisible(true);
             }
+
+            if(newUrgency.equals(Location.Urgency.PROHIBITED)) {
+                notCommittedShape.setStrokeWidth(4);
+                notCommittedShape.setStroke(Color.RED.getColor(Color.Intensity.I600));
+                controller.crossOut.setVisible(true);
+            } else {
+                notCommittedShape.setStrokeWidth(1);
+                notCommittedShape.setStroke(location.getColor().getColor(location.getColorIntensity().next(2)));
+                controller.crossOut.setVisible(false);
+            }
         };
 
         location.urgencyProperty().addListener((obsUrgency, oldUrgency, newUrgency) -> {
@@ -403,7 +413,10 @@ protected void interpolate(final double frac) {
         // Delegate to style the label based on the color of the location
         final BiConsumer<Color, Color.Intensity> updateColor = (newColor, newIntensity) -> {
             notCommittedShape.setFill(newColor.getColor(newIntensity));
-            notCommittedShape.setStroke(newColor.getColor(newIntensity.next(2)));
+
+            if (!location.getUrgency().equals(Location.Urgency.PROHIBITED)) {
+                notCommittedShape.setStroke(newColor.getColor(newIntensity.next(2)));
+            }
 
             committedShape.setFill(newColor.getColor(newIntensity));
             committedShape.setStroke(newColor.getColor(newIntensity.next(2)));
diff --git a/src/main/resources/ecdar/presentations/LocationPresentation.fxml b/src/main/resources/ecdar/presentations/LocationPresentation.fxml
index b6d02cc0..554de54e 100644
--- a/src/main/resources/ecdar/presentations/LocationPresentation.fxml
+++ b/src/main/resources/ecdar/presentations/LocationPresentation.fxml
@@ -46,6 +46,8 @@
             <Label fx:id="idLabel" styleClass="sub-caption" mouseTransparent="true"/>
         </Group>
 
+        <Line fx:id="crossOut" strokeWidth="3" startX="-9" startY="-9" endX="9" endY="9" style="-fx-stroke: -red-600"/>
+
     </Group>
 
 </fx:root>
\ No newline at end of file

From dbffa56b46dee244d6923702bd9ec6deb099edd5 Mon Sep 17 00:00:00 2001
From: Niels Vistisen <nielswps@gmail.com>
Date: Wed, 28 Jul 2021 10:26:19 +0200
Subject: [PATCH 2/5] Color updated

---
 src/main/java/ecdar/abstractions/Location.java                  | 1 -
 src/main/java/ecdar/presentations/LocationPresentation.java     | 2 +-
 .../resources/ecdar/presentations/LocationPresentation.fxml     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ecdar/abstractions/Location.java b/src/main/java/ecdar/abstractions/Location.java
index a62bc64c..10a4b43f 100644
--- a/src/main/java/ecdar/abstractions/Location.java
+++ b/src/main/java/ecdar/abstractions/Location.java
@@ -14,7 +14,6 @@
 import com.google.gson.JsonObject;
 import javafx.beans.property.*;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 public class Location implements Circular, Serializable, Nearable, DropDownMenu.HasColor {
diff --git a/src/main/java/ecdar/presentations/LocationPresentation.java b/src/main/java/ecdar/presentations/LocationPresentation.java
index 3a329eb2..c063cdc6 100644
--- a/src/main/java/ecdar/presentations/LocationPresentation.java
+++ b/src/main/java/ecdar/presentations/LocationPresentation.java
@@ -388,7 +388,7 @@ protected void interpolate(final double frac) {
 
             if(newUrgency.equals(Location.Urgency.PROHIBITED)) {
                 notCommittedShape.setStrokeWidth(4);
-                notCommittedShape.setStroke(Color.RED.getColor(Color.Intensity.I600));
+                notCommittedShape.setStroke(Color.RED.getColor(Color.Intensity.A700));
                 controller.crossOut.setVisible(true);
             } else {
                 notCommittedShape.setStrokeWidth(1);
diff --git a/src/main/resources/ecdar/presentations/LocationPresentation.fxml b/src/main/resources/ecdar/presentations/LocationPresentation.fxml
index 554de54e..88cb81e7 100644
--- a/src/main/resources/ecdar/presentations/LocationPresentation.fxml
+++ b/src/main/resources/ecdar/presentations/LocationPresentation.fxml
@@ -46,7 +46,7 @@
             <Label fx:id="idLabel" styleClass="sub-caption" mouseTransparent="true"/>
         </Group>
 
-        <Line fx:id="crossOut" strokeWidth="3" startX="-9" startY="-9" endX="9" endY="9" style="-fx-stroke: -red-600"/>
+        <Line fx:id="crossOut" strokeWidth="3" startX="-9" startY="-9" endX="9" endY="9" style="-fx-stroke: -red-A700"/>
 
     </Group>
 

From 9688c2aab8531b386ac44468eaafe5591d39120d Mon Sep 17 00:00:00 2001
From: Niels Vistisen <nielswps@gmail.com>
Date: Fri, 30 Jul 2021 12:24:04 +0200
Subject: [PATCH 3/5] WIP: Component color updated and urgency animation FIXED

---
 .../java/ecdar/controllers/LocationController.java | 14 ++++++++++++++
 .../ecdar/presentations/LocationPresentation.java  |  2 +-
 .../java/ecdar/utility/colors/EnabledColor.java    |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ecdar/controllers/LocationController.java b/src/main/java/ecdar/controllers/LocationController.java
index b92fbe38..8f64dabe 100644
--- a/src/main/java/ecdar/controllers/LocationController.java
+++ b/src/main/java/ecdar/controllers/LocationController.java
@@ -157,6 +157,7 @@ public void initializeDropDownMenu() {
                     dropDownMenu.hide();
                 }
         );
+
         dropDownMenu.addSpacerElement();
         final BooleanProperty isUrgent = new SimpleBooleanProperty(false);
         isUrgent.bind(getLocation().urgencyProperty().isEqualTo(Location.Urgency.URGENT));
@@ -166,6 +167,19 @@ public void initializeDropDownMenu() {
             } else {
                 getLocation().setUrgency(Location.Urgency.URGENT);
             }
+
+            dropDownMenu.hide();
+        });
+
+        final BooleanProperty isProhibited = new SimpleBooleanProperty(false);
+        isProhibited.bind(getLocation().urgencyProperty().isEqualTo(Location.Urgency.PROHIBITED));
+        dropDownMenu.addToggleableAndDisableableListElement("Prohibited", isProhibited, getLocation().getIsLocked(), event -> {
+            if (isProhibited.get()) {
+                getLocation().setUrgency(Location.Urgency.NORMAL);
+            } else {
+                getLocation().setUrgency(Location.Urgency.PROHIBITED);
+            }
+
             dropDownMenu.hide();
         });
 
diff --git a/src/main/java/ecdar/presentations/LocationPresentation.java b/src/main/java/ecdar/presentations/LocationPresentation.java
index c063cdc6..92f9d4d1 100644
--- a/src/main/java/ecdar/presentations/LocationPresentation.java
+++ b/src/main/java/ecdar/presentations/LocationPresentation.java
@@ -372,7 +372,7 @@ protected void interpolate(final double frac) {
 
             boolean normalOrProhibited = newUrgency.equals(Location.Urgency.NORMAL) || newUrgency.equals(Location.Urgency.PROHIBITED);
 
-            if(oldUrgency.equals(Location.Urgency.NORMAL) && !(normalOrProhibited)) {
+            if(!oldUrgency.equals(Location.Urgency.URGENT) && !(normalOrProhibited)) {
                 toUrgent.play();
             } else if(normalOrProhibited) {
                 toNormal.play();
diff --git a/src/main/java/ecdar/utility/colors/EnabledColor.java b/src/main/java/ecdar/utility/colors/EnabledColor.java
index e58831c8..78cfc10b 100644
--- a/src/main/java/ecdar/utility/colors/EnabledColor.java
+++ b/src/main/java/ecdar/utility/colors/EnabledColor.java
@@ -9,7 +9,7 @@ public class EnabledColor {
     public static final ArrayList<EnabledColor> enabledColors = new ArrayList<EnabledColor>() {{
         add(new EnabledColor(Color.GREY_BLUE, Color.Intensity.I700, KeyCode.DIGIT0));
         add(new EnabledColor(Color.DEEP_ORANGE, Color.Intensity.I700, KeyCode.DIGIT1));
-        add(new EnabledColor(Color.RED, Color.Intensity.I700, KeyCode.DIGIT2));
+        add(new EnabledColor(Color.RED, Color.Intensity.I500, KeyCode.DIGIT2));
         add(new EnabledColor(Color.PINK, Color.Intensity.I500, KeyCode.DIGIT3));
         add(new EnabledColor(Color.PURPLE, Color.Intensity.I500, KeyCode.DIGIT4));
         add(new EnabledColor(Color.INDIGO, Color.Intensity.I500, KeyCode.DIGIT5));

From b2b6f1858ca03425e6078850c88fcdb8a0bac3d4 Mon Sep 17 00:00:00 2001
From: Niels Vistisen <nielswps@gmail.com>
Date: Sat, 7 Aug 2021 09:56:57 +0200
Subject: [PATCH 4/5] Location momentarily turning to hexagon, when changing
 urgency from normal to prohibited FIXED

---
 src/main/java/ecdar/presentations/LocationPresentation.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ecdar/presentations/LocationPresentation.java b/src/main/java/ecdar/presentations/LocationPresentation.java
index 92f9d4d1..c3ec422a 100644
--- a/src/main/java/ecdar/presentations/LocationPresentation.java
+++ b/src/main/java/ecdar/presentations/LocationPresentation.java
@@ -370,11 +370,11 @@ protected void interpolate(final double frac) {
                 }
             };
 
-            boolean normalOrProhibited = newUrgency.equals(Location.Urgency.NORMAL) || newUrgency.equals(Location.Urgency.PROHIBITED);
+            boolean isNormalOrProhibited = newUrgency.equals(Location.Urgency.NORMAL) || newUrgency.equals(Location.Urgency.PROHIBITED);
 
-            if(!oldUrgency.equals(Location.Urgency.URGENT) && !(normalOrProhibited)) {
+            if(!oldUrgency.equals(Location.Urgency.URGENT) && !isNormalOrProhibited) {
                 toUrgent.play();
-            } else if(normalOrProhibited) {
+            } else if(isNormalOrProhibited && oldUrgency.equals(Location.Urgency.URGENT)) {
                 toNormal.play();
             }
 

From 5c5dbc8e6198bbab5b254924c7b5dae9d70492dc Mon Sep 17 00:00:00 2001
From: Niels Vistisen <nielswps@gmail.com>
Date: Sat, 7 Aug 2021 10:01:36 +0200
Subject: [PATCH 5/5] Variable renamed

---
 src/main/java/ecdar/controllers/LocationController.java       | 2 +-
 src/main/java/ecdar/presentations/LocationPresentation.java   | 4 ++--
 .../resources/ecdar/presentations/LocationPresentation.fxml   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ecdar/controllers/LocationController.java b/src/main/java/ecdar/controllers/LocationController.java
index 8f64dabe..4f178dfb 100644
--- a/src/main/java/ecdar/controllers/LocationController.java
+++ b/src/main/java/ecdar/controllers/LocationController.java
@@ -63,7 +63,7 @@ public class LocationController implements Initializable, SelectHelper.ItemSelec
     public Label idLabel;
     public Line nameTagLine;
     public Line invariantTagLine;
-    public Line crossOut;
+    public Line prohibitedLocStrikeThrough;
 
     private DropDownMenu dropDownMenu;
     private boolean dropDownMenuInitialized = false;
diff --git a/src/main/java/ecdar/presentations/LocationPresentation.java b/src/main/java/ecdar/presentations/LocationPresentation.java
index c3ec422a..0f489b78 100644
--- a/src/main/java/ecdar/presentations/LocationPresentation.java
+++ b/src/main/java/ecdar/presentations/LocationPresentation.java
@@ -389,11 +389,11 @@ protected void interpolate(final double frac) {
             if(newUrgency.equals(Location.Urgency.PROHIBITED)) {
                 notCommittedShape.setStrokeWidth(4);
                 notCommittedShape.setStroke(Color.RED.getColor(Color.Intensity.A700));
-                controller.crossOut.setVisible(true);
+                controller.prohibitedLocStrikeThrough.setVisible(true);
             } else {
                 notCommittedShape.setStrokeWidth(1);
                 notCommittedShape.setStroke(location.getColor().getColor(location.getColorIntensity().next(2)));
-                controller.crossOut.setVisible(false);
+                controller.prohibitedLocStrikeThrough.setVisible(false);
             }
         };
 
diff --git a/src/main/resources/ecdar/presentations/LocationPresentation.fxml b/src/main/resources/ecdar/presentations/LocationPresentation.fxml
index 88cb81e7..941f513c 100644
--- a/src/main/resources/ecdar/presentations/LocationPresentation.fxml
+++ b/src/main/resources/ecdar/presentations/LocationPresentation.fxml
@@ -46,7 +46,7 @@
             <Label fx:id="idLabel" styleClass="sub-caption" mouseTransparent="true"/>
         </Group>
 
-        <Line fx:id="crossOut" strokeWidth="3" startX="-9" startY="-9" endX="9" endY="9" style="-fx-stroke: -red-A700"/>
+        <Line fx:id="prohibitedLocStrikeThrough" strokeWidth="3" startX="-9" startY="-9" endX="9" endY="9" style="-fx-stroke: -red-A700"/>
 
     </Group>