Merge pull request #184 from DecwLK/marquee-fixes

marquee tool fix
DecwLK · Mar 10, 2024 · b05b3a2 · b05b3a2
2 parents 14d2816 + 9c316a8
commit b05b3a2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/org/gecko/view/views/EditorView.java b/src/main/java/org/gecko/view/views/EditorView.java
@@ -38,11 +38,9 @@
 
 /**
  * Represents a displayable view in the Gecko Graphic Editor, holding a collection of displayed {@link ViewElement}s and
- * other items specific to their vizualization.
+ * other items specific to their visualisation.
  */
 public class EditorView {
-    private static final double AUTOMATON_INSPECTOR_HEIGHT = 680;
-
     private final ViewFactory viewFactory;
     @Getter
     private final EditorViewModel viewModel;

diff --git a/src/main/java/org/gecko/viewmodel/EdgeViewModel.java b/src/main/java/org/gecko/viewmodel/EdgeViewModel.java
@@ -59,6 +59,7 @@ public EdgeViewModel(
         this.endOffsetProperty = new SimpleObjectProperty<>(Point2D.ZERO);
         this.startPointProperty = new SimpleObjectProperty<>();
         this.endPointProperty = new SimpleObjectProperty<>();
+        sizeProperty.setValue(Point2D.ZERO);
         setBindings();
 
         getSource().getOutgoingEdges().add(this);
@@ -194,12 +195,10 @@ public void setOrientation(int orientation) {
 
     @Override
     public void setPosition(@NonNull Point2D position) {
-        return;
     }
 
     @Override
     public void setSize(@NonNull Point2D position) {
-        return;
     }
 
     @Override

diff --git a/src/main/java/org/gecko/viewmodel/EditorViewModel.java b/src/main/java/org/gecko/viewmodel/EditorViewModel.java
@@ -291,6 +291,9 @@ public List<PositionableViewModelElement<?>> getElementsByName(String name) {
      */
     public Set<PositionableViewModelElement<?>> getElementsInArea(Bounds bound) {
         return containedPositionableViewModelElementsProperty.stream().filter(element -> {
+            if (element.getSize().equals(Point2D.ZERO)) {
+                return false;
+            }
             Bounds elementBound =
                 new BoundingBox(element.getPosition().getX(), element.getPosition().getY(), element.getSize().getX(),
                     element.getSize().getY());

diff --git a/src/main/java/org/gecko/viewmodel/SystemConnectionViewModel.java b/src/main/java/org/gecko/viewmodel/SystemConnectionViewModel.java
@@ -31,6 +31,7 @@ public class SystemConnectionViewModel extends PositionableViewModelElement<Syst
         this.sourceProperty = new SimpleObjectProperty<>(source);
         this.destinationProperty = new SimpleObjectProperty<>(destination);
         this.edgePoints = FXCollections.observableArrayList();
+        sizeProperty.setValue(Point2D.ZERO);
     }
 
     public void setSource(@NonNull PortViewModel source) {
@@ -99,12 +100,10 @@ public static boolean isConnectingAllowed(
 
     @Override
     public void setPosition(@NonNull Point2D position) {
-        return;
     }
 
     @Override
     public void setSize(@NonNull Point2D position) {
-        return;
     }
 
     @Override