Add parallel JSON deserialization, perform refactorings, improve tests.

mfl28 · mfl28 · commit 85fbaa0f03d0 · 2020-09-13T10:22:30.000+02:00
diff --git a/src/main/java/boundingboxeditor/controller/Controller.java b/src/main/java/boundingboxeditor/controller/Controller.java
@@ -144,10 +144,6 @@ public Controller(final Stage mainStage) {
         setUpModelListeners();
     }
 
-    IoMetaData getIoMetaData() {
-        return ioMetaData;
-    }
-
     /**
      * Handles the event of the user requesting to open a new image folder.
      */
@@ -528,6 +524,10 @@ public Model getModel() {
         return model;
     }
 
+    IoMetaData getIoMetaData() {
+        return ioMetaData;
+    }
+
     Stage getStage() {
         return stage;
     }
diff --git a/src/main/java/boundingboxeditor/model/ImageMetaData.java b/src/main/java/boundingboxeditor/model/ImageMetaData.java
@@ -110,13 +110,6 @@ public boolean equals(Object obj) {
         return false;
     }
 
-    @Override
-    public String toString() {
-        return "ImageMetaData[fileName=" + getFileName() + ", folderName=" + getFolderName()
-                + ", image-width=" + getImageWidth() + ", image-height=" + getImageHeight() + ", image-depth=" +
-                getImageDepth();
-    }
-
     public String getDimensionsString() {
         if(details == null) {
             return "[]";
diff --git a/src/main/java/boundingboxeditor/model/io/BoundingBoxData.java b/src/main/java/boundingboxeditor/model/io/BoundingBoxData.java
@@ -123,6 +123,11 @@ public <T> T accept(BoundingShapeDataVisitor<T> visitor) {
         return visitor.visit(this);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), relativeBoundsInImage);
+    }
+
     @Override
     public boolean equals(Object o) {
         if(this == o) {
@@ -145,11 +150,6 @@ public boolean equals(Object o) {
                 MathUtils.doubleAlmostEqual(relativeBoundsInImage.getMaxX(), that.relativeBoundsInImage.getMaxX()) &&
                 MathUtils.doubleAlmostEqual(relativeBoundsInImage.getMaxY(), that.relativeBoundsInImage.getMaxY());
     }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), relativeBoundsInImage);
-    }
 }
 
 
diff --git a/src/main/java/boundingboxeditor/model/io/IoMetaData.java b/src/main/java/boundingboxeditor/model/io/IoMetaData.java
@@ -12,6 +12,7 @@ public class IoMetaData {
 
     /**
      * Get the currently set default directory for image loading.
+     *
      * @return the directory
      */
     public File getDefaultImageLoadingDirectory() {
@@ -20,6 +21,7 @@ public File getDefaultImageLoadingDirectory() {
 
     /**
      * Set the current default directory for image loading.
+     *
      * @param defaultImageLoadingDirectory the directory
      */
     public void setDefaultImageLoadingDirectory(File defaultImageLoadingDirectory) {
@@ -28,6 +30,7 @@ public void setDefaultImageLoadingDirectory(File defaultImageLoadingDirectory) {
 
     /**
      * Get the currently set default directory for annotation saving.
+     *
      * @return the directory
      */
     public File getDefaultAnnotationSavingDirectory() {
@@ -36,6 +39,7 @@ public File getDefaultAnnotationSavingDirectory() {
 
     /**
      * Set the current default directory for annotation saving.
+     *
      * @param defaultAnnotationSavingDirectory the directory
      */
     public void setDefaultAnnotationSavingDirectory(File defaultAnnotationSavingDirectory) {
@@ -44,6 +48,7 @@ public void setDefaultAnnotationSavingDirectory(File defaultAnnotationSavingDire
 
     /**
      * Get the currently set default directory for annotation loading.
+     *
      * @return the directory
      */
     public File getDefaultAnnotationLoadingDirectory() {
@@ -52,6 +57,7 @@ public File getDefaultAnnotationLoadingDirectory() {
 
     /**
      * Set the current default directory for annotation loading.
+     *
      * @param defaultAnnotationLoadingDirectory the directory
      */
     public void setDefaultAnnotationLoadingDirectory(File defaultAnnotationLoadingDirectory) {
diff --git a/src/main/java/boundingboxeditor/model/io/JSONLoadStrategy.java b/src/main/java/boundingboxeditor/model/io/JSONLoadStrategy.java
diff --git a/src/main/java/boundingboxeditor/ui/BoundingBoxView.java b/src/main/java/boundingboxeditor/ui/BoundingBoxView.java
@@ -140,13 +140,6 @@ public boolean equals(Object obj) {
                 MathUtils.doubleAlmostEqual(getHeight(), other.getHeight());
     }
 
-    @Override
-    public String toString() {
-        return "BoundingBoxView[x=" + getX() + ", y=" + getY() + ", width=" + getWidth() + ", height=" + getHeight()
-                + ", fill=" + getFill() + ", category=" + boundingShapeViewData.getObjectCategory()
-                + ", image-metadata=" + boundingShapeViewData.getImageMetaData() + "]";
-    }
-
     /**
      * Returns the associated {@link ObjectCategory} object.
      *
diff --git a/src/main/java/boundingboxeditor/ui/DragAnchor.java b/src/main/java/boundingboxeditor/ui/DragAnchor.java
@@ -15,11 +15,6 @@ public class DragAnchor {
     DragAnchor() {
     }
 
-    @Override
-    public String toString() {
-        return "DragAnchor " + "[x = " + getX() + ", y = " + getY() + "]";
-    }
-
     /**
      * Convenience method to set both coordinates from
      * a {@link MouseEvent} object's position relative to the event's source.
@@ -40,15 +35,6 @@ public void setFromMouseEvent(MouseEvent event) {
         return x;
     }
 
-    /**
-     * Sets the x-coordinate.
-     *
-     * @param x the value to set
-     */
-    void setX(double x) {
-        this.x = x;
-    }
-
     /**
      * Returns the y-coordinate.
      *
@@ -58,15 +44,6 @@ void setX(double x) {
         return y;
     }
 
-    /**
-     * Sets the y-coordinate.
-     *
-     * @param y the value to set
-     */
-    void setY(double y) {
-        this.y = y;
-    }
-
     /**
      * Convenience method to set both coordinates.
      *
diff --git a/src/main/java/boundingboxeditor/ui/TagScrollPaneView.java b/src/main/java/boundingboxeditor/ui/TagScrollPaneView.java
@@ -20,7 +20,7 @@
  * @see View
  */
 class TagScrollPaneView extends ScrollPane implements View {
-    private static final String TEXT_FIELD_PROMPT_TEXT = "New tag";
+    private static final String TEXT_FIELD_PROMPT_TEXT = "New Tag";
     private static final String TAG_INPUT_FIELD_ID = "tag-input-field";
     private static final String TAG_EDITOR_SCROLL_PANE_ID = "tag-editor-scroll-pane";
     private static final int FLOW_PANE_GAP_SIZE = 8;
diff --git a/src/main/java/boundingboxeditor/utils/MathUtils.java b/src/main/java/boundingboxeditor/utils/MathUtils.java
@@ -57,4 +57,16 @@ public static double clamp(double val, double min, double max) {
     public static boolean doubleAlmostEqual(double a, double b) {
         return Math.abs(a - b) < DOUBLE_EQUAL_THRESHOLD;
     }
+
+    /**
+     * Checks whether a double value is an element of a given closed interval.
+     *
+     * @param x the value to check
+     * @param a the lower bound of the interval
+     * @param b the upper bound of the interval
+     * @return true if x is within [a, b], false otherwise
+     */
+    public static boolean isWithin(double x, double a, double b) {
+        return Double.compare(x, a) >= 0 && Double.compare(x, b) <= 0.0;
+    }
 }
diff --git a/src/test/java/boundingboxeditor/BoundingBoxEditorTestBase.java b/src/test/java/boundingboxeditor/BoundingBoxEditorTestBase.java
@@ -311,7 +311,7 @@ protected Stage timeOutAssertDialogOpenedAndGetStage(FxRobot robot, String title
         return getTopModalStage(robot, title);
     }
 
-    protected Stage timeoutGetTopModalStage(FxRobot robot, String stageTitle) {
+    protected Stage timeOutGetTopModalStage(FxRobot robot, String stageTitle) {
         Assertions.assertDoesNotThrow(() -> WaitForAsyncUtils.waitFor(TIMEOUT_DURATION_IN_SEC, TimeUnit.SECONDS,
                                                                       () -> getTopModalStage(robot, stageTitle) !=
                                                                               null),
diff --git a/src/test/java/boundingboxeditor/controller/ControllerIOTests.java b/src/test/java/boundingboxeditor/controller/ControllerIOTests.java
@@ -102,8 +102,14 @@ void onExportAnnotation_PVOC_WhenPreviouslyImportedAnnotation_ShouldProduceEquiv
                                       "Bounding shape counts did not match within " + TIMEOUT_DURATION_IN_SEC +
                                               " sec.");
 
-        verifyThat(controller.getIoMetaData().getDefaultAnnotationLoadingDirectory(),
-                   Matchers.equalTo(referenceAnnotationFile.getParentFile()));
+        Assertions.assertDoesNotThrow(() -> WaitForAsyncUtils.waitFor(TIMEOUT_DURATION_IN_SEC, TimeUnit.SECONDS,
+                                                                      () -> controller.getIoMetaData()
+                                                                                      .getDefaultAnnotationLoadingDirectory()
+                                                                                      .equals(referenceAnnotationFile
+                                                                                                      .getParentFile())),
+                                      "Expected default annotation loading directory was not set within " +
+                                              TIMEOUT_DURATION_IN_SEC + " sec.");
+
         // Zoom a bit to change the image-view size.
         robot.moveTo(mainView.getEditorImageView())
              .press(KeyCode.CONTROL)
@@ -914,7 +920,7 @@ void onReloadAnnotations_afterImageFilesReopened_shouldCorrectlyDisplayBoundingS
     private void userChoosesNoOnAnnotationImportDialogSubtest(FxRobot robot, File annotationFile) {
         importAnnotationAndClickDialogOption(robot, annotationFile, "No");
 
-        Stage saveAnnotationsDialog = timeoutGetTopModalStage(robot, "Save annotations");
+        Stage saveAnnotationsDialog = timeOutGetTopModalStage(robot, "Save annotations");
 
         timeOutLookUpInStageAndClickOn(robot, saveAnnotationsDialog, "No");
         timeOutAssertTopModalStageClosed(robot, "Save annotations");
diff --git a/src/test/java/boundingboxeditor/ui/BoundingBoxDrawingTests.java b/src/test/java/boundingboxeditor/ui/BoundingBoxDrawingTests.java
@@ -3,6 +3,8 @@
 import boundingboxeditor.BoundingBoxEditorTestBase;
 import boundingboxeditor.utils.MathUtils;
 import javafx.geometry.Point2D;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
 import javafx.stage.Stage;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
@@ -28,6 +30,8 @@ void start(Stage stage) {
     void onOpeningNewImageFolder_WhenBoundingBoxesExist_ShouldResetCorrectly(FxRobot robot) {
         waitUntilCurrentImageIsLoaded();
 
+        verifyDragAnchorFunctionality();
+
         String testCategoryName = "Test";
         enterNewCategory(robot, testCategoryName);
         WaitForAsyncUtils.waitForFxEvents();
@@ -174,19 +178,33 @@ void onOpeningNewImageFolder_WhenBoundingBoxesExist_ShouldResetCorrectly(FxRobot
 
         timeOutLookUpInStageAndClickOn(robot, exitDialogStage2, "Yes");
 
-        final Stage saveAnnotationsStage = timeoutGetTopModalStage(robot, "Save annotations");
+        final Stage saveAnnotationsStage = timeOutGetTopModalStage(robot, "Save annotations");
 
         timeOutLookUpInStageAndClickOn(robot, saveAnnotationsStage, "Cancel");
 
         verifyThat(model.isSaved(), Matchers.is(false));
     }
 
+    private void verifyDragAnchorFunctionality() {
+        DragAnchor dragAnchor = new DragAnchor();
+
+        dragAnchor.setCoordinates(1.0, 2.0);
+        verifyThat(dragAnchor.getX(), Matchers.closeTo(1.0, RATIO_EQUAL_THRESHOLD));
+        verifyThat(dragAnchor.getY(), Matchers.closeTo(2.0, RATIO_EQUAL_THRESHOLD));
+
+        dragAnchor.setFromMouseEvent(new MouseEvent(MouseEvent.MOUSE_CLICKED, 32.0, 60.0, 100.0, 200.0,
+                                                    MouseButton.PRIMARY, 1, false, false, false, false, false, false,
+                                                    false, false, false, false, null));
+        verifyThat(dragAnchor.getX(), Matchers.closeTo(32.0, RATIO_EQUAL_THRESHOLD));
+        verifyThat(dragAnchor.getY(), Matchers.closeTo(60.0, RATIO_EQUAL_THRESHOLD));
+    }
+
     private Stage tryExitAndGetDialog(FxRobot robot) {
         timeOutClickOn(robot, "File");
         WaitForAsyncUtils.waitForFxEvents();
         timeOutClickOn(robot, "Exit");
         WaitForAsyncUtils.waitForFxEvents();
 
-        return timeoutGetTopModalStage(robot, "Exit Application");
+        return timeOutGetTopModalStage(robot, "Exit Application");
     }
 }
diff --git a/src/test/java/boundingboxeditor/ui/ImageFolderOpenedBasicTests.java b/src/test/java/boundingboxeditor/ui/ImageFolderOpenedBasicTests.java
diff --git a/src/test/java/boundingboxeditor/ui/ObjectTreeTests.java b/src/test/java/boundingboxeditor/ui/ObjectTreeTests.java
diff --git a/src/test/java/boundingboxeditor/utils/UtilsTests.java b/src/test/java/boundingboxeditor/utils/UtilsTests.java

Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,6 @@ public Controller(final Stage mainStage) {`
`144`	`144`	`setUpModelListeners();`
`145`	`145`	`}`
`146`	`146`
`147`		`- IoMetaData getIoMetaData() {`
`148`		`- return ioMetaData;`
`149`		`- }`
`150`		`-`
`151`	`147`	`/**`
`152`	`148`	`* Handles the event of the user requesting to open a new image folder.`
`153`	`149`	`*/`
`@@ -528,6 +524,10 @@ public Model getModel() {`
`528`	`524`	`return model;`
`529`	`525`	`}`
`530`	`526`
	`527`	`+ IoMetaData getIoMetaData() {`
	`528`	`+ return ioMetaData;`
	`529`	`+ }`
	`530`	`+`
`531`	`531`	`Stage getStage() {`
`532`	`532`	`return stage;`
`533`	`533`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,13 +140,6 @@ public boolean equals(Object obj) {`
`140`	`140`	`MathUtils.doubleAlmostEqual(getHeight(), other.getHeight());`
`141`	`141`	`}`
`142`	`142`
`143`		`- @Override`
`144`		`- public String toString() {`
`145`		`- return "BoundingBoxView[x=" + getX() + ", y=" + getY() + ", width=" + getWidth() + ", height=" + getHeight()`
`146`		`- + ", fill=" + getFill() + ", category=" + boundingShapeViewData.getObjectCategory()`
`147`		`- + ", image-metadata=" + boundingShapeViewData.getImageMetaData() + "]";`
`148`		`- }`
`149`		`-`
`150`	`143`	`/**`
`151`	`144`	`* Returns the associated {@link ObjectCategory} object.`
`152`	`145`	`*`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ protected Stage timeOutAssertDialogOpenedAndGetStage(FxRobot robot, String title`
`311`	`311`	`return getTopModalStage(robot, title);`
`312`	`312`	`}`
`313`	`313`
`314`		`- protected Stage timeoutGetTopModalStage(FxRobot robot, String stageTitle) {`
	`314`	`+ protected Stage timeOutGetTopModalStage(FxRobot robot, String stageTitle) {`
`315`	`315`	`Assertions.assertDoesNotThrow(() -> WaitForAsyncUtils.waitFor(TIMEOUT_DURATION_IN_SEC, TimeUnit.SECONDS,`
`316`	`316`	`() -> getTopModalStage(robot, stageTitle) !=`
`317`	`317`	`null),`