Skip to content
Snippets Groups Projects
Commit 28f5e40a authored by Eilert Tunheim's avatar Eilert Tunheim
Browse files

minor updates

parent 79b43fbb
No related branches found
No related tags found
No related merge requests found
...@@ -36,11 +36,12 @@ import static java.util.logging.Level.SEVERE; ...@@ -36,11 +36,12 @@ import static java.util.logging.Level.SEVERE;
*/ */
public class Main extends Application { public class Main extends Application {
private LineChartFunctionality lineChartFunctionality;
private BorderPane topBar; private BorderPane topBar;
private HBox logoBar; private HBox logoBar;
private VBox sideBar; private VBox sideBar;
private MenuBar menuBar; private MenuBar menuBar;
private LineChartFunctionality lineChartFunctionality;
private static TextField treeSpeciesText; private static TextField treeSpeciesText;
private static TextField dimensionsText; private static TextField dimensionsText;
...@@ -68,11 +69,11 @@ public class Main extends Application { ...@@ -68,11 +69,11 @@ public class Main extends Application {
super.init(); super.init();
// Initializing variables // Initializing variables
this.lineChartFunctionality = new LineChartFunctionality();
this.topBar = new BorderPane(); this.topBar = new BorderPane();
this.logoBar = new HBox(); this.logoBar = new HBox();
this.sideBar = new VBox(); this.sideBar = new VBox();
this.menuBar = new MenuBar(); this.menuBar = new MenuBar();
this.lineChartFunctionality = new LineChartFunctionality();
} }
/** /**
...@@ -251,7 +252,7 @@ public class Main extends Application { ...@@ -251,7 +252,7 @@ public class Main extends Application {
rpi.setProgress(progress); rpi.setProgress(progress);
}); });
progress = getLiveData().size()/ getDataPointsXAxis(); progress = getLiveData().size()/ getDataPointsXAxis()*100;
if (progress > 100) { if (progress > 100) {
break; break;
......
...@@ -4,14 +4,19 @@ ...@@ -4,14 +4,19 @@
-fx-effect: null; -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-color0.chart-series-line{-fx-stroke: red; -fx-opacity: 1.0}
.default-color1.chart-series-line{-fx-stroke: green; -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-color2.chart-earlier-data-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-color3.chart-earlier-data-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-color4.chart-earlier-data-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-color5.chart-earlier-data-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-color6.chart-earlier-data-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-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-color0.chart-line-symbol{-fx-background-color: red,red;}
.default-color1.chart-line-symbol{-fx-background-color: green,green;} .default-color1.chart-line-symbol{-fx-background-color: green,green;}
......
...@@ -4,14 +4,19 @@ ...@@ -4,14 +4,19 @@
-fx-effect: null; -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-color0.chart-series-line{-fx-stroke: red; -fx-opacity: 1.0}
.default-color1.chart-series-line{-fx-stroke: green; -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-color2.chart-earlier-data-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-color3.chart-earlier-data-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-color4.chart-earlier-data-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-color5.chart-earlier-data-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-color6.chart-earlier-data-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-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-color0.chart-line-symbol{-fx-background-color: red,red;}
.default-color1.chart-line-symbol{-fx-background-color: green,green;} .default-color1.chart-line-symbol{-fx-background-color: green,green;}
......
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment