From 28f5e40afc0514c563b4b773aa8d2b1baf8e00e5 Mon Sep 17 00:00:00 2001
From: Eilert Tunheim <emtunhei@stud.ntnu.no>
Date: Tue, 3 May 2022 16:27:34 +0200
Subject: [PATCH] minor updates
---
src/main/java/com/application/Main.java | 7 ++++---
.../com.application/GUI/graphStyles.css | 17 +++++++++++------
.../com.application/GUI/graphStyles.css | 17 +++++++++++------
.../com/application/Main$1WorkerThread.class | Bin 2842 -> 2845 bytes
target/classes/com/application/Main.class | Bin 8603 -> 8603 bytes
5 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
index aa32d72..6ab4831 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 2629bcc..7cff0ac 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 2629bcc..7cff0ac 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
GIT binary patch
delta 180
zcmbOwHdkzeEhq0&20n(z48jc07$g{;Pxj)p<`-mOVPIllV94LZz&48^d-4>{Fd>1I
zjI9hTT3Z-c1X7m#-?9Av)X6_N6&znPura)2;AMEvAi?m7L7L$MgABt*1_g#M3~CJD
z7<3qZG3YaVXE0#+!C=DhlfjMQH-kUJe}*JRMuu!gCWbslw#iXk^3wSXS`4}j3=Ad=
k3=Dh>Yz$HC45lo8><p%2>XWB%8M6Li;AZ$c`4m?G0A*(`9RL6T
delta 157
zcmbO$HcM=SEhq0220n&I48jag86+5<P4?on=I3KzVPIllV943Tz&48^WAYTvF#fF!
zELvL_SOij*{NKI&|BT6hI29aUF|aYbW#DCa#~{J*kwKc_J%bFx2L=U(&kSk|Um0{5
zelqAYd}A<R_|9O$@PomP;TMBH!#{?2Mh1oqMn;BgM%Kx(T=I-LlWVyo8C51v=Q3pd
N&A`p@XYyID006SkEMfov
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index b9e38140f6b49fd482603f5b043ca7205cbe4856..96ea17c1cd09d33cda6b1ce803c8c62b301f044a 100644
GIT binary patch
delta 916
zcmbR3JllCfwigS-7Y>FsTny|CUpW|hxfr-W^h7QO0TA8K#lQ=q*K#p@WBAI>@Eyee
z0aE-EMEn8~zd0HHF#P3W;GMX&kWpZ=I^#)3-pL;so!Gb-!?+l@CR;KYO%`DGn4HbD
zbaMnVKilMwoVv`N3|*5`IhC2a8G0snbILOJGW1Pe%_+;)&oF_JL1ywtCYjALTspk0
z)(k8RHj{nDYb9M7SQtDQ_!&GIq!_#yR2jS(3>bVEtQmYKKNdHsXOG;@z~QT<wVgqD
zD}xY-7TL<c528i4GVttR5cAU!65qxkp|yp9M@VuTgOt`51|cEoZ45G6TNwC-WVbQM
z=?ckjV^G-5z#GZ3mq9U-8Kfe3JA;xHi`EtfPDz$+49Xw|$b@YSDmozcHU?!7&A*MC
zK~+b08-of+a`Hln<jhD04u&WO0fuM>35FO31%@~V6^29xEruipV}@h~8-^4HSB6vu
zZ-z{Uc!nH?42E2WVuk{SYKB6FW`-h$4u%qjNetx-ix?^xb~02k>}RNEIKoiFaGIf(
z;Sxg~!wrUdhC2*R4EGtDC+A8kGxkiLC@IW1Ve(Q*2UdZ|?F@pGUr7d=_c3rVOk@yZ
zn8YB%FquJ}VLF2m!wd#nhM5eW409OfGB7ZhFt9Q(FnBY}W0=ptz`()a%rKE*(&Q2;
z3s&C9?F@XIH%dt|)h}V-U|7Z=#IT$}f?)-N62nRcErwMLMhvSNtQpoYI5Dha@L^cb
z5X7*7A%<ZiLkhzth8%{?45bWP7-|@{F|;#mXXs<t!7zhiC&L1UT?{K2b~9{b*u$`c
zVIRX`hW!ku7!EL8VK~Tehv5*z6NbYKZyAm-d|^1o@Sov0BOAjBMu7~5lZ+A!rx+C&
zPBUsUoMALzILBzsaGueL;R2%%!zIRWhRcj`3|AO47_KoEGhAn^Vz|NB!f=<dm*F1c
z6o&hZGZ{G<S1|H2aWD!n@iPj6{awJo&A`AU2=g}+C&M0w36nR<K4s*ZJY7!PP>w;6
zQJz7GQHepDQJKM%QH{ZdQJuk&QG>ygQIo-+QHLRdQI{csQJ*1`(SV_l(P;8#xmH$7
z26jfP$+hzKthNm7jCPX`%G<L#GO#l`O=eZFXLV&@XLOtFsbJ6Q$-vI&HMv*8n(@Zu
UlM2?1S0=M6S~Fgl?5G$80Lt6kbN~PV
delta 926
zcmbR3JllCfwwD0I7Y>FsTnsD>UpW}Mxfs|%bUzmZFNp5tV&DSNYq=P{F??lb_zvR#
z04e?nB7T90-<%A882)lGa82A=$jCcco$(|i*W{0kPHgOqVO$LClP#HyCU0h1Iysxk
zV{-&EKO3Xm<O7@{lh<+bFn2O^P2S5X%iPV-Gx;v3EOReI-{ilXifsK16Brq^CJXY4
zOs?US*eu7T#mj2Nz`|fX*;l+)(uIMA!JUDh!Gl4H!IMFi!HdCw!JEOF!DsSgag%zM
z$n6ZQzFJz_8HBeo@PlZPtqeRMT68M|=MDxjKOG_QZ444xTNpTnB)2h0X>DQP7n0t_
zAfvT~fk#Mo8-tv#ko-0Vh20EXkt}-|6eF2IDuTB&C|R*+ZDC-OWZA}`3}S#x*v6ou
z17dGuPzKRF+qfB2b#%8esDLCVFO*2mj9}nkh-468h+>dnh-Oe=h-FY=NMO)nNMtZ(
zNMf*INM>+lNMZ11$Y6+P$Y#i3$YCgE$Y-c#C}3!2C}ikhC}x<%P{y!`p`2kSLnXt0
zhAM_54Al&$8EP0VG1M~LV5nob!_dfZpP^}TuB0+!*W`(k!i;^Bmr6RY@<wiF;G6tP
zGT6MAfrDWJgAl_+1{sD)4C)Ni7>pREGuSfBVDMy^%`lgNfx(1<m4Si5n_(Wqd<F&v
z4hCn2eufE?OQbAVxgxhSaBtoyCCOC3n1O>~DT5HhG6o5T<qS#;D;TsGRx%hdtYWZc
zSk2(Xu$IAxVI4yd!+M4oh7AlU3>z787&bAKGHhn3Vc5#h&ajQ4k6}B*42B&H3mA4X
ztYFy1u#sUm!w!bM42K!^F`Q!9&v1p|0K*-IgA7j?4l%rCILz>c;V8p@hGUFu496J-
zG8j%UN-&&cRA4y8sL61e(SYGBqcy`hMkj{zj6Mt(8N(SaF~%`mX3Su?%2>>Bjj@X1
zI%5mN9mZaUyNpv9?lI0}<X~LE$iu|J$j`*jC<yj<0RuM!1Ct=k-%Okgdl>pAZ<Kw?
z$Ub?xoVKAXgCL_EgA$`6gEpfQgDImbgAJn^gCnClgD0Z~gFmA-Lj<D^Ljt27Lnfm>
zLm{K#<j-=gtQHLHjFyvY<?UH*7}yzYCm)ozXLVp;XLOv*s$kFR!obexI@wdfp4Eea
eozZi0uYxt>^~om{tQjv)W>vIiJU`h{F$w@$8Q!=6
--
GitLab