diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index aa32d722c051dfa27110356f8cab4e061cce63a7..6ab4831dd66da4fccc84037685eb5903cc3b99f8 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -36,11 +36,12 @@ import static java.util.logging.Level.SEVERE; */ public class Main extends Application { + private LineChartFunctionality lineChartFunctionality; + private BorderPane topBar; private HBox logoBar; private VBox sideBar; private MenuBar menuBar; - private LineChartFunctionality lineChartFunctionality; private static TextField treeSpeciesText; private static TextField dimensionsText; @@ -68,11 +69,11 @@ public class Main extends Application { super.init(); // Initializing variables + this.lineChartFunctionality = new LineChartFunctionality(); this.topBar = new BorderPane(); this.logoBar = new HBox(); this.sideBar = new VBox(); this.menuBar = new MenuBar(); - this.lineChartFunctionality = new LineChartFunctionality(); } /** @@ -251,7 +252,7 @@ public class Main extends Application { rpi.setProgress(progress); }); - progress = getLiveData().size()/ getDataPointsXAxis(); + progress = getLiveData().size()/ getDataPointsXAxis()*100; if (progress > 100) { break; diff --git a/src/main/resources/com.application/GUI/graphStyles.css b/src/main/resources/com.application/GUI/graphStyles.css index 2629bcc4a515e757b35ca2a7152f29a05e24fbc3..7cff0ac3c21e2302932681fd0aa6e95d79e5c0f1 100644 --- a/src/main/resources/com.application/GUI/graphStyles.css +++ b/src/main/resources/com.application/GUI/graphStyles.css @@ -4,14 +4,19 @@ -fx-effect: null; } +.chart-earlier-data-line { + -fx-stroke-width: 5px; + -fx-effect: null; +} + .default-color0.chart-series-line{-fx-stroke: red; -fx-opacity: 1.0} .default-color1.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0} -.default-color2.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color3.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color4.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color5.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color6.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color7.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color2.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color3.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color4.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color5.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color6.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color7.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color0.chart-line-symbol{-fx-background-color: red,red;} .default-color1.chart-line-symbol{-fx-background-color: green,green;} diff --git a/target/classes/com.application/GUI/graphStyles.css b/target/classes/com.application/GUI/graphStyles.css index 2629bcc4a515e757b35ca2a7152f29a05e24fbc3..7cff0ac3c21e2302932681fd0aa6e95d79e5c0f1 100644 --- a/target/classes/com.application/GUI/graphStyles.css +++ b/target/classes/com.application/GUI/graphStyles.css @@ -4,14 +4,19 @@ -fx-effect: null; } +.chart-earlier-data-line { + -fx-stroke-width: 5px; + -fx-effect: null; +} + .default-color0.chart-series-line{-fx-stroke: red; -fx-opacity: 1.0} .default-color1.chart-series-line{-fx-stroke: green; -fx-opacity: 1.0} -.default-color2.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color3.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color4.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color5.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color6.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} -.default-color7.chart-series-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color2.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color3.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color4.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color5.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color6.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} +.default-color7.chart-earlier-data-line{-fx-stroke: rgba(0,168,355,0.3); -fx-opacity: 0.1} .default-color0.chart-line-symbol{-fx-background-color: red,red;} .default-color1.chart-line-symbol{-fx-background-color: green,green;} diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class index b47d85b5fce893cc2f8bdd2faa64b9b4888b2eef..4384032845900a265d6cb708dec38d4859ef4179 100644 Binary files a/target/classes/com/application/Main$1WorkerThread.class and b/target/classes/com/application/Main$1WorkerThread.class differ diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class index b9e38140f6b49fd482603f5b043ca7205cbe4856..96ea17c1cd09d33cda6b1ce803c8c62b301f044a 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ