From 889ae0e1e45a25bfa5ee1a00d9076eaf05f7ff35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20CASIEZ?= Date: Mon, 28 Aug 2017 17:44:39 +0200 Subject: [PATCH] Improved minor things --- src/cpp/paramtuner.cpp | 9 +++++++-- .../deploy/package/windows/ParamTunerGUI.ico | Bin 1406 -> 5694 bytes .../libparamtuner/gui/MainFrame.java | 11 +++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/cpp/paramtuner.cpp b/src/cpp/paramtuner.cpp index 329ddce..16a6cbe 100644 --- a/src/cpp/paramtuner.cpp +++ b/src/cpp/paramtuner.cpp @@ -185,8 +185,13 @@ namespace ParamTuner { someParametersChanged = false; } } - else - cerr << "libParamTuner update() call is useless unless useUpdateFunc parameter in load function is set to true"; + else { + static bool once = true; + if (once) { + cerr << "libParamTuner update() call is useless unless useUpdateFunc parameter in load function is set to true" << std::endl; + once = false; + } + } } } diff --git a/src/gui/src/main/deploy/package/windows/ParamTunerGUI.ico b/src/gui/src/main/deploy/package/windows/ParamTunerGUI.ico index ae761c44b25c8134e9c9cd7dce2afed9887f17c0..b7f38ecc1026d6c2566e78c06147cd7412aab3ba 100644 GIT binary patch literal 5694 zcmeHL-EUgS6+eJ4_RYmM1l!m+HYUc{_yfCm9ZcdFV*CMHyVzcv#m4x~u1gHqfZ?Jh zO+R+EX_Zvjs?l!MN~@^VZdR+6nyONxst;AvN>Lvwow2U<7~g5WJ5+;<(g|<%jgG!Qc4P z+}r{T*9Kf`8|d54!kIP`G@H6W-*FBMMl-Z@_QF}S8M?bV;aqPoG+PFsx#v8vRtKEv zcL8Ug0K89P3Z8gLD%I?ums))%fb%yEbW1H1wn84T{!oxH1uy~!M0U^fv5lj zvG2fO;`2~9~OfP5L#Y_aA*bAR=)|G>k-&`YZG>3Z^Pd1E+Bp%-a$MhzkL9y zt5+d=d<-Y~9FznBu3x(b-@SefzIWpW48403hOgd+;nW=%$@~;Xb05K2;TJGo`UKq9 ze+`p2K7*+rd;wEG{1QAL{1&Ev{Ck-B$sgguhkpX^-9O{cU%>bCzrw{|{tYgD@&qpb z>M6{B`gibu{tpOz@lUw&<-cIzH_svXyMM#d!~ekYAN~vPzxN*e=;lqhed`w7zI_Wm zymJTc-u)ST{P9O{@7_JQfB!x_c<=xoK70s|9zBA`j~~O6Cr{w%)2Hz4*)w?l{5iaM z@d94HdMpO;C|LWLe+w*VK?d z^sokJBtFjNh=Lq9v}k0e(?v3H>a&=cGM_f=LDX4<1D9`4Zf9iE(ulqLjk zlgYicj}VXBGMgz&C!50Jdm=K(bYICg(opDhCCXqdzt_=UC>D#QEawv8JdYBaE%ltm@+2xIN*?VIi~#w2@04g8k=aszy6-ndI-vG|&6bi(CuY*0G4bg4%8lzyAS zS6rb-R=9=)WSiC~X=Pox=j?A71_g_|5gx@2{zm4Pa-HMyQgu3LovG|;eJ#gU!$!mP z!`h=d$fWNuC&uOxXQt_^H2_6T*5eul$4%`mY~Nfu&Dmpe^wfgI5wzXWos|>_1)0b> zLo^z8nRH;@sWKknrc#8{!qk^9WK({Rg``KGbBkho+pAHvFrV0oMtAmbE>YuXv!$z> zVcH!|O@)dDeFdiyP5|nzWi#BwJ*nnamm2zbn z6mw|jRh1$?*W`>>D@fQqc!iWELa`&tpqRZT$%R99FkUSeVsoY9lwGM9(h6wL!PN<} zH0!Ez0YweLQbrrD_I{kHTVf8ip=uADeT9tHq26`0p`WjbP;o%;8Pt+IiZCf5Wif;j zif4#-_Nb^+bmh6~+>9G%N~OF{>!7k`TX )V+Cwn!@O)W>z!|n;`E2S~_!TfjVZx zl%erOJ@-!ejLTbxWNHS*O|9RGy;P*Go@M69N`lQv@Nr{(_9Tt7X0nAS+~iRTLD4!< zF$~38lJyrCM}rChck zxr}CKwDt%-SLGIF$`fj+^me3OC4y+f#2$zY^y$M?^kXeCL!b^+8uC$xGuj!`h!Nm1 zso^|N-FwuEj@d;j)e*mjO%PH|a_CoFh#I^ywX}kw$4GXsEQxl8wMPXj71QPMkhWe1 z3IUz$ePt!&=CY-LLB5?-hWSygSXk9fIM6PVc>>>QpDUHJY>1Fb=J#C9K`OdLMa6mT zcr{UIg~bF49y>`Yg69(xnm3f}!ZJrT-J%>iL@aKSV(5^est=jN+W_uL?oiCDOCC1cIv9Bf{_;tpUP*G7c7j%QhQ9~`te1b zh}M0E8JkpePmT`g4JNUc(MG5gsnLM9%tw_?f>NGIa+RrpmIsFDs;9u@p4Y6}sv0e0 z)~dLcky58%8CSWldcn$27~dEgv?E*$D9kS2{RDlxKyTH*8W5F1`Fs#9Up5-;_KuDf z#S47>ULdmdo?iVr@gL!0L&f9B4UiY|CxZSp#497jP-RV6jl)9n>(~Y(~~svtpfr6FRvH S!Glx7rt$v{yq^7kXW)Nixp|lX literal 1406 zcmeIwX;2eq7zgk_o~TvPD7N*e_fe15TI*3^H-<|^K-4M-CZV>7Ac~4wJc}qI*#t;P zU>OnI1W14&3V3{h0j*=}6e|KkAVJ%iYCGdG!=+g0vpVDWy*e&OyzMFb#B%UEsD?k;5T^m7zKRv+>fx5#KpNpr znDdQrJAWT;LNnZjCNKi^MjIGoGZ>SN`WCpGTB&aVlSeh*P8?tg+Q66}LUzIgX+l0c zsImzK@a0P2&lST@WrZJSrQQmusthbwft6G})#dO|SHO!agSV!fRKSP3h}B#v)({^} z8O^wW097%R2?m5GW+Ebq$FAfogsTNas&f!UB2r9yo}T+`E!gbez@DoEn{yAW`2l$d*77^p z!au+k{Ry^M^a!l=5v10~ke2)fS;=F_F8mGIr6=SmJcuXto? z8eFToj>_vdQT@{`RNwp=H*Vd=FTdWw?b5N+S<_G-j0rr4s>>kI?>hDiSF($(v6-M-FWr#1^(%IiQZQ| z=flRY*L`;LcXYw#zh#Oo&} zh6K&|esO?8E?Jt8u8UtXMj1Bli+vw`x<)=`f!m6CW91(VoO&?j=t-GG8M5h{5c%p= zdv>SNjXQ^hZ64$rs+bioj^Q&Rr;nZ+bahr^PLb;gkBW{6S0kzkY{*0jGP5 Ae*gdg diff --git a/src/gui/src/main/java/fr/univ_lille1/libparamtuner/gui/MainFrame.java b/src/gui/src/main/java/fr/univ_lille1/libparamtuner/gui/MainFrame.java index ea8cd24..a5d3469 100644 --- a/src/gui/src/main/java/fr/univ_lille1/libparamtuner/gui/MainFrame.java +++ b/src/gui/src/main/java/fr/univ_lille1/libparamtuner/gui/MainFrame.java @@ -173,7 +173,7 @@ public void start(Stage primaryStage) throws Exception { Alert alert = new Alert(AlertType.INFORMATION); alert.setTitle("About"); alert.setHeaderText(null); - alert.setContentText("ParamTunerGUI version 1.0\n\nParamTunerGUI is part of libParamTuner\nGet more information on https://github.com/casiez/libparamtuner"); + alert.setContentText("ParamTunerGUI version 1.1\n\nParamTunerGUI is part of libParamTuner\nGet more information on https://github.com/casiez/libparamtuner"); alert.showAndWait(); }); @@ -213,8 +213,7 @@ public void start(Stage primaryStage) throws Exception { saveThread.start(); - if (filepath != "") - loadFile(filepath); + loadFile(filepath); stage.show(); } @@ -260,7 +259,7 @@ private void getCurrentFilename(String filepath) { private boolean confirmSaveBeforeClosingFile() { if (saved) return true; - String ret = FXDialogUtils.showConfirmDialog("Save current file ?", null, "Do you want to save the current file ?", + String ret = FXDialogUtils.showConfirmDialog("Save current file ?", null, "Do you want to save the current file?", "Yes", "No", "Cancel"); if (ret == null || ret.equals("Cancel")) return false; @@ -272,7 +271,7 @@ private boolean confirmSaveBeforeClosingFile() { public void loadFile(String path) { if (path.trim().isEmpty()) { - String value = FXDialogUtils.showConfirmDialog("Error", null, "Path not specified. Do you want to explore ?", "Yes", "No"); + String value = FXDialogUtils.showConfirmDialog("Error", null, "Path not specified. Do you want to open?", "Yes", "No"); if ("Yes".equals(value)) { File f = fileChooser.showOpenDialog(stage); if (f != null) @@ -306,7 +305,7 @@ public void loadFile(String path) { } catch (Exception e) { e.printStackTrace(); clearConfigEntries(); - String value = FXDialogUtils.showConfirmDialog("Unable to load the file", "Path: " + path, e.getMessage()+"\n\nDo you want to explore for an other file ?", "Yes", "No"); + String value = FXDialogUtils.showConfirmDialog("Unable to load the file", "Path: " + path, e.getMessage()+"\n\nDo you want to open another file?", "Yes", "No"); if ("Yes".equals(value)) { File f = fileChooser.showOpenDialog(stage); if (f != null)