sharpetronics/Map-Projections
1
0
Fork 0
mirror of https://github.com/csharpee/Map-Projections.git synced 2025-12-16 00:00:06 -05:00
Code Issues Projects Releases Wiki Activity

Minor touch-ups

Browse Source 
I noticed some things that bothered me about my GUI, which I adjusted.
This commit is contained in:
Justin Kunimune 2018-01-20 17:41:00 -10:00
parent 9dfc72f4b8
commit fd87346a95
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
input/Basic.svg
View File

@ -53,6 +53,7 @@
fill:none; fill:none;
stroke:#000000; stroke:#000000;
stroke-width:0.1; stroke-width:0.1;
stroke-endcap:round;
} }
.prime-m { .prime-m {
stroke:#000000; stroke:#000000;

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

7
input/Tissot-alt1.svg
View File

@ -46,18 +46,19 @@
fill:#fefee4; fill:#fefee4;
fill-rule:evenodd; fill-rule:evenodd;
stroke:#0978ab; stroke:#0978ab;
stroke-width:0.04; stroke-width:0.05;
stroke-miterlimit:4; stroke-miterlimit:4;
} }
.graticule { .graticule {
fill:none; fill:none;
stroke:#000000; stroke:#000000;
stroke-width:0.04; stroke-width:0.05;
stroke-miterlimit:4; stroke-miterlimit:4;
stroke-endcap:round;
} }
.prime-m, .prime-m,
.equator { .equator {
stroke-width:0.08; stroke-width:0.1;
} }
.tissot { .tissot {
fill:#ff4800; fill:#ff4800;

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB

8
src/apps/MapAnalyzer.java
View File

@ -123,10 +123,10 @@ public class MapAnalyzer extends MapApplication {
RASTER_TYPES[0], ()->true, this::calculateAndSaveMap); RASTER_TYPES[0], ()->true, this::calculateAndSaveMap);
final Button savePltBtn = buildSaveButton(true, "plots", RASTER_TYPES, final Button savePltBtn = buildSaveButton(true, "plots", RASTER_TYPES,
RASTER_TYPES[0], ()->true, this::calculateAndSavePlot); 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); buttons.setAlignment(Pos.CENTER);
final VBox layout = new VBox(5, final VBox layout = new VBox(V_SPACE,
projectionSelector, parameterSelector, new Separator(), projectionSelector, parameterSelector, new Separator(),
optionPane, new Separator(), buttons, new Separator(), textDisplay); optionPane, new Separator(), buttons, new Separator(), textDisplay);
layout.setAlignment(Pos.CENTER); layout.setAlignment(Pos.CENTER);
@ -141,9 +141,9 @@ public class MapAnalyzer extends MapApplication {
this.charts = buildDistortionHistograms(); 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); gui.setAlignment(Pos.CENTER);
StackPane.setMargin(gui, new Insets(10)); StackPane.setMargin(gui, new Insets(MARGIN));
return gui; return gui;
} }

9
src/apps/MapApplication.java
View File

@ -98,8 +98,9 @@ public abstract class MapApplication extends Application {
protected static final int GUI_WIDTH = 350; protected static final int GUI_WIDTH = 350;
protected static final int IMG_WIDTH = 500; protected static final int IMG_WIDTH = 500;
protected static final int V_SPACE = 5; protected static final int V_SPACE = 6;
protected static final int H_SPACE = 3; protected static final int H_SPACE = 4;
protected static final int MARGIN = 10;
protected static final int SPINNER_WIDTH = 92; protected static final int SPINNER_WIDTH = 92;
private static final KeyCombination CTRL_O = new KeyCodeCombination(KeyCode.O, KeyCodeCombination.CONTROL_DOWN); 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);
} }

4
src/apps/MapDesignerRaster.java
View File

@ -144,9 +144,9 @@ public class MapDesignerRaster extends MapApplication {
pane.setMinWidth(IMG_WIDTH); pane.setMinWidth(IMG_WIDTH);
pane.setMinHeight(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); gui.setAlignment(Pos.CENTER);
StackPane.setMargin(gui, new Insets(10)); StackPane.setMargin(gui, new Insets(MARGIN));
return gui; return gui;
} }

6
src/apps/MapDesignerVector.java
View File

@ -106,7 +106,7 @@ public class MapDesignerVector extends MapApplication {
this.saveBtn = buildSaveButton(true, "map", VECTOR_TYPES, this.saveBtn = buildSaveButton(true, "map", VECTOR_TYPES,
VECTOR_TYPES[0], ()->true, this::calculateAndSaveMap); VECTOR_TYPES[0], ()->true, this::calculateAndSaveMap);
final VBox layout = new VBox(5, final VBox layout = new VBox(V_SPACE,
inputSelector, new Separator(), projectionSelector, inputSelector, new Separator(), projectionSelector,
new Separator(), aspectSelector, parameterSelector, new Separator(), aspectSelector, parameterSelector,
new Separator(), saveBtn); new Separator(), saveBtn);
@ -119,9 +119,9 @@ public class MapDesignerVector extends MapApplication {
pane.setMinWidth(IMG_WIDTH); pane.setMinWidth(IMG_WIDTH);
pane.setMinHeight(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); gui.setAlignment(Pos.CENTER);
StackPane.setMargin(gui, new Insets(10)); StackPane.setMargin(gui, new Insets(MARGIN));
return gui; return gui;
} }

4
src/dialogs/ProgressBarDialog.java
View File

@ -48,10 +48,9 @@ public class ProgressBarDialog extends Dialog<Void> {
this.bar = new ProgressBar(); this.bar = new ProgressBar();
this.bar.setPrefWidth(300); 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 = new Label();
this.words.setMinWidth(40); this.words.setMinWidth(50);
this.words.setAlignment(Pos.BASELINE_RIGHT); this.words.setAlignment(Pos.BASELINE_RIGHT);
this.box = new HBox(5); this.box = new HBox(5);
@ -60,6 +59,7 @@ public class ProgressBarDialog extends Dialog<Void> {
pane.setHeaderText("Please wait."); pane.setHeaderText("Please wait.");
pane.getButtonTypes().addAll(new ButtonType[] { ButtonType.CLOSE }); 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)).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.resetBar();
this.setResultConverter((btn) -> { // set the return value this.setResultConverter((btn) -> { // set the return value