From b3f722d4144b391b39e545fe918c77faa01508f4 Mon Sep 17 00:00:00 2001 From: emtunhei <emtunhei@stud.ntnu.no> Date: Tue, 26 Apr 2022 11:07:41 +0200 Subject: [PATCH] Added function to push man moisture check --- .../java/com/application/DB/Constants.java | 5 ++++- src/main/java/com/application/DB/DB.java | 12 ++++++++++++ .../GUI/LineChartFunctionality.java | 6 +++--- .../application/GUI/OutputPopUpWindow.java | 8 ++++++++ .../com/application/DB/Constants.class | Bin 6028 -> 6119 bytes target/classes/com/application/DB/DB.class | Bin 15680 -> 15916 bytes .../GUI/LineChartFunctionality.class | Bin 9379 -> 9248 bytes 7 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java index ff18115..5b391a9 100644 --- a/src/main/java/com/application/DB/Constants.java +++ b/src/main/java/com/application/DB/Constants.java @@ -25,11 +25,14 @@ public final class Constants { public static String MOISTURE_GOAL = ""; // Number of wanted drying periods - public static int NUMBER_OF_PERIODS = 1; + public static int NUMBER_OF_PERIODS = 3; // Database ID/name public static final String PROJECT_ID = "sf-drying-optimization"; + public static final int LOCATION_ID = 124; + public static final String MAN_MOISTURE_TABLE = "int_dk_manMoisture"; + // Location Valasen(124) // Project settings diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java index 6b14b56..b58ff5f 100644 --- a/src/main/java/com/application/DB/DB.java +++ b/src/main/java/com/application/DB/DB.java @@ -580,4 +580,16 @@ public class DB { // Returns a treemap that sorts the dates incrementally return new TreeMap<>(sortedFinalResults); } + + + public static void pushManMoisture(String moisture) throws Exception { + // Sqlstatement + final String sqlStatement = + "INSERT INTO " + PROJECT_ID + "." + LOCATION_ID + "." + MAN_MOISTURE_TABLE + "(moisture) " + + "VALUES("+moisture+") "; + + System.out.println(sqlStatement); + + HelpingFunctions.createQueryJob(sqlStatement); + } } diff --git a/src/main/java/com/application/GUI/LineChartFunctionality.java b/src/main/java/com/application/GUI/LineChartFunctionality.java index 0bc011d..e3742ba 100644 --- a/src/main/java/com/application/GUI/LineChartFunctionality.java +++ b/src/main/java/com/application/GUI/LineChartFunctionality.java @@ -186,9 +186,9 @@ public class LineChartFunctionality { } } - PythonInterpreter pythonInterpreter = new PythonInterpreter(); - //pythonInterpreter - + //PythonInterpreter.initialize(System.getProperties(),System.getProperties(), data); + //pythonInterpreter.execfile(LineChartFunctionality.class.getResource("/com.application/DataProcessing/NonlinearRegression.py").getFile()); + //pythonInterpreter.execfile(); XYChart.Series<String, Number> regressionSeries = new XYChart.Series<String, Number>(); diff --git a/src/main/java/com/application/GUI/OutputPopUpWindow.java b/src/main/java/com/application/GUI/OutputPopUpWindow.java index 7b651c7..8b9b7f4 100644 --- a/src/main/java/com/application/GUI/OutputPopUpWindow.java +++ b/src/main/java/com/application/GUI/OutputPopUpWindow.java @@ -1,5 +1,6 @@ package com.application.GUI; +import com.application.DB.DB; import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -38,6 +39,13 @@ public class OutputPopUpWindow { Button finishButton = new Button("Finish"); finishButton.setId("inputButtonStart"); finishButton.setAlignment(Pos.BOTTOM_CENTER); + finishButton.setOnAction(e -> { + try { + DB.pushManMoisture(moistureCheckTextField.getCharacters().toString()); + } catch (Exception ex) { + ex.printStackTrace(); + } + }); VBox layout = new VBox(10); diff --git a/target/classes/com/application/DB/Constants.class b/target/classes/com/application/DB/Constants.class index b1c92708a53d5d9c8d893548aa6254494e72c3a3..f5909ab5d7a461cab06b56f7142d8e1181ed9157 100644 GIT binary patch delta 2111 zcmeCtf39DD>ff$?3=9k=49~b2EEuM+Gfd@TU;@$8xEM?srgJf{Fw6jn%mlG!fr!~0 z40Avtb3vSW91Qb8^a2isg&YivI2aalFf8F<Sjxe$jDul02g3?3hLsGfI2l+NR&y|{ z;b2(H!LW{lVLb=K29VfBu6hO*hD{&?HiL*Q91L4I7`AaRZ0BIu0aCD&gJBnl-p#?V zhl^n^!#*yC{R{^{tb-uoLmUi;LG%$2aTG)x0};nT#0hqWlk5zqxEM||oZ(_HVK~dq zaE_6IJH+3`F)}#b#WBQ{kwM63;=fv_^NbAKKK{;*A)fwz@t!Ws3=9l4j0{4)j(+jJ z{+_`hp+T<kA&yQyt{e;(7#W1a9DN*vUH#&bv}~Tvc!`Pe;^r)txvb3D3^|jzxJ<1t zF<j<hsAMSSVYtF@m4~4N#HwW|W@O+DOU%hlEy+wS=3%(TaGi&t0VK-oU7o?i&<bKI zOpfQ4ojjc@lluk_!zG5BJPd&hL6f<;?Sf_NCZKqhsAh(3nm$uZnf_DKvuj0~JX zsfjsZi8-aIJPc_d0pZHZ%1T{dU)_`x1rHCa++3^TVs?gGJPfxP?yxi5<zcwTaG!_a z0mH+|U%7p`AMr3eW_ZHGkj?OPvM-OGuux`RNqkCnd~RZ%Z+>QRNoi5)=1LwdCPvlC zOZejJ-5DeqJQy4p7#W-x7#NrsTp1)8JQ=Lue0~N=1}`MO0D~lhHxgfvL6X4-i7&(; z$>58`7h#ZO@I&H@GDtG`BkZeZ2w;!|1q%ZsLonC@Aq<iXp-38}7$h0OkoeLJk__QU zd|3ubh6sir6#bD13mBppBpITS)GIMaGQ`07^-K)P43Z47Z~-O;kdNY!_#hv}Bk@%j zBpDKr_^J$&42eh<f;^Oj=AdLG_38|g3@I>v00R>P$VaI#0R|=pkdM;P3`j?k&tQ;b z$V9R*i-Dhki6NUIhk=nHck%`SG3`7C1_n^pW?<lBU||qo$Y)?+;9+27U|?WnC}1dL zU|`^6C}JpPU}DIf{87Nn7o=W@frWvAA(?@LA%#JdA(cUyAq}pNgF%*|grSsyfuRg) z5=5k&fdLw86%1UUJOVbcM9><^#2f|=hFk^-hCBuhhI}Lwl^CkfOazHk!%eJV;AE(U zy0K40VzP*kD3Yng3>*w441x@$3{nhbNT!Nlm<kf9gPU5<zy->tV0UteYE51sq*M>` zy&MBO0|P@90|!GjgCIi<gA_w8gEB)MgAPLjgC#>Fk`2ZTjcD!$i6Gm+$<V~m46=cN zfk6fw>I@7ln;0ZEFfcGMGJtGj1B<po!j6Zbg@FrHV1TqtzAq{<IaOE=>?kn?Rt5%! zP6iH!E(Sq{ZU!la9tLHGek8}pGPI#N1|)*&n09QAkwbUPWQb$HZs}ksW&t~fO$0e6 zXEJaw%wmvWn9ZQUFbByIN(`N7jsS_E#$*>fCUucwaRCDd!$Jl@hD8ig42zLW1jQL@ zY6FQNdy9*q8)_nls1G=>AThX{frDWMgCN671}TPB49X0v8FU!dGFURKLo(f%p$E;q zAQ5EKIT?Df1)3UqplyN#8YBk$pbok(Y6f-?B=)v3a4>9V5M<cFAjPngL78DUl0#$} z`q3N$5<zvy1Z)n`KzGP~h(j1!7&sUvGUTv;OM)3<dW>w7kBjv%=1mR}R}?p4aAUAx UNM{IQ=wOIsU}TsCE^j9T08k4&bpQYW delta 1995 zcmaE^-=klD>ff$?3=9k=43D@NEEp!TGfd)QU;@#Txfo0trf@N^FiZuBOarl|gNPX% z3^PF@vp}5L91L?n^jr>xc^nM$IT#jjFf8O?Sj54wn1f*n2g6b>hGh)PIT=_OR&X$^ z<X~9E!LXWxVGRevT9DW}u6hO*hV>u=Hh_qY91NQ{7&db-Y~f(o3R19*gJC;}-oe4J zlZ#;&!)`8yJq&w6tbHKi{TvJjK=eTnaR@{l1`$U<#8GyJW9$saxfo6`oaACKVK~Lk zaGH^UJH+3`F)}#b#WBQ{kwM63;=fv%GmH$vVU9kI!LEMsKK{;*A)fwz@t!Ws3=9l4 zoA)waVq!eIc>>E^R^|+b%*h5^rWWTI&hs#oF%<AHTwu7!!_W$1RWTGWGH`|^=H#Z9 zWF{B$FkE7|%)?L%5@q%-&){KbVknqAm#dTe3J=3MhO0abehmJT4Y}<_LmB*e7}`Nb zbbyF%kPg|&3%Fz_FXFZmiD&R<WZ(=+P0R^P%qdOfVMu21pZtMaLiidF!*zxm><l+~ z7;Z7#=3%(QaCfpak1zK<9)|l24|o_d7#>b8=F!`{jYortQF-!xzW92621y2Y1}g?e z1}6pv1||jp21y1FB)%YnB!edsUx-1H!3&8m!XU}ujl>sakYw;-aDbcV%ODBz6$2wf z0NDIM21$k>g!+00DF#V~V1xjJG=n5V2ohhGL6RYq!5_tdFeD4Y86+7Zkkl(NNHRns z@s$}Q8KRK*AP+^u`SnZ;ARooR1(+CA7$g~Dk@%_%k_>T37J_^fkLI8RB=zbHk_?GR ze2|BdkoX`ECByXBGcYlLf+Ph=K`MhJLmHBW=?we~Obi(enGB2!Squye#te)Mj0_A6 ztXkU{7&n4LHJgEf0hIk182A`i7z7w{7#J9MAc`1r8S)qy7&sa7844Jfzy{<pFoWe( zcQZ_m64dYo=@w#OVPIfLVBla#WDsRYVo+vChMU5{Aj?q5P{hE%Pz*H}B2vP@0FBjB z1};$A2bn)PQAB+5GeH$3Q!^Pj7_t~77_u2O7;=zIRbnVdGZiFK0XMahfs>&M;_Aua zLb^yM7BFxy6fy`h6fsCK6eF1^f?*;^q#ABw4FeY_`+?ngQOKtr<a0R&b_NE9at02D z3I;)jN(L#0Dh6eSY6cyKS_VsoIwaGL8S2p73lc##os*%Sp#fw%0|SE$IE)z>ST-?8 zY+ztuU}ON<#s(H`f`l6nLn8whs1N{YnY=>SED)qbjDeMbfuW6ogQ1;4kfDP?ilLK1 znV|>CA+ik3Xbu61pgN=l;*iPuBBHV&Qy~^lfLIK+w-p++i6YiWK|76sgJC*@1j7sl z4ThOWb}BKnq1g!%L5-|-sEIE{kRxj@0|&!A20@1T3{ngWkW2(c4QiqSi6Hxei=hK* z;zc2?$-SaVND;P#frDWwgCN5)1}TQ+49W~E7<3p`F<3IJMzX<}p%cx`AQ5C6I2pPi z;e;AtYUmNR9ujVl2<wJA%1R75!ZtH-Fl=EEWZ23e#juS*nPCT#Lu46x&>R91L3Kzk z#37RpiXlhX9*D&ZjSL(NeGK3tVDe`%Jw}$vO5#0?*^}3cD~cO3xG`8Vq%-(4bTEW5 LFf#Om%Y+F4s1+eP diff --git a/target/classes/com/application/DB/DB.class b/target/classes/com/application/DB/DB.class index dc3e7ef07457159c4cffad723fd086a463c4bef4..949b39818e8ff94d7dea7a70ca8b4731d1b0d7cc 100644 GIT binary patch delta 4127 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 delta 3940 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 diff --git a/target/classes/com/application/GUI/LineChartFunctionality.class b/target/classes/com/application/GUI/LineChartFunctionality.class index 5a32389b113ac7d683fcb180754a030be228f01d..a0b277d214b91d1ddcbce90c8f0b144e1365c1b8 100644 GIT binary patch delta 2988 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 delta 3095 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 -- GitLab