From b678152cf8bbd85990321165d14225ba9b5d54aa Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 22 May 2017 11:49:40 +1200 Subject: [PATCH] Removed breaking dependency and made it so app doesn't need the breaking dependency any more. --- .idea/kotlinc.xml | 7 + visualiser/.idea/workspace.xml | 470 +++++++----------- visualiser/pom.xml | 31 +- .../seng302/Controllers/ArrowController.java | 17 + .../seng302/Controllers/RaceController.java | 77 +-- .../seng302/Model/ResizableRaceCanvas.java | 9 +- .../src/main/resources/images/arrow.png | Bin 0 -> 16120 bytes .../src/main/resources/scenes/race.fxml | 1 + 8 files changed, 267 insertions(+), 345 deletions(-) create mode 100644 .idea/kotlinc.xml create mode 100644 visualiser/src/main/java/seng302/Controllers/ArrowController.java create mode 100644 visualiser/src/main/resources/images/arrow.png diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..1c24f9a8 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/visualiser/.idea/workspace.xml b/visualiser/.idea/workspace.xml index 58b5f16d..8e698fa3 100644 --- a/visualiser/.idea/workspace.xml +++ b/visualiser/.idea/workspace.xml @@ -17,12 +17,12 @@ - + - + @@ -31,8 +31,8 @@ - - + + @@ -48,14 +48,18 @@ - + - - + + + + + + @@ -65,19 +69,18 @@ - + - - - - - - - - - - + + + + + + + + + @@ -86,7 +89,7 @@ - + @@ -96,7 +99,7 @@ - + @@ -106,7 +109,7 @@ - + @@ -116,8 +119,8 @@ - - + + @@ -128,7 +131,7 @@ - + @@ -138,8 +141,8 @@ - - + + @@ -148,7 +151,7 @@ - + @@ -158,7 +161,7 @@ - + @@ -211,8 +214,10 @@ DEFINITION_ORDER - @@ -538,6 +543,18 @@ + + + @@ -676,136 +693,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -872,15 +751,6 @@ - - - - - - - - - - - - - - - @@ -948,22 +812,6 @@ - - - - - - - - - - - - - - - - @@ -1025,13 +873,12 @@ - + - @@ -1043,9 +890,7 @@ - - - + @@ -1053,10 +898,13 @@ - + + + + @@ -1074,19 +922,110 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1094,7 +1033,6 @@ - @@ -1102,7 +1040,6 @@ - @@ -1110,23 +1047,14 @@ - - - - - - - - - + - @@ -1134,7 +1062,6 @@ - @@ -1142,7 +1069,6 @@ - @@ -1150,15 +1076,6 @@ - - - - - - - - - @@ -1166,7 +1083,6 @@ - @@ -1174,7 +1090,6 @@ - @@ -1182,7 +1097,6 @@ - @@ -1190,10 +1104,6 @@ - - - - @@ -1201,7 +1111,6 @@ - @@ -1209,7 +1118,6 @@ - @@ -1217,25 +1125,26 @@ - - - - - + + + + + + - + @@ -1245,14 +1154,13 @@ - - - + + @@ -1263,14 +1171,13 @@ - - - + + @@ -1279,13 +1186,12 @@ - - + @@ -1293,7 +1199,7 @@ - + @@ -1301,31 +1207,22 @@ - + - - - - - - - - - - + @@ -1333,28 +1230,43 @@ - + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + diff --git a/visualiser/pom.xml b/visualiser/pom.xml index fd1268de..156c8e60 100644 --- a/visualiser/pom.xml +++ b/visualiser/pom.xml @@ -1,4 +1,3 @@ - 4.0.0 @@ -55,23 +54,10 @@ 1.0-SNAPSHOT - - eu.hansolo - Medusa - 7.9 - - - - false - - eu.hansolo - Medusa - https://dl.bintray.com/hansolo/Medusa - maven2-repository.dev.java.net Java.net repository @@ -82,18 +68,15 @@ Open Source Geospatial Foundation Repository http://download.osgeo.org/webdav/geotools/ - - - - + - false + true - bintray-hansolo-Medusa - bintray-plugins - http://dl.bintray.com/hansolo/Medusa - - + opengeo + OpenGeo Maven Repository + http://repo.opengeo.org + + 1.8 diff --git a/visualiser/src/main/java/seng302/Controllers/ArrowController.java b/visualiser/src/main/java/seng302/Controllers/ArrowController.java new file mode 100644 index 00000000..af2113b3 --- /dev/null +++ b/visualiser/src/main/java/seng302/Controllers/ArrowController.java @@ -0,0 +1,17 @@ +package seng302.Controllers; + +import javafx.fxml.FXML; +import javafx.scene.layout.Pane; + +import java.net.URL; +import java.util.ResourceBundle; + +/** + * Created by Joseph on 22/05/2017. + */ +public class ArrowController extends Controller { + + @Override + public void initialize(URL location, ResourceBundle resources) { + } +} diff --git a/visualiser/src/main/java/seng302/Controllers/RaceController.java b/visualiser/src/main/java/seng302/Controllers/RaceController.java index 2a154d61..206aa558 100644 --- a/visualiser/src/main/java/seng302/Controllers/RaceController.java +++ b/visualiser/src/main/java/seng302/Controllers/RaceController.java @@ -33,7 +33,7 @@ public class RaceController extends Controller { private ResizableRaceCanvas raceMap; private ResizableRaceMap raceBoundaries; - private Gauge arrow; + @FXML Pane arrow; @FXML SplitPane race; @FXML StackPane arrowPane; @FXML CheckBox showFPS; @@ -116,7 +116,7 @@ public class RaceController extends Controller { //raceMap.setBoats(newRace.getStartingBoats()); raceMap.draw(); raceMap.setVisible(true); - raceMap.setArrow(this.arrow); + raceMap.setArrow(arrow.getChildren().get(0)); canvasBase.getChildren().add(0, raceMap); @@ -230,42 +230,43 @@ public class RaceController extends Controller { } private void makeArrow() { - arrow = GaugeBuilder.create() - .minValue(0) - .maxValue(359) - .startAngle(180) - .angleRange(360) - .autoScale(false) - .customTickLabelsEnabled(true) - .customTickLabels("N", "", "", "", "", "", "", "", "", - "E", "", "", "", "", "", "", "", "", - "S", "", "", "", "", "", "", "", "", - "W", "", "", "", "", "", "", "", "") - .customTickLabelFontSize(72) - .needleBehavior(Gauge.NeedleBehavior.OPTIMIZED) - .borderPaint(Color.web("#1f1e23")) - .backgroundPaint(Color.web("#1f1e23")) - .needleColor(Color.web("#dad9db")) - .tickMarkColor(Color.web("#9f9fa1")) - .tickLabelColor(Color.web("#dad9db")) - .valueColor(Color.web("#dad9db")) - .title("Wind direction") - .titleColor(Color.web("#dad9db")) - .knobType(Gauge.KnobType.FLAT) - .knobColor(Gauge.BRIGHT_COLOR) - .prefSize(125, 125) - .maxWidth(125) - .maxHeight(125) - .build(); - - Label value = new Label("0°"); - value.setFont(Fonts.latoBold(72)); - value.setAlignment(Pos.CENTER); - - arrow.valueProperty().addListener(o -> { - value.setText(String.format("%f°", arrow.getValue())); - }); - arrow.setValue(0); arrowPane.getChildren().add(arrow); +// arrow = GaugeBuilder.create() +// .minValue(0) +// .maxValue(359) +// .startAngle(180) +// .angleRange(360) +// .autoScale(false) +// .customTickLabelsEnabled(true) +// .customTickLabels("N", "", "", "", "", "", "", "", "", +// "E", "", "", "", "", "", "", "", "", +// "S", "", "", "", "", "", "", "", "", +// "W", "", "", "", "", "", "", "", "") +// .customTickLabelFontSize(72) +// .needleBehavior(Gauge.NeedleBehavior.OPTIMIZED) +// .borderPaint(Color.web("#1f1e23")) +// .backgroundPaint(Color.web("#1f1e23")) +// .needleColor(Color.web("#dad9db")) +// .tickMarkColor(Color.web("#9f9fa1")) +// .tickLabelColor(Color.web("#dad9db")) +// .valueColor(Color.web("#dad9db")) +// .title("Wind direction") +// .titleColor(Color.web("#dad9db")) +// .knobType(Gauge.KnobType.FLAT) +// .knobColor(Gauge.BRIGHT_COLOR) +// .prefSize(125, 125) +// .maxWidth(125) +// .maxHeight(125) +// .build(); +// +// Label value = new Label("0°"); +// value.setFont(Fonts.latoBold(72)); +// value.setAlignment(Pos.CENTER); +// +// arrow.valueProperty().addListener(o -> { +// value.setText(String.format("%f°", arrow.getValue())); +// }); +// arrow.setValue(0); +// arrowPane.getChildren().add(arrow); } } diff --git a/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java b/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java index 66c915a4..862f4d84 100644 --- a/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java +++ b/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java @@ -3,6 +3,7 @@ package seng302.Model; import eu.hansolo.medusa.Gauge; import eu.hansolo.medusa.GaugeBuilder; +import javafx.scene.Node; import javafx.scene.layout.Pane; import javafx.collections.ObservableList; import javafx.scene.paint.Color; @@ -34,7 +35,7 @@ public class ResizableRaceCanvas extends ResizableCanvas { private List colours; private final List markers; private final RaceDataSource raceData; - private Gauge arrow; + private Node arrow; public ResizableRaceCanvas(RaceDataSource raceData) { super(); @@ -146,8 +147,8 @@ public class ResizableRaceCanvas extends ResizableCanvas { private void displayFancyArrow(GraphCoordinate coordinate, double angle) { angle = angle % 360; - if (arrow != null && arrow.getValue() != angle) { - this.arrow.setValue(angle); + if (arrow != null && arrow.getRotate() != angle) { + arrow.setRotate(angle); } } @@ -341,7 +342,7 @@ public class ResizableRaceCanvas extends ResizableCanvas { )); } - public void setArrow(Gauge arrow) { + public void setArrow(Node arrow) { this.arrow = arrow; } diff --git a/visualiser/src/main/resources/images/arrow.png b/visualiser/src/main/resources/images/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..fab6e21d62803e12fb373e877e8f14edd8e9caae GIT binary patch literal 16120 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 literal 0 HcmV?d00001 diff --git a/visualiser/src/main/resources/scenes/race.fxml b/visualiser/src/main/resources/scenes/race.fxml index 46d9c717..32f3f9ce 100644 --- a/visualiser/src/main/resources/scenes/race.fxml +++ b/visualiser/src/main/resources/scenes/race.fxml @@ -19,6 +19,7 @@ +