Add settings tests, fix minimum prediction score setting update from config.

Author: mfl28

src/main/java/com/github/mfl28/boundingboxeditor/model/io/BoundingBoxPredictorConfig.java

@@ -6,8 +6,8 @@ public class BoundingBoxPredictorConfig {
     private final BooleanProperty inferenceEnabled = new SimpleBooleanProperty(false);
     private final DoubleProperty minimumScore = new SimpleDoubleProperty(0.5);
     private final BooleanProperty resizeImages = new SimpleBooleanProperty(true);
-    private final IntegerProperty maxImageWidth = new SimpleIntegerProperty(400);
-    private final IntegerProperty maxImageHeight = new SimpleIntegerProperty(400);
+    private final IntegerProperty maxImageWidth = new SimpleIntegerProperty(600);
+    private final IntegerProperty maxImageHeight = new SimpleIntegerProperty(600);
     private final BooleanProperty keepImageRatio = new SimpleBooleanProperty(true);
     private final BooleanProperty mergeCategories = new SimpleBooleanProperty(true);
 

src/main/java/com/github/mfl28/boundingboxeditor/ui/MenuBarView.java

@@ -66,6 +66,7 @@ class MenuBarView extends MenuBar implements View {
     private static final String JSON_IMPORT_MENU_ITEM_ID = "json-import-menu-item";
     private static final String SETTINGS_TEXT = "Se_ttings";
     private static final String SETTINGS_ICON_ID = "settings-icon";
+    private static final String FILE_SETTINGS_MENU_ITEM_ID = "file-settings-menu-item";
 
     private final MenuItem fileOpenFolderItem = new MenuItem(OPEN_FOLDER_TEXT, createIconRegion(OPEN_FOLDER_ICON_ID));
     private final Menu fileExportAnnotationsMenu = new Menu(SAVE_TEXT, createIconRegion(SAVE_ICON_ID));
@@ -176,6 +177,7 @@ private Menu createFileMenu() {
         fileOpenFolderItem.setId(FILE_OPEN_FOLDER_MENU_ITEM_ID);
         fileExportAnnotationsMenu.setId(FILE_EXPORT_ANNOTATIONS_MENU_ID);
         fileImportAnnotationsMenu.setId(FILE_IMPORT_ANNOTATIONS_MENU_ID);
+        settingsMenuItem.setId(FILE_SETTINGS_MENU_ITEM_ID);
         fileExitItem.setId(FILE_EXIT_MENU_ITEM_ID);
 
         return fileMenu;

src/main/java/com/github/mfl28/boundingboxeditor/ui/settings/InferenceSettingsView.java

@@ -32,6 +32,9 @@ public class InferenceSettingsView extends GridPane implements View, ApplyButton
     private static final String MERGE_CATEGORIES_LABEL_TEXT = "Merge Categories";
     private static final String SUBGROUP_TITLE_LABEL_ID = "subgroup-title-label";
     private static final String SETTINGS_SUBGROUP_BOX_ID = "settings-subgroup-box";
+    private static final String SERVERS_SUBGROUP_TITLE = "Torch serve";
+    private static final String PREDICTION_SUBGROUP_TITLE = "Prediction";
+    private static final String PREPROCESSING_SUBGROUP_TITLE = "Preprocessing";
     private final Button selectModelButton = new Button("Select");
     private final Label selectedModelLabel = new Label(NO_MODEL_SELECTED_TEXT);
     private final ToggleSwitch inferenceEnabledControl = new ToggleSwitch();
@@ -91,7 +94,7 @@ public void applyDisplayedSettingsToPredictorConfig(BoundingBoxPredictorConfig c
     }
 
     public void setDisplayedSettingsFromPredictorConfig(BoundingBoxPredictorConfig config) {
-        minimumScoreControl.getEditor().setText(Double.toString(config.getMinimumScore()));
+        minimumScoreControl.getValueFactory().setValue(config.getMinimumScore());
         inferenceEnabledControl.setSelected(config.isInferenceEnabled());
         resizeImagesControl.setSelected(config.isResizeImages());
         maxImageWidthField.setText(Integer.toString(config.getMaxImageWidth()));
@@ -165,18 +168,38 @@ public Spinner<Double> getMinimumScoreControl() {
         return minimumScoreControl;
     }
 
+    public CheckBox getResizeImagesControl() {
+        return resizeImagesControl;
+    }
+
+    public TextField getMaxImageWidthField() {
+        return maxImageWidthField;
+    }
+
+    public TextField getMaxImageHeightField() {
+        return maxImageHeightField;
+    }
+
+    public CheckBox getKeepImageRatioControl() {
+        return keepImageRatioControl;
+    }
+
+    public CheckBox getMergeCategoriesControl() {
+        return mergeCategoriesControl;
+    }
+
     private void setUpContent() {
         int rowIndex = -1;
 
         addInferenceControlRow(++rowIndex);
-        addSubgroupTitleRow("Servers", ++rowIndex);
+        addSubgroupTitleRow(SERVERS_SUBGROUP_TITLE, ++rowIndex);
         addInferenceAddressRow(++rowIndex);
         addManagementAddressRow(++rowIndex);
         addModelSelectionRow(++rowIndex);
-        addSubgroupTitleRow("Prediction", ++rowIndex);
+        addSubgroupTitleRow(PREDICTION_SUBGROUP_TITLE, ++rowIndex);
         addMinimumPredictionScoreRow(++rowIndex);
         addPredictionMergeCategoryChoiceRow(++rowIndex);
-        addSubgroupTitleRow("Preprocessing", ++rowIndex);
+        addSubgroupTitleRow(PREPROCESSING_SUBGROUP_TITLE, ++rowIndex);
         addImageResizePreprocessingSetupRow(++rowIndex);
     }
 

src/main/java/com/github/mfl28/boundingboxeditor/ui/settings/UISettingsView.java

@@ -10,7 +10,7 @@
 
 public class UISettingsView extends GridPane implements ApplyButtonChangeProvider {
     private static final String GRID_PANE_STYLE_CLASS = "grid-pane";
-    private final CheckBox showObjectPopover = new CheckBox();
+    private final CheckBox showObjectPopoverControl = new CheckBox();
 
     public UISettingsView() {
         getStyleClass().add(GRID_PANE_STYLE_CLASS);
@@ -21,20 +21,24 @@ public UISettingsView() {
     }
 
     public void setDisplayedSettingsFromUISettingsConfig(UISettingsConfig config) {
-        showObjectPopover.setSelected(config.isShowObjectPopover());
+        showObjectPopoverControl.setSelected(config.isShowObjectPopover());
     }
 
     public void applyDisplayedSettingsToUISettingsConfig(UISettingsConfig config) {
-        config.setShowObjectPopover(showObjectPopover.isSelected());
+        config.setShowObjectPopover(showObjectPopoverControl.isSelected());
     }
 
     @Override
     public void registerPropertyListeners(Button applyButton) {
-        showObjectPopover.selectedProperty()
-                         .addListener((observable, oldValue, newValue) -> applyButton.setDisable(false));
+        showObjectPopoverControl.selectedProperty()
+                                .addListener((observable, oldValue, newValue) -> applyButton.setDisable(false));
+    }
+
+    public CheckBox getShowObjectPopoverControl() {
+        return showObjectPopoverControl;
     }
 
     private void setUpContent() {
-        addRow(0, new Label("Show object popover"), showObjectPopover);
+        addRow(0, new Label("Show object popover"), showObjectPopoverControl);
     }
 }

src/test/java/com/github/mfl28/boundingboxeditor/BoundingBoxEditorTestBase.java

@@ -32,10 +32,7 @@
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.DialogPane;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuBar;
-import javafx.scene.control.MenuItem;
+import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseButton;
 import javafx.stage.Modality;
@@ -253,6 +250,13 @@ protected void timeOutLookUpInStageAndClickOn(FxRobot robot, Stage stage, String
         robot.targetWindow(stage).clickOn(id);
     }
 
+    protected void clickOnButtonInDialogStage(FxRobot robot, Stage stage, ButtonType buttonType, TestInfo testinfo) {
+        verifyThat(stage.getScene().getRoot(), Matchers.instanceOf(DialogPane.class), saveScreenshot(testinfo));
+
+        robot.clickOn(((DialogPane)stage.getScene().getRoot()).lookupButton(buttonType));
+        WaitForAsyncUtils.waitForFxEvents();
+    }
+
     protected void timeOutLookUp(FxRobot robot, String id, TestInfo testinfo) {
         Assertions.assertDoesNotThrow(() -> WaitForAsyncUtils.waitFor(TIMEOUT_DURATION_IN_SEC, TimeUnit.SECONDS,
                                                                       () -> nodePresentAndVisible(robot, id)),