diff --git a/input/Basic.svg b/input/Basic.svg index 4ce91be..3649512 100644 --- a/input/Basic.svg +++ b/input/Basic.svg @@ -53,6 +53,7 @@ fill:none; stroke:#000000; stroke-width:0.1; + stroke-endcap:round; } .prime-m { stroke:#000000; diff --git a/input/Tissot-alt1.svg b/input/Tissot-alt1.svg index 234912c..f31d04b 100644 --- a/input/Tissot-alt1.svg +++ b/input/Tissot-alt1.svg @@ -46,18 +46,19 @@ fill:#fefee4; fill-rule:evenodd; stroke:#0978ab; - stroke-width:0.04; + stroke-width:0.05; stroke-miterlimit:4; } .graticule { fill:none; stroke:#000000; - stroke-width:0.04; + stroke-width:0.05; stroke-miterlimit:4; + stroke-endcap:round; } .prime-m, .equator { - stroke-width:0.08; + stroke-width:0.1; } .tissot { fill:#ff4800; diff --git a/src/apps/MapAnalyzer.java b/src/apps/MapAnalyzer.java index 5f3a18a..aaec16e 100644 --- a/src/apps/MapAnalyzer.java +++ b/src/apps/MapAnalyzer.java @@ -123,10 +123,10 @@ public class MapAnalyzer extends MapApplication { RASTER_TYPES[0], ()->true, this::calculateAndSaveMap); final Button savePltBtn = buildSaveButton(true, "plots", RASTER_TYPES, RASTER_TYPES[0], ()->true, this::calculateAndSavePlot); - final HBox buttons = new HBox(5, updateBtn, saveMapBtn, savePltBtn); + final HBox buttons = new HBox(H_SPACE, updateBtn, saveMapBtn, savePltBtn); buttons.setAlignment(Pos.CENTER); - final VBox layout = new VBox(5, + final VBox layout = new VBox(V_SPACE, projectionSelector, parameterSelector, new Separator(), optionPane, new Separator(), buttons, new Separator(), textDisplay); layout.setAlignment(Pos.CENTER); @@ -141,9 +141,9 @@ public class MapAnalyzer extends MapApplication { this.charts = buildDistortionHistograms(); - final HBox gui = new HBox(10, layout, pane, charts); + final HBox gui = new HBox(MARGIN, layout, pane, charts); gui.setAlignment(Pos.CENTER); - StackPane.setMargin(gui, new Insets(10)); + StackPane.setMargin(gui, new Insets(MARGIN)); return gui; } diff --git a/src/apps/MapApplication.java b/src/apps/MapApplication.java index 0b0e0ea..99acf8b 100644 --- a/src/apps/MapApplication.java +++ b/src/apps/MapApplication.java @@ -98,8 +98,9 @@ public abstract class MapApplication extends Application { protected static final int GUI_WIDTH = 350; protected static final int IMG_WIDTH = 500; - protected static final int V_SPACE = 5; - protected static final int H_SPACE = 3; + protected static final int V_SPACE = 6; + protected static final int H_SPACE = 4; + protected static final int MARGIN = 10; protected static final int SPINNER_WIDTH = 92; private static final KeyCombination CTRL_O = new KeyCodeCombination(KeyCode.O, KeyCodeCombination.CONTROL_DOWN); @@ -266,7 +267,9 @@ public abstract class MapApplication extends Application { } }); - return new VBox(V_SPACE, new HBox(H_SPACE, label, projectionChooser), description); + HBox comboRow = new HBox(H_SPACE, label, projectionChooser); + comboRow.setAlignment(Pos.CENTER_LEFT); + return new VBox(V_SPACE, comboRow, description); } diff --git a/src/apps/MapDesignerRaster.java b/src/apps/MapDesignerRaster.java index adaff05..013e611 100644 --- a/src/apps/MapDesignerRaster.java +++ b/src/apps/MapDesignerRaster.java @@ -144,9 +144,9 @@ public class MapDesignerRaster extends MapApplication { pane.setMinWidth(IMG_WIDTH); pane.setMinHeight(IMG_WIDTH); - final HBox gui = new HBox(10, layout, pane); + final HBox gui = new HBox(MARGIN, layout, pane); gui.setAlignment(Pos.CENTER); - StackPane.setMargin(gui, new Insets(10)); + StackPane.setMargin(gui, new Insets(MARGIN)); return gui; } diff --git a/src/apps/MapDesignerVector.java b/src/apps/MapDesignerVector.java index 3ba9177..afa9d97 100644 --- a/src/apps/MapDesignerVector.java +++ b/src/apps/MapDesignerVector.java @@ -106,7 +106,7 @@ public class MapDesignerVector extends MapApplication { this.saveBtn = buildSaveButton(true, "map", VECTOR_TYPES, VECTOR_TYPES[0], ()->true, this::calculateAndSaveMap); - final VBox layout = new VBox(5, + final VBox layout = new VBox(V_SPACE, inputSelector, new Separator(), projectionSelector, new Separator(), aspectSelector, parameterSelector, new Separator(), saveBtn); @@ -119,9 +119,9 @@ public class MapDesignerVector extends MapApplication { pane.setMinWidth(IMG_WIDTH); pane.setMinHeight(IMG_WIDTH); - final HBox gui = new HBox(10, layout, pane); + final HBox gui = new HBox(MARGIN, layout, pane); gui.setAlignment(Pos.CENTER); - StackPane.setMargin(gui, new Insets(10)); + StackPane.setMargin(gui, new Insets(MARGIN)); return gui; } diff --git a/src/dialogs/ProgressBarDialog.java b/src/dialogs/ProgressBarDialog.java index 217c77b..caed57c 100644 --- a/src/dialogs/ProgressBarDialog.java +++ b/src/dialogs/ProgressBarDialog.java @@ -48,10 +48,9 @@ public class ProgressBarDialog extends Dialog { this.bar = new ProgressBar(); this.bar.setPrefWidth(300); - this.bar.setTooltip(new Tooltip("Oh, did you want a cancel button? Well, TOO BAD.")); this.words = new Label(); - this.words.setMinWidth(40); + this.words.setMinWidth(50); this.words.setAlignment(Pos.BASELINE_RIGHT); this.box = new HBox(5); @@ -60,6 +59,7 @@ public class ProgressBarDialog extends Dialog { pane.setHeaderText("Please wait."); pane.getButtonTypes().addAll(new ButtonType[] { ButtonType.CLOSE }); ((Button) pane.lookupButton(ButtonType.CLOSE)).setText("Run in background"); // you can't close it + ((Button) pane.lookupButton(ButtonType.CLOSE)).setTooltip(new Tooltip("Oh, did you want a cancel button? Well, TOO BAD. Cancel buttons are hard.")); this.resetBar(); this.setResultConverter((btn) -> { // set the return value