From a98a6c26b86d7c1b952e4a04de60a04e15fc5183 Mon Sep 17 00:00:00 2001 From: gdd Date: Wed, 15 Jan 2014 10:00:30 +0000 Subject: [PATCH] =?utf8?q?Filtrage=20des=20types=20de=20fichiers=20dans=20?= =?utf8?q?la=20s=C3=83=C2=A9lection=20Correction=20de=20l'enregistrement?= =?utf8?q?=20d'un=20cas=20avec=20suivi=20de=20fronti=C3=83=C2=A8res=20Exte?= =?utf8?q?nsion=20des=20pr=C3=83=C2=A9f=C3=83=C2=A9rences=20Ascenseur=20po?= =?utf8?q?ur=20la=20d=C3=83=C2=A9finition=20de=20l'hypoth=C3=83=C2=A8se=20?= =?utf8?q?(batiment=20D)=20D=C3=83=C2=A9but=20de=20choix=20d'options=20pou?= =?utf8?q?r=20YACS?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- doc/en/gui_usage.rst | 8 + doc/en/images/preferences_1.png | Bin 0 -> 2787 bytes doc/en/preferences.rst | 26 + doc/en/tui_usage.rst | 14 + doc/fr/gui_usage.rst | 10 + doc/fr/images/preferences_1.png | Bin 0 -> 3332 bytes doc/fr/preferences.rst | 30 + doc/fr/tui_usage.rst | 14 + idl/HOMARD_Gen.idl | 9 +- src/HOMARDGUI/CreateCase.h | 166 +-- src/HOMARDGUI/CreateCase.ui | 108 +- src/HOMARDGUI/CreateHypothesis.h | 328 +++-- src/HOMARDGUI/CreateHypothesis.ui | 1852 +++++++++++++------------ src/HOMARDGUI/CreateIteration.h | 273 ++-- src/HOMARDGUI/CreateIteration.ui | 1039 ++++++++------ src/HOMARDGUI/CreateYACS.h | 216 ++- src/HOMARDGUI/CreateYACS.ui | 685 ++++++--- src/HOMARDGUI/CreateZone.h | 744 +++++----- src/HOMARDGUI/CreateZone.ui | 1228 ++++++++-------- src/HOMARDGUI/HOMARDGUI.cxx | 174 ++- src/HOMARDGUI/HOMARDGUI.h | 8 +- src/HOMARDGUI/HOMARDGUI_Utils.cxx | 27 +- src/HOMARDGUI/HOMARD_msg_en.ts | 64 +- src/HOMARDGUI/HOMARD_msg_fr.ts | 84 +- src/HOMARDGUI/HOMARD_msg_ja.ts | 6 +- src/HOMARDGUI/HomardQtCommun.cxx | 57 +- src/HOMARDGUI/HomardQtCommun.h | 2 +- src/HOMARDGUI/MonCreateBoundaryAn.cxx | 17 +- src/HOMARDGUI/MonCreateBoundaryDi.cxx | 8 +- src/HOMARDGUI/MonCreateCase.cxx | 24 +- src/HOMARDGUI/MonCreateHypothesis.cxx | 37 +- src/HOMARDGUI/MonCreateHypothesis.h | 4 +- src/HOMARDGUI/MonCreateIteration.cxx | 29 +- src/HOMARDGUI/MonCreateIteration.h | 7 +- src/HOMARDGUI/MonCreateYACS.cxx | 77 +- src/HOMARDGUI/MonCreateYACS.h | 7 +- src/HOMARDGUI/MonCreateZone.cxx | 6 +- src/HOMARDGUI/MonEditBoundaryAn.cxx | 14 +- src/HOMARDGUI/MonEditBoundaryDi.cxx | 2 +- src/HOMARDGUI/MonEditHypothesis.cxx | 124 +- src/HOMARDGUI/MonEditIteration.cxx | 16 +- src/HOMARDGUI/MonEditYACS.cxx | 1 - src/HOMARDGUI/MonMeshInfo.cxx | 8 +- src/HOMARDGUI/MonPursueIteration.cxx | 16 +- src/HOMARDGUI/PursueIteration.h | 12 +- src/HOMARDGUI/PursueIteration.ui | 2 +- src/HOMARD_I/HOMARD_Boundary_i.cxx | 3 +- src/HOMARD_I/HOMARD_Gen_i.cxx | 333 ++++- src/HOMARD_I/HOMARD_Gen_i.hxx | 19 +- 49 files changed, 4674 insertions(+), 3264 deletions(-) create mode 100644 doc/en/images/preferences_1.png create mode 100644 doc/en/preferences.rst create mode 100644 doc/fr/images/preferences_1.png create mode 100644 doc/fr/preferences.rst diff --git a/doc/en/gui_usage.rst b/doc/en/gui_usage.rst index 6b1853bc..b8accc91 100644 --- a/doc/en/gui_usage.rst +++ b/doc/en/gui_usage.rst @@ -50,4 +50,12 @@ An automatic creation of a schema YACS is available in the module HOMARD. gui_create_yacs_aster +Preferences +*********** +Some default options for the module HOMARD are defined into the preferences. + +.. toctree:: + :maxdepth: 2 + + preferences diff --git a/doc/en/images/preferences_1.png b/doc/en/images/preferences_1.png new file mode 100644 index 0000000000000000000000000000000000000000..37022f8fa311a3a04c18edce1c839f66a3bea99c GIT binary patch literal 2787 zcma)8c|6ox8$VJ}H_L62hHiCxQ3i#K7(=q<+R8S~xD6UiuRZ&<4HZJ9gqVzkqOp%L zGEIt0Nn?nyjU`j|W+vN+Ebs5$_s{q9zMuE}an5tj=bYy(&-eL$Px3`u3#r|(-2eb7 z%L}IV0BlQvY)i>)P_46^F%321!RIXSy z9*ht2^z;wD77!v7Z!!d6cbKKAv17y|{)nr!BYNB0d8D?^@v_7m1pkix#ktdN>I<&> zTi=A}-m&9^^xRS&7*f7*ZBAdiUTmlPxzcroF5MA2$AkNP#IQ?Z%S?A&Gyaf5Mf$y4 z%AYQhcxo~`WfKRJ7*WWM)7l5Wu$5ws?54<3ow?d}O~X+F6nf(D0(75qmc3ReF#t{< zp5FuFc(QB&PIST-NC+K-`mllAkY-0s2^qR&P??7ztgm;VE_@7^d((fco>@dSv7LDG zB4mE=E-7$X!{Z7{R|jz**70F>p0Z?f$^rPEohBGeu4cP@p_R3@b;J9*-ZME|C1T1O zK7ot2|9;8c0l)9BrE*W+20P$;;_YN^PyCP(7!fzuNyO;SfoC;vjq-*4@3Y`7PNT#? zVm!u7`-_SW(+6pl9yTl3hNa_Y*< zB@s730&NTb=|;6Z<73R*{G1%LgTuZ^XEjGBC%;(2qBvVzn1P1RgKQgC*Kp4hFv%=u}v(8>*VA#5qP#vThB|+{Jc2WFStwMHtL36 za+wQVI{$#j$m^4Wz zC!oE`rBs$Q187+O$`2hFYhYj?)oyOOyJ&fN8Mzo{Yi%u$fK8sh5g}F4eeLPfr_HpV z(T|HZF#yPAYIaZmG5vE#t-t@>zl&9Z+x39fjc@ED(T1)rJ}!YB+JsJnn6a3nvB@Y3g_4<9fu%jKstUl4eJHn{SFxq%cXoD4=a1i^ z9zJqpYUVVETWC+2>i(--DwF--MRh`>16ZRl$?Z2>($msCy*x(O`qfD+LKg zQh+3l4ZhTH&%cbPVNzw}NMX6Sm}RFjO!wxm!SNX1<4&>595nP=1TPQK(vsrVLd5hQ z!Xtie58<5`wA)6Fda}UgO2ZE(FN&RdmXZ*(DV$0sfHY3tBlB^3nPR}r z--8dE3}W8T6hG{pTk@i=4v%%(P$U2te}|1q&tR!$sd}#z#IChZ z1Tnukih&5syOb%(K{XY!x}24tjo+=Ek@=%DA+UXECxuVz=yY9OU6n(b_6`nJu1y*U z`Cop~P*v6PJ@d75j335meJ>J)^=LSpk3R40)t9h%u(%tG#okG7TdG^~>91rJA_1`S z51UuaV+HY6Z#G4LT3oHfF=2(QKNojF_>ZcsFK+nLXht~0zkXIROZ3~kubEjZ85Jei zh^{Js`Qd8K?W}BkcH>&3Ma*3dBJo8(2QH`!O^y@SSk38hwx7QrY( zL4)L^%2^AYGs(%k*-vJgjKa~Cz5N{57m=R)JeoE_uvOwp;jC?JHqfry>m4(6cMCix zd&{Ps6m3{AaJj-+#_*T@+Y1|?Hx?BgS665GB7_4kj)##_9^bSf;s#39VJnVGLV4Kmb>&AZHU8Xdeppn}%h6+1@|8D^4#4>Y zcK%4UyNLq+qeDJIe}=H zDHN)oI3Wvns4w0xCkI2o%AI{2f_s`nC4k$#c5IZ$V97Ls?%g)w0SN<~ii?VU^A{{% zmzxgiSP$DpwZ*&v;PtlTS7j=?m0}QEL|@$dzw!DXfKGnpa~VxQf7!`vD*(Xlm1#0z zKGo@x1tv^^I2*d=sY?K_JC3h$s7EC==N^{KV&kW(K;QF%?J9qMUy!6fG(*27) zPc9iiKrTF<@fgJAWR^#eTO^bMMqgsWYb$BAP^;N&WVj%De)V7#Q-sCga18|+_aDw- z0q{V<;M~ES6dp4;^YB%nROn z6Jsp9q`!d|;x+rl<6pxz^14c<4^2JqpZP(Y>G!6^HW~T*J#w_YZ6`0UD7)R=VL`co zt%7i-aBkj}*kN2+`CKqPeZk5~o5Vtf2_z4zZdOFpl&lK?_<+Pe>0bQSlv5j2MQ-t= zVo{5d=0!COii`f&*;y@E+SS$Ne%CF2d%)Gz_Dq$4m-C71Wj-{lvFsU`P2iw#C6yo^ zAIIg3r2k-=;52{VVO)(KVv~^!_m;%Ow#1JnC50w7Ha36L$WIo|1{Uuo19j;#NA!Nj z;YPc==f4h8A)!cFNNKTUXiX z|J8Y@9I;j0bd7kA*&O@1EiGXVid=MV>rimR6rJ$(s#dO=b1KWr%J#Qu4P@#)ig<)hn!=u?6iVt}!6{N>zQrIPCEuIg?#8kUqt zlB5d8LaT&u>|Ow3M|cRO)Jm4 G-S`)*{$2(E literal 0 HcmV?d00001 diff --git a/doc/en/preferences.rst b/doc/en/preferences.rst new file mode 100644 index 00000000..9d87a118 --- /dev/null +++ b/doc/en/preferences.rst @@ -0,0 +1,26 @@ +.. _preferences: + +The preferences +############### +.. index:: single: preferences + +Some default options for the module HOMARD are defined into the preferences. + + +The language +************ +The language that is selected into the general preferences of SALOME is used for the menus of the GUI. + +If french is selected, the messages that are produced by HOMARD are in french. Otherwise, english is used. + +Publication of the meshes +************************* +.. index:: single: publication + +.. image:: images/preferences_1.png + :align: center + +By default, the meshes that are read during the creation of the case or that are produced after an adaptation are not published into SMESH. This choice can be modified here. + + + diff --git a/doc/en/tui_usage.rst b/doc/en/tui_usage.rst index 0d8c271e..2b8b1965 100644 --- a/doc/en/tui_usage.rst +++ b/doc/en/tui_usage.rst @@ -1,5 +1,9 @@ User's guide of the TUI ####################### + +User's guide +************ + The functionnalities of the module HOMARD are available by python instructions. We shall find here the description of each of the functions. .. toctree:: @@ -12,3 +16,13 @@ The functionnalities of the module HOMARD are available by python instructions. tui_create_boundary tui_homard tui_create_yacs + +Preferences +*********** + +Some default options for the module HOMARD are defined into the preferences. + +.. toctree:: + :maxdepth: 2 + + preferences diff --git a/doc/fr/gui_usage.rst b/doc/fr/gui_usage.rst index 66001c43..0f53da57 100644 --- a/doc/fr/gui_usage.rst +++ b/doc/fr/gui_usage.rst @@ -49,3 +49,13 @@ Le module HOMARD propose la cr gui_create_yacs gui_create_yacs_aster + +Préférences +*********** + +Un certain nombre de choix par défaut pour le module HOMARD sont définis dans les préférences. + +.. toctree:: + :maxdepth: 2 + + preferences diff --git a/doc/fr/images/preferences_1.png b/doc/fr/images/preferences_1.png new file mode 100644 index 0000000000000000000000000000000000000000..84e9fcced42a82534daed4f2e789aacc652213fb GIT binary patch literal 3332 zcma)8c{r5c+kd1oDJo?dOMFX2Su!Hq$X1jkLY6FH$T}GN)Q}~m5F`62F@z>EwqYz~ zOVL;x491>i2AK$1-pBWMz3-pz`<_3ZbME_G_kG>xJoo4GInQnz-{9gDZc&b%K4&GQ1}AQwI_~GJHiI8^M>=lk3I=| z-mo61Y81igkcLJxWRP1TJ^J+ZO}>8rg;CHybyu$2tmHHF_9YiwkF+#Qo=saWPB{B& zgy$F1pvvNza)VSW7xq2+z+%?VN9)$I4<+iBeGYg{Dec$ZqFdg72%MW9KA?cpTUP2y z_i*NLYl-tm5owi*{_~&{!Yj5ihVnM@Hugzq%D2@V93JhHaaoNg`R*Q2RRn;IqgwPF zPfrgPoN~)hUmW5zP;9{&^Oj7$2POP26PK6o9(8fjej8H`kxLS4?5=!Irm#FbJ$iE4 zfF`*RB&G67C3=17e%tXg@Q`1Vt%=^6nT7={{_kk3%CI$$U@Yjjdhp6iN%TkgI%717 zn+pIiTHQa&nwqZ7K1Vt_j?<8hxIdv|-Q6c(&{HC(HZ&ROVowVS3a0a?De%7xiss(5 z?9V4gJ8s2q-iX0vG4{!W>4S;8>!uD4qAZh0F{iiA=>kft^L>R5jNP*;Dx2Tr8nUyq zU8uV&6w!XE1qOpbt44CvUfuW;g?Ypw0sxi}EvB^uw!=liRV+zgHoNh}$&;UO*~$_S zr%JCYfoa1HkI)DNezCB#$x+@b6#1?Bacq^JP*#hQj}TPE{ehRf;EPVpBavnCv~+=` z;nRVfdZq>)1`>JCx)=efGAXT&^67>W(APTWW4pm?x;AZZH+64c%+6tEF16$o78bT3v_J|js#C2ycDQ+bT+FD?tf*gScZ^mqX`Br? zazrI$#j#lR6>e`!)Zv?p0>RR@rm=g}ra*_<-yZ@88zDm3Ydg`;b%k&Fz1jyF`8?0F z=82a#@h}*y)WOov&o3}AuxKHFJr{2_KQfYCCos!hLB)dcA=nhtua9rA zcUpC~GKcnubx>2~1ddD7Zr9!4zr5(l$R^y^`sXY2dd&mzGTcpEy{}*>2?SNf|W{)YNiV}+!`HS9ZNNu$V$)XE${uj z6JwoWt)->qWwpEXkZ}E5OBt4q`Rl#RvJJ^RvIpDt+`{TBVR$wm zLg0u8!l8mpy67lUayYxeORnnTaD z(*=!2Te@0qw5^=B_(~%FymvRrzdScr3yOb%*8EUkU;p8QtPK?R@}=+2R-lie05rAO zn8{$cxT%{@3TmpWzu&Yv^~)!E$jg3h2ku??rYVGQRM)!6wn@Ow5$vm#*)3*&Q z0tc|4B>Cm+7}dX7viT0(d|#b*zuz;rnhu$tTU>@^81im$DmDF!*COOQsz}d~qLwT6 zrG0J)glVwUv*`iRmg>krRXbPLS+Y5!I&>`ipcXmbVcm8sQ7~a)Elg=l$;X)=j@ho6 zN=vv*ORp1OQeX!nG*?%nk~@Etq5mwC7Q5Kk*s_$pgX+^6VT+1N5<&j{$c5-@aSz<)d4<;n0V0D^x6f!y|e7&q1AB)5ykBLG>{(-zLA%1g|KgP}7 zt0?p8W`+S(P?rt|qj#OTXVLtK@t6+8e#(2(DTd-0&mSJON%&jg6 z;o@3*86C_6cI=nP@Y}sQ$XU#d-<|UTW~VEIMs1ez8?=#?HforqtM(`|fj}VPhXQjA zCC)*#rC<5CbH_$)R@Btg)YhsxqYoSPk+b?|Po7yueLC9Jp;1aAsf@*VA%oId>|6n0 z!aRn3 zzdt&+KTNn=WKN)04>Q;ANSf5Uep)bJo4-@Y3_{Z1aTjlli14Tgz30b(ToSezYq6;AL5K7i24oW9j zo@U7C(^DHQp|=l?qR)gVj!z5~uialvYmYKiG4uGM;_-mMY6 zG{ljgopKW&cR|nDdCH6m>hMKe+IlD1#P&<-#qer%*?mD?9p9nBw)nu6&=b)V5N0Pt zD%`-09xXITegAJ`8Oc?*&l3P^(gcj&C<$?=bjn$VcAXvO4^RGYf?xvxKHY9POX~~I zV?_y*JD**+tfSHX!x97IR1k$v2iGDIu}S zV(})$i43V-h;x#l(P%^k;%DV2h40M1<1~KO#-(7nxVXMvK#ctLV=|ebg7kcyi;j+7 zq?V$bKYuAR5A<+zlT@3^<)Lm&Ox*8k&wLtuuG1A(_oF(JU|C|BhcF9;2g{CCS_Fl+yJ`Ng#h9pl*NX|f?+I~{S$--cF^rgX~W@ctOid~K(4D=1hbB3qd z6V)*D0>t>s4r$&~RiX5(`ZL@Bpeq}(^V+V#7{1%SK~Bsd-2bygM^Urb4;)ZJ4l}~6 z2iD*ZybKxB)8epHeepc!yn|W-Ty0BBOCX;TEVFWwmTW|&Bx9e%x+r8cPYjk}*wwh{ z0&oRY?Gw6p-O@fe3J445yW2>=Qow#t`#i{oBrDtu{aLM+o106?(YSM6Dnp;n$(IxN zTv;Z|!^1<`0=MNm{txObd*Wej9UZ&9?~K942~a_z|3|!k$RDrI_$$%_E9^5c?H>;G zBw@EW>jylT8>Fd_u3uGERkNwC)EI?~7h;ei^RFUm!rZfclarGR3kxrpP(>q_k6G4@ z5HjV^QNtOOO_lQBhgZR-CB=AiO^u$DSkVU`1`=3zC#TP@L|$Ir%UA>+k&u?KJ-Qi& z+ii;%f@e2%b{hKX%NzBzCy20A?D1xm7`jI_%><{umU*b;&Oo6Fu8PK#k&(%{VvA#aETA80%;rQ## zEiJ9>;185K%Ztb3D+4Rx+1FZo;v(x0&C`0R@2#g$SSIuF8! z)s)9}oMK5hZriASW7cRjmdAn0o5*I?u`aJ*!|qY;9KSYHoouG xr|LrS_li})6cM};X^~*or(Ci=`#HXcvwd1bKN?yKF$Q-513hEi5895A{{>z{P}Beb literal 0 HcmV?d00001 diff --git a/doc/fr/preferences.rst b/doc/fr/preferences.rst new file mode 100644 index 00000000..78d49e2a --- /dev/null +++ b/doc/fr/preferences.rst @@ -0,0 +1,30 @@ +.. _preferences: + +Les préférences +############### +.. index:: single: préférences + +Un certain nombre de choix par défaut pour le module HOMARD sont définis dans les préférences. + + +La langue +********* +La langue choisie dans les préférences générales de SALOME est celle qui est utilisée dans les menus de l'interface graphique. + +Si le français est retenu, les messages émis par HOMARD le sont en français. Dans tous les autres cas, ils sont en anglais. + +Publication des maillages +************************* +.. index:: single: publication + +.. image:: images/preferences_1.png + :align: center + +Par défaut, les maillages lus à la création d'un cas ou produits après une adaptation ne sont pas publiés dans SMESH. Ce choix est modifiable en cochant cette préférence. + + + + + + + diff --git a/doc/fr/tui_usage.rst b/doc/fr/tui_usage.rst index 6ff6f751..befdd63b 100644 --- a/doc/fr/tui_usage.rst +++ b/doc/fr/tui_usage.rst @@ -1,5 +1,9 @@ Mode d'emploi pour TUI ###################### + +Mode d'emploi de la saisie des données +************************************** + Le module HOMARD peut se lancer à partir d'instructions python. On trouvera ici la description de chacune des fonctions accessibles par l'utilisateur. .. toctree:: @@ -12,3 +16,13 @@ Le module HOMARD peut se lancer tui_create_boundary tui_homard tui_create_yacs + +Préférences +*********** + +Un certain nombre de choix par défaut pour le module HOMARD sont définis dans les préférences. + +.. toctree:: + :maxdepth: 2 + + preferences diff --git a/idl/HOMARD_Gen.idl b/idl/HOMARD_Gen.idl index 1c134945..827d53fe 100644 --- a/idl/HOMARD_Gen.idl +++ b/idl/HOMARD_Gen.idl @@ -181,7 +181,7 @@ module HOMARD string CreateDirNameIter(in string NomDir, in long option ) raises(SALOME::SALOME_Exception); - string VerifieDir (in string NomDir) raises (SALOME::SALOME_Exception); + string VerifieDir (in string NomDir) raises (SALOME::SALOME_Exception); // void PublishFileUnderIteration(in string IterName, in string FileName, in string Comment) @@ -190,6 +190,9 @@ module HOMARD raises(SALOME::SALOME_Exception); void PublishResultInSmesh(in string FileName, in long Option) raises(SALOME::SALOME_Exception); + void PublishMeshIterInSmesh (in string IterName) raises(SALOME::SALOME_Exception); + +// // HOMARD_YACS CreateYACSSchema(in string YACSName, in string CaseName, in string ScriptFile, in string DirName, in string MeshFile) @@ -201,6 +204,10 @@ module HOMARD // void SetLanguageShort (in string LanguageShort) raises (SALOME::SALOME_Exception); string GetLanguageShort () raises (SALOME::SALOME_Exception); + void SetPublisMesh (in long PublisMeshIN, in long PublisMeshOUT) + raises (SALOME::SALOME_Exception); + long GetPublisMeshIN () raises (SALOME::SALOME_Exception); + long GetPublisMeshOUT () raises (SALOME::SALOME_Exception); }; }; diff --git a/src/HOMARDGUI/CreateCase.h b/src/HOMARDGUI/CreateCase.h index c5c6c4c0..73adbb0c 100644 --- a/src/HOMARDGUI/CreateCase.h +++ b/src/HOMARDGUI/CreateCase.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CreateCase.ui' ** -** Created: Tue Sep 17 14:09:06 2013 +** Created: Wed Jan 15 08:42:35 2014 ** by: Qt User Interface Compiler version 4.6.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -28,38 +28,41 @@ #include #include #include +#include QT_BEGIN_NAMESPACE class Ui_CreateCase { public: + QGridLayout *gridLayout_3; + QWidget *WName; QGridLayout *gridLayout_2; - QHBoxLayout *hboxLayout; QLabel *Name; QLineEdit *LEName; - QHBoxLayout *hboxLayout1; + QSpacerItem *horizontalSpacer; + QHBoxLayout *hboxLayout; QLabel *Directory; QPushButton *PushDir; QLineEdit *LEDirName; QSpacerItem *spacerItem; - QHBoxLayout *hboxLayout2; + QHBoxLayout *hboxLayout1; QLabel *Mesh; QPushButton *PushFichier; QLineEdit *LEFileName; QSpacerItem *spacerItem1; QGroupBox *GBTypeConf; - QHBoxLayout *hboxLayout3; + QHBoxLayout *hboxLayout2; QRadioButton *RBConforme; QRadioButton *RBNonConforme; QSpacerItem *spacerItem2; QGroupBox *GBTypeNoConf; - QHBoxLayout *hboxLayout4; + QHBoxLayout *hboxLayout3; QRadioButton *RB1NpM; QRadioButton *RB1NpA; QRadioButton *RBQuelconque; QSpacerItem *spacerItem3; - QHBoxLayout *hboxLayout5; + QHBoxLayout *hboxLayout4; QCheckBox *CBBoundaryD; QCheckBox *CBBoundaryA; QSpacerItem *spacerItem4; @@ -99,183 +102,188 @@ public: if (CreateCase->objectName().isEmpty()) CreateCase->setObjectName(QString::fromUtf8("CreateCase")); CreateCase->resize(601, 1100); - QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(CreateCase->sizePolicy().hasHeightForWidth()); CreateCase->setSizePolicy(sizePolicy); + CreateCase->setMinimumSize(QSize(600, 320)); + CreateCase->setSizeIncrement(QSize(1, 1)); + CreateCase->setBaseSize(QSize(600, 320)); CreateCase->setAutoFillBackground(true); - gridLayout_2 = new QGridLayout(CreateCase); + gridLayout_3 = new QGridLayout(CreateCase); + gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); + WName = new QWidget(CreateCase); + WName->setObjectName(QString::fromUtf8("WName")); + gridLayout_2 = new QGridLayout(WName); gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); - hboxLayout = new QHBoxLayout(); -#ifndef Q_OS_MAC - hboxLayout->setSpacing(6); -#endif -#ifndef Q_OS_MAC - hboxLayout->setContentsMargins(0, 0, 0, 0); -#endif - hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); - Name = new QLabel(CreateCase); + Name = new QLabel(WName); Name->setObjectName(QString::fromUtf8("Name")); - hboxLayout->addWidget(Name); + gridLayout_2->addWidget(Name, 0, 0, 1, 1); - LEName = new QLineEdit(CreateCase); + LEName = new QLineEdit(WName); LEName->setObjectName(QString::fromUtf8("LEName")); - LEName->setMinimumSize(QSize(382, 21)); - hboxLayout->addWidget(LEName); + gridLayout_2->addWidget(LEName, 0, 1, 1, 1); - gridLayout_2->addLayout(hboxLayout, 0, 0, 1, 3); + gridLayout_3->addWidget(WName, 0, 0, 1, 1); - hboxLayout1 = new QHBoxLayout(); + horizontalSpacer = new QSpacerItem(199, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_3->addItem(horizontalSpacer, 0, 1, 1, 1); + + hboxLayout = new QHBoxLayout(); #ifndef Q_OS_MAC - hboxLayout1->setSpacing(6); + hboxLayout->setSpacing(6); #endif - hboxLayout1->setContentsMargins(0, 0, 0, 0); - hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); + hboxLayout->setContentsMargins(0, 0, 0, 0); + hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); Directory = new QLabel(CreateCase); Directory->setObjectName(QString::fromUtf8("Directory")); - hboxLayout1->addWidget(Directory); + hboxLayout->addWidget(Directory); PushDir = new QPushButton(CreateCase); PushDir->setObjectName(QString::fromUtf8("PushDir")); PushDir->setAutoDefault(false); - hboxLayout1->addWidget(PushDir); + hboxLayout->addWidget(PushDir); LEDirName = new QLineEdit(CreateCase); LEDirName->setObjectName(QString::fromUtf8("LEDirName")); LEDirName->setMinimumSize(QSize(382, 21)); - hboxLayout1->addWidget(LEDirName); + hboxLayout->addWidget(LEDirName); - gridLayout_2->addLayout(hboxLayout1, 1, 0, 1, 4); + gridLayout_3->addLayout(hboxLayout, 1, 0, 1, 6); spacerItem = new QSpacerItem(20, 18, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(spacerItem, 2, 1, 1, 1); + gridLayout_3->addItem(spacerItem, 2, 2, 1, 2); - hboxLayout2 = new QHBoxLayout(); + hboxLayout1 = new QHBoxLayout(); #ifndef Q_OS_MAC - hboxLayout2->setSpacing(6); + hboxLayout1->setSpacing(6); #endif - hboxLayout2->setContentsMargins(0, 0, 0, 0); - hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2")); + hboxLayout1->setContentsMargins(0, 0, 0, 0); + hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); Mesh = new QLabel(CreateCase); Mesh->setObjectName(QString::fromUtf8("Mesh")); - hboxLayout2->addWidget(Mesh); + hboxLayout1->addWidget(Mesh); PushFichier = new QPushButton(CreateCase); PushFichier->setObjectName(QString::fromUtf8("PushFichier")); PushFichier->setAutoDefault(false); - hboxLayout2->addWidget(PushFichier); + hboxLayout1->addWidget(PushFichier); LEFileName = new QLineEdit(CreateCase); LEFileName->setObjectName(QString::fromUtf8("LEFileName")); LEFileName->setMinimumSize(QSize(382, 21)); - hboxLayout2->addWidget(LEFileName); + hboxLayout1->addWidget(LEFileName); - gridLayout_2->addLayout(hboxLayout2, 3, 0, 1, 4); + gridLayout_3->addLayout(hboxLayout1, 3, 0, 2, 6); spacerItem1 = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(spacerItem1, 4, 1, 1, 3); + gridLayout_3->addItem(spacerItem1, 4, 3, 1, 3); GBTypeConf = new QGroupBox(CreateCase); GBTypeConf->setObjectName(QString::fromUtf8("GBTypeConf")); - hboxLayout3 = new QHBoxLayout(GBTypeConf); + hboxLayout2 = new QHBoxLayout(GBTypeConf); #ifndef Q_OS_MAC - hboxLayout3->setSpacing(6); + hboxLayout2->setSpacing(6); #endif #ifndef Q_OS_MAC - hboxLayout3->setContentsMargins(9, 9, 9, 9); + hboxLayout2->setContentsMargins(9, 9, 9, 9); #endif - hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3")); + hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2")); RBConforme = new QRadioButton(GBTypeConf); RBConforme->setObjectName(QString::fromUtf8("RBConforme")); RBConforme->setChecked(true); - hboxLayout3->addWidget(RBConforme); + hboxLayout2->addWidget(RBConforme); RBNonConforme = new QRadioButton(GBTypeConf); RBNonConforme->setObjectName(QString::fromUtf8("RBNonConforme")); - hboxLayout3->addWidget(RBNonConforme); + hboxLayout2->addWidget(RBNonConforme); - gridLayout_2->addWidget(GBTypeConf, 5, 0, 1, 1); + gridLayout_3->addWidget(GBTypeConf, 5, 0, 1, 2); spacerItem2 = new QSpacerItem(20, 1, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(spacerItem2, 6, 1, 1, 1); + gridLayout_3->addItem(spacerItem2, 6, 3, 1, 1); GBTypeNoConf = new QGroupBox(CreateCase); GBTypeNoConf->setObjectName(QString::fromUtf8("GBTypeNoConf")); - hboxLayout4 = new QHBoxLayout(GBTypeNoConf); + hboxLayout3 = new QHBoxLayout(GBTypeNoConf); #ifndef Q_OS_MAC - hboxLayout4->setSpacing(6); + hboxLayout3->setSpacing(6); #endif #ifndef Q_OS_MAC - hboxLayout4->setContentsMargins(9, 9, 9, 9); + hboxLayout3->setContentsMargins(9, 9, 9, 9); #endif - hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4")); + hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3")); RB1NpM = new QRadioButton(GBTypeNoConf); RB1NpM->setObjectName(QString::fromUtf8("RB1NpM")); - hboxLayout4->addWidget(RB1NpM); + hboxLayout3->addWidget(RB1NpM); RB1NpA = new QRadioButton(GBTypeNoConf); RB1NpA->setObjectName(QString::fromUtf8("RB1NpA")); - hboxLayout4->addWidget(RB1NpA); + hboxLayout3->addWidget(RB1NpA); RBQuelconque = new QRadioButton(GBTypeNoConf); RBQuelconque->setObjectName(QString::fromUtf8("RBQuelconque")); - hboxLayout4->addWidget(RBQuelconque); + hboxLayout3->addWidget(RBQuelconque); - gridLayout_2->addWidget(GBTypeNoConf, 7, 0, 1, 3); + gridLayout_3->addWidget(GBTypeNoConf, 7, 0, 1, 6); spacerItem3 = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(spacerItem3, 8, 1, 1, 3); + gridLayout_3->addItem(spacerItem3, 8, 3, 1, 3); - hboxLayout5 = new QHBoxLayout(); + hboxLayout4 = new QHBoxLayout(); #ifndef Q_OS_MAC - hboxLayout5->setSpacing(6); + hboxLayout4->setSpacing(6); #endif - hboxLayout5->setContentsMargins(0, 0, 0, 0); - hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5")); + hboxLayout4->setContentsMargins(0, 0, 0, 0); + hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4")); CBBoundaryD = new QCheckBox(CreateCase); CBBoundaryD->setObjectName(QString::fromUtf8("CBBoundaryD")); - hboxLayout5->addWidget(CBBoundaryD); + hboxLayout4->addWidget(CBBoundaryD); CBBoundaryA = new QCheckBox(CreateCase); CBBoundaryA->setObjectName(QString::fromUtf8("CBBoundaryA")); - hboxLayout5->addWidget(CBBoundaryA); + hboxLayout4->addWidget(CBBoundaryA); - gridLayout_2->addLayout(hboxLayout5, 9, 0, 1, 2); + gridLayout_3->addLayout(hboxLayout4, 9, 0, 1, 4); spacerItem4 = new QSpacerItem(20, 2, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(spacerItem4, 10, 1, 1, 1); + gridLayout_3->addItem(spacerItem4, 10, 3, 1, 1); GBBoundaryD = new QGroupBox(CreateCase); GBBoundaryD->setObjectName(QString::fromUtf8("GBBoundaryD")); - sizePolicy.setHeightForWidth(GBBoundaryD->sizePolicy().hasHeightForWidth()); - GBBoundaryD->setSizePolicy(sizePolicy); + QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(GBBoundaryD->sizePolicy().hasHeightForWidth()); + GBBoundaryD->setSizePolicy(sizePolicy1); gridLayout = new QGridLayout(GBBoundaryD); #ifndef Q_OS_MAC gridLayout->setSpacing(6); @@ -313,7 +321,7 @@ public: gridLayout->addWidget(PBBoundaryDiHelp, 0, 4, 1, 1); - gridLayout_2->addWidget(GBBoundaryD, 11, 0, 1, 3); + gridLayout_3->addWidget(GBBoundaryD, 11, 0, 1, 6); GBBoundaryA = new QGroupBox(CreateCase); GBBoundaryA->setObjectName(QString::fromUtf8("GBBoundaryA")); @@ -361,16 +369,16 @@ public: formLayout->setLayout(0, QFormLayout::FieldRole, gridLayout1); - gridLayout_2->addWidget(GBBoundaryA, 12, 0, 1, 4); + gridLayout_3->addWidget(GBBoundaryA, 12, 0, 1, 6); spacer = new QSpacerItem(239, 41, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(spacer, 13, 0, 1, 1); + gridLayout_3->addItem(spacer, 13, 0, 1, 2); CBAdvanced = new QCheckBox(CreateCase); CBAdvanced->setObjectName(QString::fromUtf8("CBAdvanced")); - gridLayout_2->addWidget(CBAdvanced, 14, 0, 1, 1); + gridLayout_3->addWidget(CBAdvanced, 14, 0, 1, 1); GBAdvancedOptions = new QGroupBox(CreateCase); GBAdvancedOptions->setObjectName(QString::fromUtf8("GBAdvancedOptions")); @@ -382,24 +390,24 @@ public: gridLayout2->addWidget(CBPyramid, 0, 0, 1, 1); - gridLayout_2->addWidget(GBAdvancedOptions, 15, 0, 1, 1); + gridLayout_3->addWidget(GBAdvancedOptions, 15, 0, 1, 1); spacer_3 = new QSpacerItem(128, 13, QSizePolicy::Fixed, QSizePolicy::Minimum); - gridLayout_2->addItem(spacer_3, 15, 2, 1, 2); + gridLayout_3->addItem(spacer_3, 15, 4, 1, 2); spacer_4 = new QSpacerItem(239, 41, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(spacer_4, 16, 0, 1, 1); + gridLayout_3->addItem(spacer_4, 16, 0, 1, 2); Comment = new QLabel(CreateCase); Comment->setObjectName(QString::fromUtf8("Comment")); - gridLayout_2->addWidget(Comment, 17, 0, 1, 3); + gridLayout_3->addWidget(Comment, 17, 0, 1, 1); verticalSpacer = new QSpacerItem(20, 35, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(verticalSpacer, 18, 0, 1, 1); + gridLayout_3->addItem(verticalSpacer, 18, 0, 1, 1); GroupButtons = new QGroupBox(CreateCase); GroupButtons->setObjectName(QString::fromUtf8("GroupButtons")); @@ -436,11 +444,11 @@ public: gridLayout3->addWidget(buttonCancel, 0, 2, 1, 1); - gridLayout_2->addWidget(GroupButtons, 19, 0, 1, 3); + gridLayout_3->addWidget(GroupButtons, 19, 0, 1, 5); spacer_2 = new QSpacerItem(128, 25, QSizePolicy::Fixed, QSizePolicy::Minimum); - gridLayout_2->addItem(spacer_2, 19, 3, 1, 1); + gridLayout_3->addItem(spacer_2, 19, 5, 1, 1); retranslateUi(CreateCase); diff --git a/src/HOMARDGUI/CreateCase.ui b/src/HOMARDGUI/CreateCase.ui index 2c140a72..d57d1c1d 100644 --- a/src/HOMARDGUI/CreateCase.ui +++ b/src/HOMARDGUI/CreateCase.ui @@ -11,46 +11,66 @@ - + 0 0 + + + 600 + 320 + + + + + 1 + 1 + + + + + 600 + 320 + + Create a case true - - - - - 6 + + + + + + + + Name + + + + + + + + + + + + + Qt::Horizontal - - 0 + + + 199 + 20 + - - - - Name - - - - - - - - 382 - 21 - - - - - + - + 6 @@ -87,7 +107,7 @@ - + Qt::Vertical @@ -100,7 +120,7 @@ - + 6 @@ -137,7 +157,7 @@ - + Qt::Vertical @@ -150,7 +170,7 @@ - + Conformity type @@ -182,7 +202,7 @@ - + Qt::Vertical @@ -195,7 +215,7 @@ - + Non conformal option @@ -231,7 +251,7 @@ - + Qt::Vertical @@ -244,7 +264,7 @@ - + 6 @@ -268,7 +288,7 @@ - + Qt::Vertical @@ -281,7 +301,7 @@ - + @@ -358,7 +378,7 @@ - + @@ -434,7 +454,7 @@ - + Qt::Vertical @@ -470,7 +490,7 @@ - + Qt::Horizontal @@ -486,7 +506,7 @@ - + Qt::Vertical @@ -499,7 +519,7 @@ - + No comment. @@ -519,7 +539,7 @@ - + @@ -574,7 +594,7 @@ - + Qt::Horizontal diff --git a/src/HOMARDGUI/CreateHypothesis.h b/src/HOMARDGUI/CreateHypothesis.h index 60afee80..dc3ef611 100644 --- a/src/HOMARDGUI/CreateHypothesis.h +++ b/src/HOMARDGUI/CreateHypothesis.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CreateHypothesis.ui' ** -** Created: Tue Sep 24 14:35:06 2013 +** Created: Wed Jan 15 08:44:19 2014 ** by: Qt User Interface Compiler version 4.6.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -26,33 +25,44 @@ #include #include #include +#include #include #include #include #include +#include QT_BEGIN_NAMESPACE class Ui_CreateHypothesis { public: + QWidget *scrollAreaWidgetContents; QGridLayout *gridLayout_3; + QWidget *WName; + QGridLayout *gridLayout; + QLabel *Name; QLineEdit *LEName; + QSpacerItem *horizontalSpacer_9; QGroupBox *GBTypeAdaptation; QHBoxLayout *hboxLayout; QRadioButton *RBUniforme; QRadioButton *RBChamp; QRadioButton *RBZone; + QSpacerItem *horizontalSpacer_6; + QCheckBox *CBGroupe; + QSpacerItem *horizontalSpacer_8; QGroupBox *GBUniform; - QGridLayout *gridLayout; + QGridLayout *gridLayout1; QRadioButton *RBUniDera; QRadioButton *RBUniRaff; + QSpacerItem *horizontalSpacer_7; QGroupBox *GBFieldFile; - QGridLayout *gridLayout1; + QGridLayout *gridLayout2; QLabel *FieldFile; QLineEdit *LEFieldFile; QGroupBox *GBFieldManagement; - QGridLayout *gridLayout2; + QGridLayout *gridLayout3; QHBoxLayout *hboxLayout1; QLabel *FieldName; QComboBox *CBFieldName; @@ -67,7 +77,7 @@ public: QCheckBox *CBJump; QHBoxLayout *hboxLayout4; QGroupBox *GBRefinementThresholds; - QGridLayout *gridLayout3; + QGridLayout *gridLayout4; QRadioButton *RBRPE; QDoubleSpinBox *SpinBox_RPE; QRadioButton *RBRRel; @@ -78,7 +88,7 @@ public: QDoubleSpinBox *SpinBox_RMuSigma; QRadioButton *RBRNo; QGroupBox *GBCoarseningThresholds; - QGridLayout *gridLayout4; + QGridLayout *gridLayout5; QRadioButton *RBCPE; QDoubleSpinBox *SpinBox_CPE; QRadioButton *RBCRel; @@ -99,56 +109,79 @@ public: QPushButton *PBZoneDelete; QSpacerItem *spacerItem2; QGroupBox *GBField; - QGridLayout *gridLayout5; QGridLayout *gridLayout6; + QGridLayout *gridLayout7; QRadioButton *RBFieldNo; QRadioButton *RBFieldAll; QRadioButton *RBFieldChosen; QTableWidget *TWField; - QCheckBox *CBGroupe; + QSpacerItem *horizontalSpacer_5; QCheckBox *CBAdvanced; + QSpacerItem *horizontalSpacer_4; QGroupBox *GBAdvancedOptions; QGridLayout *gridLayout_1; QLabel *TLMinimalDiameter; QDoubleSpinBox *doubleSpinBoxDiamMin; QLabel *TLMaximalLevel; - QSpinBox *spinBoxNivMax; + QSpinBox *SpinBoxNivMax; QGroupBox *GBAdapInit; QGridLayout *gridLayout_2; QRadioButton *RBAIN; QRadioButton *RBAIR; QRadioButton *RBAID; QCheckBox *CBLevelOutput; + QSpacerItem *horizontalSpacer_3; QGroupBox *GBButtons; - QGridLayout *gridLayout7; + QGridLayout *gridLayout8; QPushButton *buttonOk; QPushButton *buttonApply; QPushButton *buttonCancel; QPushButton *buttonHelp; - QLabel *Name; + QSpacerItem *horizontalSpacer_2; - void setupUi(QDialog *CreateHypothesis) + void setupUi(QScrollArea *CreateHypothesis) { if (CreateHypothesis->objectName().isEmpty()) CreateHypothesis->setObjectName(QString::fromUtf8("CreateHypothesis")); - CreateHypothesis->resize(794, 1481); - QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + CreateHypothesis->resize(848, 1550); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(CreateHypothesis->sizePolicy().hasHeightForWidth()); CreateHypothesis->setSizePolicy(sizePolicy); - CreateHypothesis->setAutoFillBackground(true); - CreateHypothesis->setSizeGripEnabled(true); - gridLayout_3 = new QGridLayout(CreateHypothesis); + CreateHypothesis->setMinimumSize(QSize(800, 600)); + CreateHypothesis->setSizeIncrement(QSize(1, 1)); + CreateHypothesis->setBaseSize(QSize(800, 1200)); + CreateHypothesis->setWidgetResizable(true); + scrollAreaWidgetContents = new QWidget(); + scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); + scrollAreaWidgetContents->setGeometry(QRect(0, 0, 844, 1546)); + scrollAreaWidgetContents->setProperty("sizeGripEnabled", QVariant(true)); + gridLayout_3 = new QGridLayout(scrollAreaWidgetContents); gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); - LEName = new QLineEdit(CreateHypothesis); + WName = new QWidget(scrollAreaWidgetContents); + WName->setObjectName(QString::fromUtf8("WName")); + gridLayout = new QGridLayout(WName); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + Name = new QLabel(WName); + Name->setObjectName(QString::fromUtf8("Name")); + + gridLayout->addWidget(Name, 0, 0, 1, 1); + + LEName = new QLineEdit(WName); LEName->setObjectName(QString::fromUtf8("LEName")); - LEName->setMinimumSize(QSize(382, 31)); - LEName->setMaxLength(32); + LEName->setMinimumSize(QSize(282, 31)); - gridLayout_3->addWidget(LEName, 0, 1, 1, 1); + gridLayout->addWidget(LEName, 0, 1, 1, 1); - GBTypeAdaptation = new QGroupBox(CreateHypothesis); + + gridLayout_3->addWidget(WName, 0, 0, 1, 1); + + horizontalSpacer_9 = new QSpacerItem(224, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_3->addItem(horizontalSpacer_9, 0, 1, 1, 1); + + GBTypeAdaptation = new QGroupBox(scrollAreaWidgetContents); GBTypeAdaptation->setObjectName(QString::fromUtf8("GBTypeAdaptation")); hboxLayout = new QHBoxLayout(GBTypeAdaptation); #ifndef Q_OS_MAC @@ -177,66 +210,86 @@ public: gridLayout_3->addWidget(GBTypeAdaptation, 1, 0, 1, 2); - GBUniform = new QGroupBox(CreateHypothesis); + horizontalSpacer_6 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_3->addItem(horizontalSpacer_6, 1, 2, 1, 1); + + CBGroupe = new QCheckBox(scrollAreaWidgetContents); + CBGroupe->setObjectName(QString::fromUtf8("CBGroupe")); + + gridLayout_3->addWidget(CBGroupe, 2, 0, 1, 1); + + horizontalSpacer_8 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_3->addItem(horizontalSpacer_8, 2, 2, 1, 1); + + GBUniform = new QGroupBox(scrollAreaWidgetContents); GBUniform->setObjectName(QString::fromUtf8("GBUniform")); - gridLayout = new QGridLayout(GBUniform); + gridLayout1 = new QGridLayout(GBUniform); #ifndef Q_OS_MAC - gridLayout->setSpacing(6); + gridLayout1->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout->setContentsMargins(9, 9, 9, 9); + gridLayout1->setContentsMargins(9, 9, 9, 9); #endif - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); RBUniDera = new QRadioButton(GBUniform); RBUniDera->setObjectName(QString::fromUtf8("RBUniDera")); - gridLayout->addWidget(RBUniDera, 0, 1, 1, 1); + gridLayout1->addWidget(RBUniDera, 0, 1, 1, 1); RBUniRaff = new QRadioButton(GBUniform); RBUniRaff->setObjectName(QString::fromUtf8("RBUniRaff")); RBUniRaff->setChecked(true); - gridLayout->addWidget(RBUniRaff, 0, 0, 1, 1); + gridLayout1->addWidget(RBUniRaff, 0, 0, 1, 1); + + gridLayout_3->addWidget(GBUniform, 3, 0, 1, 1); - gridLayout_3->addWidget(GBUniform, 3, 0, 1, 2); + horizontalSpacer_7 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - GBFieldFile = new QGroupBox(CreateHypothesis); + gridLayout_3->addItem(horizontalSpacer_7, 3, 2, 1, 1); + + GBFieldFile = new QGroupBox(scrollAreaWidgetContents); GBFieldFile->setObjectName(QString::fromUtf8("GBFieldFile")); - gridLayout1 = new QGridLayout(GBFieldFile); + gridLayout2 = new QGridLayout(GBFieldFile); #ifndef Q_OS_MAC - gridLayout1->setSpacing(6); + gridLayout2->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout1->setContentsMargins(9, 9, 9, 9); + gridLayout2->setContentsMargins(9, 9, 9, 9); #endif - gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); FieldFile = new QLabel(GBFieldFile); FieldFile->setObjectName(QString::fromUtf8("FieldFile")); - gridLayout1->addWidget(FieldFile, 0, 0, 1, 1); + gridLayout2->addWidget(FieldFile, 0, 0, 1, 1); LEFieldFile = new QLineEdit(GBFieldFile); LEFieldFile->setObjectName(QString::fromUtf8("LEFieldFile")); LEFieldFile->setMinimumSize(QSize(282, 31)); - gridLayout1->addWidget(LEFieldFile, 0, 1, 1, 1); + gridLayout2->addWidget(LEFieldFile, 0, 1, 1, 1); gridLayout_3->addWidget(GBFieldFile, 4, 0, 1, 2); - GBFieldManagement = new QGroupBox(CreateHypothesis); + GBFieldManagement = new QGroupBox(scrollAreaWidgetContents); GBFieldManagement->setObjectName(QString::fromUtf8("GBFieldManagement")); - sizePolicy.setHeightForWidth(GBFieldManagement->sizePolicy().hasHeightForWidth()); - GBFieldManagement->setSizePolicy(sizePolicy); - gridLayout2 = new QGridLayout(GBFieldManagement); + QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(GBFieldManagement->sizePolicy().hasHeightForWidth()); + GBFieldManagement->setSizePolicy(sizePolicy1); + gridLayout3 = new QGridLayout(GBFieldManagement); #ifndef Q_OS_MAC - gridLayout2->setSpacing(6); + gridLayout3->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout2->setContentsMargins(9, 9, 9, 9); + gridLayout3->setContentsMargins(9, 9, 9, 9); #endif - gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); hboxLayout1 = new QHBoxLayout(); #ifndef Q_OS_MAC hboxLayout1->setSpacing(6); @@ -252,8 +305,8 @@ public: CBFieldName = new QComboBox(GBFieldManagement); CBFieldName->setObjectName(QString::fromUtf8("CBFieldName")); - sizePolicy.setHeightForWidth(CBFieldName->sizePolicy().hasHeightForWidth()); - CBFieldName->setSizePolicy(sizePolicy); + sizePolicy1.setHeightForWidth(CBFieldName->sizePolicy().hasHeightForWidth()); + CBFieldName->setSizePolicy(sizePolicy1); CBFieldName->setEditable(false); CBFieldName->setSizeAdjustPolicy(QComboBox::AdjustToContents); @@ -264,7 +317,7 @@ public: hboxLayout1->addItem(spacerItem); - gridLayout2->addLayout(hboxLayout1, 0, 0, 1, 1); + gridLayout3->addLayout(hboxLayout1, 0, 0, 1, 1); hboxLayout2 = new QHBoxLayout(); #ifndef Q_OS_MAC @@ -329,7 +382,7 @@ public: hboxLayout2->addLayout(vboxLayout); - gridLayout2->addLayout(hboxLayout2, 1, 0, 1, 1); + gridLayout3->addLayout(hboxLayout2, 1, 0, 1, 1); hboxLayout4 = new QHBoxLayout(); #ifndef Q_OS_MAC @@ -339,22 +392,22 @@ public: hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4")); GBRefinementThresholds = new QGroupBox(GBFieldManagement); GBRefinementThresholds->setObjectName(QString::fromUtf8("GBRefinementThresholds")); - sizePolicy.setHeightForWidth(GBRefinementThresholds->sizePolicy().hasHeightForWidth()); - GBRefinementThresholds->setSizePolicy(sizePolicy); - gridLayout3 = new QGridLayout(GBRefinementThresholds); + sizePolicy1.setHeightForWidth(GBRefinementThresholds->sizePolicy().hasHeightForWidth()); + GBRefinementThresholds->setSizePolicy(sizePolicy1); + gridLayout4 = new QGridLayout(GBRefinementThresholds); #ifndef Q_OS_MAC - gridLayout3->setSpacing(6); + gridLayout4->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout3->setContentsMargins(9, 9, 9, 9); + gridLayout4->setContentsMargins(9, 9, 9, 9); #endif - gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); RBRPE = new QRadioButton(GBRefinementThresholds); RBRPE->setObjectName(QString::fromUtf8("RBRPE")); RBRPE->setCheckable(true); RBRPE->setChecked(true); - gridLayout3->addWidget(RBRPE, 0, 0, 1, 1); + gridLayout4->addWidget(RBRPE, 0, 0, 1, 1); SpinBox_RPE = new QDoubleSpinBox(GBRefinementThresholds); SpinBox_RPE->setObjectName(QString::fromUtf8("SpinBox_RPE")); @@ -363,12 +416,12 @@ public: SpinBox_RPE->setSingleStep(0.1); SpinBox_RPE->setValue(2); - gridLayout3->addWidget(SpinBox_RPE, 0, 1, 1, 1); + gridLayout4->addWidget(SpinBox_RPE, 0, 1, 1, 1); RBRRel = new QRadioButton(GBRefinementThresholds); RBRRel->setObjectName(QString::fromUtf8("RBRRel")); - gridLayout3->addWidget(RBRRel, 1, 0, 1, 1); + gridLayout4->addWidget(RBRRel, 1, 0, 1, 1); SpinBox_RRel = new QDoubleSpinBox(GBRefinementThresholds); SpinBox_RRel->setObjectName(QString::fromUtf8("SpinBox_RRel")); @@ -377,12 +430,12 @@ public: SpinBox_RRel->setMaximum(100); SpinBox_RRel->setSingleStep(0.1); - gridLayout3->addWidget(SpinBox_RRel, 1, 1, 1, 1); + gridLayout4->addWidget(SpinBox_RRel, 1, 1, 1, 1); RBRAbs = new QRadioButton(GBRefinementThresholds); RBRAbs->setObjectName(QString::fromUtf8("RBRAbs")); - gridLayout3->addWidget(RBRAbs, 2, 0, 1, 1); + gridLayout4->addWidget(RBRAbs, 2, 0, 1, 1); SpinBox_RAbs = new QDoubleSpinBox(GBRefinementThresholds); SpinBox_RAbs->setObjectName(QString::fromUtf8("SpinBox_RAbs")); @@ -392,12 +445,12 @@ public: SpinBox_RAbs->setMaximum(1e+12); SpinBox_RAbs->setSingleStep(0.1); - gridLayout3->addWidget(SpinBox_RAbs, 2, 1, 1, 1); + gridLayout4->addWidget(SpinBox_RAbs, 2, 1, 1, 1); RBRMuSigma = new QRadioButton(GBRefinementThresholds); RBRMuSigma->setObjectName(QString::fromUtf8("RBRMuSigma")); - gridLayout3->addWidget(RBRMuSigma, 3, 0, 1, 1); + gridLayout4->addWidget(RBRMuSigma, 3, 0, 1, 1); SpinBox_RMuSigma = new QDoubleSpinBox(GBRefinementThresholds); SpinBox_RMuSigma->setObjectName(QString::fromUtf8("SpinBox_RMuSigma")); @@ -408,32 +461,32 @@ public: SpinBox_RMuSigma->setSingleStep(0.1); SpinBox_RMuSigma->setValue(3); - gridLayout3->addWidget(SpinBox_RMuSigma, 3, 1, 1, 1); + gridLayout4->addWidget(SpinBox_RMuSigma, 3, 1, 1, 1); RBRNo = new QRadioButton(GBRefinementThresholds); RBRNo->setObjectName(QString::fromUtf8("RBRNo")); - gridLayout3->addWidget(RBRNo, 4, 0, 1, 1); + gridLayout4->addWidget(RBRNo, 4, 0, 1, 1); hboxLayout4->addWidget(GBRefinementThresholds); GBCoarseningThresholds = new QGroupBox(GBFieldManagement); GBCoarseningThresholds->setObjectName(QString::fromUtf8("GBCoarseningThresholds")); - gridLayout4 = new QGridLayout(GBCoarseningThresholds); + gridLayout5 = new QGridLayout(GBCoarseningThresholds); #ifndef Q_OS_MAC - gridLayout4->setSpacing(6); + gridLayout5->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout4->setContentsMargins(9, 9, 9, 9); + gridLayout5->setContentsMargins(9, 9, 9, 9); #endif - gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); RBCPE = new QRadioButton(GBCoarseningThresholds); RBCPE->setObjectName(QString::fromUtf8("RBCPE")); RBCPE->setCheckable(true); RBCPE->setChecked(false); - gridLayout4->addWidget(RBCPE, 0, 0, 1, 1); + gridLayout5->addWidget(RBCPE, 0, 0, 1, 1); SpinBox_CPE = new QDoubleSpinBox(GBCoarseningThresholds); SpinBox_CPE->setObjectName(QString::fromUtf8("SpinBox_CPE")); @@ -442,12 +495,12 @@ public: SpinBox_CPE->setMaximum(100); SpinBox_CPE->setSingleStep(0.1); - gridLayout4->addWidget(SpinBox_CPE, 0, 1, 1, 1); + gridLayout5->addWidget(SpinBox_CPE, 0, 1, 1, 1); RBCRel = new QRadioButton(GBCoarseningThresholds); RBCRel->setObjectName(QString::fromUtf8("RBCRel")); - gridLayout4->addWidget(RBCRel, 1, 0, 1, 1); + gridLayout5->addWidget(RBCRel, 1, 0, 1, 1); SpinBox_CRel = new QDoubleSpinBox(GBCoarseningThresholds); SpinBox_CRel->setObjectName(QString::fromUtf8("SpinBox_CRel")); @@ -456,12 +509,12 @@ public: SpinBox_CRel->setMaximum(100); SpinBox_CRel->setSingleStep(0.1); - gridLayout4->addWidget(SpinBox_CRel, 1, 1, 1, 1); + gridLayout5->addWidget(SpinBox_CRel, 1, 1, 1, 1); RBCAbs = new QRadioButton(GBCoarseningThresholds); RBCAbs->setObjectName(QString::fromUtf8("RBCAbs")); - gridLayout4->addWidget(RBCAbs, 2, 0, 1, 1); + gridLayout5->addWidget(RBCAbs, 2, 0, 1, 1); SpinBox_CAbs = new QDoubleSpinBox(GBCoarseningThresholds); SpinBox_CAbs->setObjectName(QString::fromUtf8("SpinBox_CAbs")); @@ -471,12 +524,12 @@ public: SpinBox_CAbs->setMaximum(1e+12); SpinBox_CAbs->setSingleStep(0.1); - gridLayout4->addWidget(SpinBox_CAbs, 2, 1, 1, 1); + gridLayout5->addWidget(SpinBox_CAbs, 2, 1, 1, 1); RBCMuSigma = new QRadioButton(GBCoarseningThresholds); RBCMuSigma->setObjectName(QString::fromUtf8("RBCMuSigma")); - gridLayout4->addWidget(RBCMuSigma, 3, 0, 1, 1); + gridLayout5->addWidget(RBCMuSigma, 3, 0, 1, 1); SpinBox_CMuSigma = new QDoubleSpinBox(GBCoarseningThresholds); SpinBox_CMuSigma->setObjectName(QString::fromUtf8("SpinBox_CMuSigma")); @@ -487,27 +540,27 @@ public: SpinBox_CMuSigma->setSingleStep(0.1); SpinBox_CMuSigma->setValue(4); - gridLayout4->addWidget(SpinBox_CMuSigma, 3, 1, 1, 1); + gridLayout5->addWidget(SpinBox_CMuSigma, 3, 1, 1, 1); RBCNo = new QRadioButton(GBCoarseningThresholds); RBCNo->setObjectName(QString::fromUtf8("RBCNo")); RBCNo->setChecked(true); - gridLayout4->addWidget(RBCNo, 4, 0, 1, 1); + gridLayout5->addWidget(RBCNo, 4, 0, 1, 1); hboxLayout4->addWidget(GBCoarseningThresholds); - gridLayout2->addLayout(hboxLayout4, 2, 0, 1, 1); + gridLayout3->addLayout(hboxLayout4, 2, 0, 1, 1); - gridLayout_3->addWidget(GBFieldManagement, 5, 0, 1, 2); + gridLayout_3->addWidget(GBFieldManagement, 5, 0, 1, 3); - GBAreaManagement = new QGroupBox(CreateHypothesis); + GBAreaManagement = new QGroupBox(scrollAreaWidgetContents); GBAreaManagement->setObjectName(QString::fromUtf8("GBAreaManagement")); - sizePolicy.setHeightForWidth(GBAreaManagement->sizePolicy().hasHeightForWidth()); - GBAreaManagement->setSizePolicy(sizePolicy); + sizePolicy1.setHeightForWidth(GBAreaManagement->sizePolicy().hasHeightForWidth()); + GBAreaManagement->setSizePolicy(sizePolicy1); gridLayout_4 = new QGridLayout(GBAreaManagement); gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4")); TWZone = new QTableWidget(GBAreaManagement); @@ -574,44 +627,44 @@ public: gridLayout_3->addWidget(GBAreaManagement, 6, 0, 1, 2); - GBField = new QGroupBox(CreateHypothesis); + GBField = new QGroupBox(scrollAreaWidgetContents); GBField->setObjectName(QString::fromUtf8("GBField")); - gridLayout5 = new QGridLayout(GBField); + gridLayout6 = new QGridLayout(GBField); #ifndef Q_OS_MAC - gridLayout5->setSpacing(6); + gridLayout6->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout5->setContentsMargins(9, 9, 9, 9); + gridLayout6->setContentsMargins(9, 9, 9, 9); #endif - gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); - gridLayout6 = new QGridLayout(); + gridLayout6->setObjectName(QString::fromUtf8("gridLayout6")); + gridLayout7 = new QGridLayout(); #ifndef Q_OS_MAC - gridLayout6->setSpacing(6); + gridLayout7->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout6->setContentsMargins(0, 0, 0, 0); + gridLayout7->setContentsMargins(0, 0, 0, 0); #endif - gridLayout6->setObjectName(QString::fromUtf8("gridLayout6")); + gridLayout7->setObjectName(QString::fromUtf8("gridLayout7")); RBFieldNo = new QRadioButton(GBField); RBFieldNo->setObjectName(QString::fromUtf8("RBFieldNo")); RBFieldNo->setChecked(true); - gridLayout6->addWidget(RBFieldNo, 0, 0, 1, 1); + gridLayout7->addWidget(RBFieldNo, 0, 0, 1, 1); RBFieldAll = new QRadioButton(GBField); RBFieldAll->setObjectName(QString::fromUtf8("RBFieldAll")); RBFieldAll->setChecked(false); - gridLayout6->addWidget(RBFieldAll, 0, 1, 1, 1); + gridLayout7->addWidget(RBFieldAll, 0, 1, 1, 1); RBFieldChosen = new QRadioButton(GBField); RBFieldChosen->setObjectName(QString::fromUtf8("RBFieldChosen")); RBFieldChosen->setChecked(false); - gridLayout6->addWidget(RBFieldChosen, 0, 2, 1, 1); + gridLayout7->addWidget(RBFieldChosen, 0, 2, 1, 1); - gridLayout5->addLayout(gridLayout6, 0, 0, 1, 1); + gridLayout6->addLayout(gridLayout7, 0, 0, 1, 1); TWField = new QTableWidget(GBField); if (TWField->columnCount() < 2) @@ -622,29 +675,32 @@ public: TWField->setHorizontalHeaderItem(1, __qtablewidgetitem6); TWField->setObjectName(QString::fromUtf8("TWField")); - gridLayout5->addWidget(TWField, 1, 0, 1, 1); + gridLayout6->addWidget(TWField, 1, 0, 1, 1); - gridLayout_3->addWidget(GBField, 7, 0, 1, 2); + gridLayout_3->addWidget(GBField, 7, 0, 1, 1); - CBGroupe = new QCheckBox(CreateHypothesis); - CBGroupe->setObjectName(QString::fromUtf8("CBGroupe")); + horizontalSpacer_5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - gridLayout_3->addWidget(CBGroupe, 2, 0, 1, 2); + gridLayout_3->addItem(horizontalSpacer_5, 7, 2, 1, 1); - CBAdvanced = new QCheckBox(CreateHypothesis); + CBAdvanced = new QCheckBox(scrollAreaWidgetContents); CBAdvanced->setObjectName(QString::fromUtf8("CBAdvanced")); - gridLayout_3->addWidget(CBAdvanced, 8, 0, 1, 2); + gridLayout_3->addWidget(CBAdvanced, 8, 0, 1, 1); + + horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_3->addItem(horizontalSpacer_4, 8, 2, 1, 1); - GBAdvancedOptions = new QGroupBox(CreateHypothesis); + GBAdvancedOptions = new QGroupBox(scrollAreaWidgetContents); GBAdvancedOptions->setObjectName(QString::fromUtf8("GBAdvancedOptions")); gridLayout_1 = new QGridLayout(GBAdvancedOptions); gridLayout_1->setObjectName(QString::fromUtf8("gridLayout_1")); TLMinimalDiameter = new QLabel(GBAdvancedOptions); TLMinimalDiameter->setObjectName(QString::fromUtf8("TLMinimalDiameter")); - sizePolicy.setHeightForWidth(TLMinimalDiameter->sizePolicy().hasHeightForWidth()); - TLMinimalDiameter->setSizePolicy(sizePolicy); + sizePolicy1.setHeightForWidth(TLMinimalDiameter->sizePolicy().hasHeightForWidth()); + TLMinimalDiameter->setSizePolicy(sizePolicy1); TLMinimalDiameter->setWordWrap(false); gridLayout_1->addWidget(TLMinimalDiameter, 0, 0, 1, 1); @@ -657,17 +713,17 @@ public: TLMaximalLevel = new QLabel(GBAdvancedOptions); TLMaximalLevel->setObjectName(QString::fromUtf8("TLMaximalLevel")); - sizePolicy.setHeightForWidth(TLMaximalLevel->sizePolicy().hasHeightForWidth()); - TLMaximalLevel->setSizePolicy(sizePolicy); + sizePolicy1.setHeightForWidth(TLMaximalLevel->sizePolicy().hasHeightForWidth()); + TLMaximalLevel->setSizePolicy(sizePolicy1); TLMaximalLevel->setWordWrap(false); gridLayout_1->addWidget(TLMaximalLevel, 1, 0, 1, 1); - spinBoxNivMax = new QSpinBox(GBAdvancedOptions); - spinBoxNivMax->setObjectName(QString::fromUtf8("spinBoxNivMax")); - spinBoxNivMax->setValue(99); + SpinBoxNivMax = new QSpinBox(GBAdvancedOptions); + SpinBoxNivMax->setObjectName(QString::fromUtf8("SpinBoxNivMax")); + SpinBoxNivMax->setValue(99); - gridLayout_1->addWidget(spinBoxNivMax, 1, 1, 1, 1); + gridLayout_1->addWidget(SpinBoxNivMax, 1, 1, 1, 1); GBAdapInit = new QGroupBox(GBAdvancedOptions); GBAdapInit->setObjectName(QString::fromUtf8("GBAdapInit")); @@ -698,71 +754,65 @@ public: gridLayout_1->addWidget(CBLevelOutput, 3, 0, 1, 1); - gridLayout_3->addWidget(GBAdvancedOptions, 9, 0, 1, 2); + gridLayout_3->addWidget(GBAdvancedOptions, 9, 0, 1, 1); - GBButtons = new QGroupBox(CreateHypothesis); + horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_3->addItem(horizontalSpacer_3, 9, 2, 1, 1); + + GBButtons = new QGroupBox(scrollAreaWidgetContents); GBButtons->setObjectName(QString::fromUtf8("GBButtons")); - gridLayout7 = new QGridLayout(GBButtons); + gridLayout8 = new QGridLayout(GBButtons); #ifndef Q_OS_MAC - gridLayout7->setSpacing(6); + gridLayout8->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout7->setContentsMargins(9, 9, 9, 9); + gridLayout8->setContentsMargins(9, 9, 9, 9); #endif - gridLayout7->setObjectName(QString::fromUtf8("gridLayout7")); + gridLayout8->setObjectName(QString::fromUtf8("gridLayout8")); buttonOk = new QPushButton(GBButtons); buttonOk->setObjectName(QString::fromUtf8("buttonOk")); - gridLayout7->addWidget(buttonOk, 0, 0, 1, 1); + gridLayout8->addWidget(buttonOk, 0, 0, 1, 1); buttonApply = new QPushButton(GBButtons); buttonApply->setObjectName(QString::fromUtf8("buttonApply")); - gridLayout7->addWidget(buttonApply, 0, 1, 1, 1); + gridLayout8->addWidget(buttonApply, 0, 1, 1, 1); buttonCancel = new QPushButton(GBButtons); buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - gridLayout7->addWidget(buttonCancel, 0, 2, 1, 1); + gridLayout8->addWidget(buttonCancel, 0, 2, 1, 1); buttonHelp = new QPushButton(GBButtons); buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - gridLayout7->addWidget(buttonHelp, 0, 3, 1, 1); + gridLayout8->addWidget(buttonHelp, 0, 3, 1, 1); gridLayout_3->addWidget(GBButtons, 10, 0, 1, 2); - Name = new QLabel(CreateHypothesis); - Name->setObjectName(QString::fromUtf8("Name")); + horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - gridLayout_3->addWidget(Name, 0, 0, 1, 1); - - LEName->raise(); - GBTypeAdaptation->raise(); - GBUniform->raise(); - GBFieldFile->raise(); - GBFieldManagement->raise(); - GBAreaManagement->raise(); - GBField->raise(); - CBGroupe->raise(); - CBAdvanced->raise(); - GBAdvancedOptions->raise(); - GBButtons->raise(); - Name->raise(); + gridLayout_3->addItem(horizontalSpacer_2, 10, 2, 1, 1); + + CreateHypothesis->setWidget(scrollAreaWidgetContents); retranslateUi(CreateHypothesis); QMetaObject::connectSlotsByName(CreateHypothesis); } // setupUi - void retranslateUi(QDialog *CreateHypothesis) + void retranslateUi(QScrollArea *CreateHypothesis) { CreateHypothesis->setWindowTitle(QApplication::translate("CreateHypothesis", "Create an hypothesis", 0, QApplication::UnicodeUTF8)); + Name->setText(QApplication::translate("CreateHypothesis", "Name", 0, QApplication::UnicodeUTF8)); GBTypeAdaptation->setTitle(QApplication::translate("CreateHypothesis", "Type of adaptation", 0, QApplication::UnicodeUTF8)); RBUniforme->setText(QApplication::translate("CreateHypothesis", "Uniform", 0, QApplication::UnicodeUTF8)); RBChamp->setText(QApplication::translate("CreateHypothesis", "Driven by a field", 0, QApplication::UnicodeUTF8)); RBZone->setText(QApplication::translate("CreateHypothesis", "With geometrical zones", 0, QApplication::UnicodeUTF8)); + CBGroupe->setText(QApplication::translate("CreateHypothesis", "Filtering with groups", 0, QApplication::UnicodeUTF8)); GBUniform->setTitle(QApplication::translate("CreateHypothesis", "Uniform adaptation", 0, QApplication::UnicodeUTF8)); RBUniDera->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8)); RBUniRaff->setText(QApplication::translate("CreateHypothesis", "Refinement", 0, QApplication::UnicodeUTF8)); @@ -811,7 +861,6 @@ public: ___qtablewidgetitem5->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8)); QTableWidgetItem *___qtablewidgetitem6 = TWField->horizontalHeaderItem(1); ___qtablewidgetitem6->setText(QApplication::translate("CreateHypothesis", "Field Name", 0, QApplication::UnicodeUTF8)); - CBGroupe->setText(QApplication::translate("CreateHypothesis", "Filtering with groups", 0, QApplication::UnicodeUTF8)); CBAdvanced->setText(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8)); GBAdvancedOptions->setTitle(QApplication::translate("CreateHypothesis", "Advanced options", 0, QApplication::UnicodeUTF8)); TLMinimalDiameter->setText(QApplication::translate("CreateHypothesis", "Minimal diameter", 0, QApplication::UnicodeUTF8)); @@ -826,7 +875,6 @@ public: buttonApply->setText(QApplication::translate("CreateHypothesis", "Apply", 0, QApplication::UnicodeUTF8)); buttonCancel->setText(QApplication::translate("CreateHypothesis", "Cancel", 0, QApplication::UnicodeUTF8)); buttonHelp->setText(QApplication::translate("CreateHypothesis", "Help", 0, QApplication::UnicodeUTF8)); - Name->setText(QApplication::translate("CreateHypothesis", "Name", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; diff --git a/src/HOMARDGUI/CreateHypothesis.ui b/src/HOMARDGUI/CreateHypothesis.ui index 5163e918..98f0c334 100644 --- a/src/HOMARDGUI/CreateHypothesis.ui +++ b/src/HOMARDGUI/CreateHypothesis.ui @@ -1,960 +1,1082 @@ CreateHypothesis - + 0 0 - 794 - 1481 + 848 + 1550 - + 0 0 + + + 800 + 600 + + + + + 1 + 1 + + + + + 800 + 1200 + + Create an hypothesis - + true - - true - - - - - - - 382 - 31 - - - - 32 - - - - - - - Type of adaptation - - - - 6 + + + + 0 + 0 + 844 + 1546 + + + + true + + + + + + + + + Name + + + + + + + + 282 + 31 + + + + + + + + + + + Qt::Horizontal - - 9 + + + 224 + 20 + - - - - Uniform - - - true - - - - - - - Driven by a field - - - - - - - With geometrical zones - - - - - - - - - - Uniform adaptation - - - - 9 + + + + + + Type of adaptation - - 6 + + + 6 + + + 9 + + + + + Uniform + + + true + + + + + + + Driven by a field + + + + + + + With geometrical zones + + + + + + + + + + Qt::Horizontal - - - - Coarsening - - - - - - - Refinement - - - true - - - - - - - - - - - - - - 9 + + + 20 + 20 + - - 6 + + + + + + Filtering with groups - - - - File of the fields - - - - - - - - 282 - 31 - - - - - - - - - - - - 0 - 0 - - - - Governing field for the adaptation - - - - 9 + + + + + + Qt::Horizontal - - 6 + + + 40 + 20 + - - - - 6 - - - 0 - - - - - Field name - - - - - - - - 0 - 0 - - - - false - - - QComboBox::AdjustToContents - - - - - - - Qt::Horizontal - - - - 48 - 20 - - - - - - - - - - 6 - - - 0 - - - - - QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - true - - - 0 - - - 2 - - + + + + + + Uniform adaptation + + + + 9 + + + 6 + + + + + Coarsening + + + + + + + Refinement + + + true + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 9 + + + 6 + + + + + File of the fields + + + + + + + + 282 + 31 + + + + + + + + + + + + 0 + 0 + + + + Governing field for the adaptation + + + + 9 + + + 6 + + + + + 6 + + + 0 + + + - Selection + Field name - - - - Component + + + + + + + 0 + 0 + - - - - - - - Qt::Horizontal - - - - 60 - 20 - - - - - - - - 6 - - - 0 - - - - - 6 + + false + + + QComboBox::AdjustToContents + + + + + + + Qt::Horizontal + + + + 48 + 20 + + + + + + + + + + 6 + + + 0 + + + + + QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + true + + + 0 + + + 2 + + + + Selection + + + + + Component + + + + + + + Qt::Horizontal + + + + 60 + 20 + + + + + + + + 6 + + + 0 + + + + + 6 + + + 0 + + + + + L2 norm + + + true + + + + + + + Infinite norm + + + false + + + + + + + + + Jump between elements + + + + + + + + + + + 6 + + + 0 + + + + + + 0 + 0 + + + + Refinement threshold + + - 0 + 9 + + + 6 - - + + - L2 norm + Percentage of meshes + + + true true - - + + + + % + + + 3 + + + 100.000000000000000 + + + 0.100000000000000 + + + 2.000000000000000 + + + + + - Infinite norm + Relative - + + + + + false + + % + + + 3 + + + 100.000000000000000 + + + 0.100000000000000 + + + + + + + Absolute + + + + + + + false + + + 8 + + + -1000000000000.000000000000000 + + + 1000000000000.000000000000000 + + + 0.100000000000000 + + + + + + + Mean + n*(std deviation) + + + + + + + false + + + 8 + + + -1000000000000.000000000000000 + + + 1000000000000.000000000000000 + + + 0.100000000000000 + + + 3.000000000000000 + + + + + + + No refinement + - - - - - Jump between elements + + + + + + Coarsening threshold + + + + 9 - - - - - - - - - - 6 - - - 0 - - - - - - 0 - 0 - + + 6 + + + + + Percentage of meshes + + + true + + + false + + + + + + + false + + + % + + + 3 + + + 100.000000000000000 + + + 0.100000000000000 + + + + + + + Relative + + + + + + + false + + + % + + + 3 + + + 100.000000000000000 + + + 0.100000000000000 + + + + + + + Absolute + + + + + + + false + + + 8 + + + -1000000000000.000000000000000 + + + 1000000000000.000000000000000 + + + 0.100000000000000 + + + + + + + Mean - n*(std deviation) + + + + + + + false + + + 8 + + + -1000000000000.000000000000000 + + + 1000000000000.000000000000000 + + + 0.100000000000000 + + + 4.000000000000000 + + + + + + + No coarsening + + + true + + + + + + + + + + + + + + + + 0 + 0 + + + + Zone management + + + + + + + 400 + 0 + + + + QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + true + + + 0 + + + 3 + + + + Refinement - - Refinement threshold + + + + Coarsening - - - 9 - + + + + Zone name + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 6 + + + 0 + + + 6 - - - - Percentage of meshes - - - true - - - true - - - - - - - % - - - 3 - - - 100.000000000000000 - - - 0.100000000000000 - - - 2.000000000000000 - - - - - - - Relative - - - - - - - false - - - % - - - 3 - - - 100.000000000000000 - - - 0.100000000000000 - - - - - - - Absolute - - - - - - - false - - - 8 - - - -1000000000000.000000000000000 - - - 1000000000000.000000000000000 - - - 0.100000000000000 - - - - - - - Mean + n*(std deviation) - - - - - - - false - - - 8 - - - -1000000000000.000000000000000 - - - 1000000000000.000000000000000 - - - 0.100000000000000 - - - 3.000000000000000 - - - - - - - No refinement - - - - - - - - - - Coarsening threshold - - - 9 - - - 6 + 0 - - + + - Percentage of meshes - - - true - - - false - - - - - - - false - - - % - - - 3 - - - 100.000000000000000 - - - 0.100000000000000 - - - - - - - Relative - - - - - - - false - - - % - - - 3 - - - 100.000000000000000 - - - 0.100000000000000 - - - - - - - Absolute - - - - - - - false - - - 8 - - - -1000000000000.000000000000000 - - - 1000000000000.000000000000000 - - - 0.100000000000000 + New - - + + - Mean - n*(std deviation) - - - - - - - false - - - 8 - - - -1000000000000.000000000000000 - - - 1000000000000.000000000000000 - - - 0.100000000000000 - - - 4.000000000000000 + Edit - - + + - No coarsening - - - true + - - - - - - - - - - - - 0 - 0 - - - - Zone management - - - - - - - 400 - 0 - - - - QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - true - - - 0 - - - 3 - - - - Refinement + + + + + Qt::Vertical + + + + 20 + 48 + + + + + + + + + + + + + Field Interpolation + + + + 9 + + + 6 + + + + + 0 - - - - Coarsening + + 6 - - - - Zone name - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 6 - - - 0 - - - - - 6 + + + + None + + + true + + + + + + + All + + + false + + + + + + + Chosen + + + false + + + + + + + + + + Selection - - 0 + + + + Field Name - - + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Advanced options + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Advanced options + + + + + + + 0 + 0 + + + + Minimal diameter + + + false + + + + + + + 7 + + + + + + + + 0 + 0 + + + + Maximal level + + + false + + + + + + + 99 + + + + + + + Initialization of adaptation + + + + - New + Nothing + + + true - - + + - Edit + Refinement - - + + - + Coarsening - - - - - Qt::Vertical - - - - 20 - 48 - - - - - - - - - - - - - Field Interpolation - - - - 9 + + + + + + Output of the level of refinement + + + + + + + + + + Qt::Horizontal - - 6 + + + 40 + 20 + - - - - 0 - - - 6 - - - - - None - - - true - - - - - - - All - - - false - - - - - - - Chosen - - - false - - - - - - - - + + + + + + + + + + 9 + + + 6 + + + - Selection + OK - - + + + + - Field Name - - - - - - - - - - - Filtering with groups - - - - - - - Advanced options - - - - - - - Advanced options - - - - - - - 0 - 0 - - - - Minimal diameter - - - false - - - - - - - 7 - - - - - - - - 0 - 0 - - - - Maximal level - - - false - - - - - - - 99 - - - - - - - Initialization of adaptation - - - - - - Nothing - - - true - - - - - - - Refinement - - - - - - - Coarsening - - - - - - - - - - Output of the level of refinement - - - - - - - - - - - - - - 9 + Apply + + + + + + + Cancel + + + + + + + Help + + + + + + + + + + Qt::Horizontal - - 6 + + + 40 + 20 + - - - - OK - - - - - - - Apply - - - - - - - Cancel - - - - - - - Help - - - - - - - - - - Name - - - - - LEName - GBTypeAdaptation - GBUniform - GBFieldFile - GBFieldManagement - GBAreaManagement - GBField - CBGroupe - CBAdvanced - GBAdvancedOptions - GBButtons - - Name + + + + diff --git a/src/HOMARDGUI/CreateIteration.h b/src/HOMARDGUI/CreateIteration.h index 6674ed94..38a7e6ee 100644 --- a/src/HOMARDGUI/CreateIteration.h +++ b/src/HOMARDGUI/CreateIteration.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CreateIteration.ui' ** -** Created: Tue Sep 17 14:09:30 2013 +** Created: Wed Jan 15 08:42:25 2014 ** by: Qt User Interface Compiler version 4.6.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,24 @@ QT_BEGIN_NAMESPACE class Ui_CreateIteration { public: + QWidget *scrollAreaWidgetContents; QGridLayout *gridLayout; + QLabel *Iteration_Name; + QSpacerItem *horizontalSpacer_6; + QLineEdit *LEName; + QSpacerItem *horizontalSpacer_3; + QLabel *Iter_Parent; + QPushButton *PBIterParent; + QLineEdit *LEIterationParentName; + QLabel *Mesh_n; + QSpacerItem *horizontalSpacer_7; + QLineEdit *LEMeshName_n; + QSpacerItem *horizontalSpacer_4; + QLabel *Mesh_np1; + QSpacerItem *horizontalSpacer_8; + QLineEdit *LEMeshName_np1; + QSpacerItem *horizontalSpacer_5; + QSpacerItem *verticalSpacer; QGroupBox *GBField; QGridLayout *gridLayout1; QLineEdit *LEFieldFile; @@ -48,48 +66,131 @@ public: QRadioButton *RBNo; QPushButton *PushFieldFile; QLabel *FieldFile; - QLabel *Iteration_Name; - QLineEdit *LEName; - QLabel *Iter_Parent; + QSpacerItem *horizontalSpacer_10; QSpacerItem *spacerItem4; - QPushButton *PBIterParent; - QLineEdit *LEIterationParentName; - QLabel *Mesh_n; - QSpacerItem *spacerItem5; - QLineEdit *LEMeshName_n; - QSpacerItem *spacerItem6; - QLabel *Mesh_np1; - QLineEdit *LEMeshName_np1; - QSpacerItem *spacerItem7; - QSpacerItem *spacerItem8; QGroupBox *Hypothese; QGridLayout *gridLayout2; QComboBox *CBHypothese; - QSpacerItem *spacerItem9; + QSpacerItem *spacerItem5; QPushButton *PBHypoEdit; QPushButton *PBHypoNew; - QSpacerItem *spacerItem10; + QSpacerItem *horizontalSpacer_2; + QSpacerItem *spacerItem6; QGroupBox *GroupButtons; QGridLayout *gridLayout3; QPushButton *buttonOk; QPushButton *buttonApply; QPushButton *buttonCancel; QPushButton *buttonHelp; + QSpacerItem *horizontalSpacer; + QSpacerItem *horizontalSpacer_9; - void setupUi(QWidget *CreateIteration) + void setupUi(QScrollArea *CreateIteration) { if (CreateIteration->objectName().isEmpty()) CreateIteration->setObjectName(QString::fromUtf8("CreateIteration")); - CreateIteration->resize(610, 598); - gridLayout = new QGridLayout(CreateIteration); -#ifndef Q_OS_MAC - gridLayout->setSpacing(6); -#endif -#ifndef Q_OS_MAC - gridLayout->setContentsMargins(9, 9, 9, 9); -#endif + CreateIteration->resize(777, 668); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(CreateIteration->sizePolicy().hasHeightForWidth()); + CreateIteration->setSizePolicy(sizePolicy); + CreateIteration->setMinimumSize(QSize(750, 400)); + CreateIteration->setSizeIncrement(QSize(1, 1)); + CreateIteration->setBaseSize(QSize(750, 400)); + CreateIteration->setWidgetResizable(true); + scrollAreaWidgetContents = new QWidget(); + scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); + scrollAreaWidgetContents->setGeometry(QRect(0, 0, 773, 664)); + scrollAreaWidgetContents->setProperty("sizeGripEnabled", QVariant(true)); + gridLayout = new QGridLayout(scrollAreaWidgetContents); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - GBField = new QGroupBox(CreateIteration); + Iteration_Name = new QLabel(scrollAreaWidgetContents); + Iteration_Name->setObjectName(QString::fromUtf8("Iteration_Name")); + + gridLayout->addWidget(Iteration_Name, 0, 0, 1, 2); + + horizontalSpacer_6 = new QSpacerItem(117, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_6, 0, 2, 1, 1); + + LEName = new QLineEdit(scrollAreaWidgetContents); + LEName->setObjectName(QString::fromUtf8("LEName")); + LEName->setMinimumSize(QSize(290, 21)); + LEName->setMaxLength(64); + + gridLayout->addWidget(LEName, 0, 3, 1, 2); + + horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_3, 0, 5, 1, 1); + + Iter_Parent = new QLabel(scrollAreaWidgetContents); + Iter_Parent->setObjectName(QString::fromUtf8("Iter_Parent")); + + gridLayout->addWidget(Iter_Parent, 1, 0, 1, 2); + + PBIterParent = new QPushButton(scrollAreaWidgetContents); + PBIterParent->setObjectName(QString::fromUtf8("PBIterParent")); + PBIterParent->setEnabled(true); + PBIterParent->setMaximumSize(QSize(50, 27)); + + gridLayout->addWidget(PBIterParent, 1, 2, 1, 1); + + LEIterationParentName = new QLineEdit(scrollAreaWidgetContents); + LEIterationParentName->setObjectName(QString::fromUtf8("LEIterationParentName")); + LEIterationParentName->setMinimumSize(QSize(0, 21)); + LEIterationParentName->setMaxLength(64); + LEIterationParentName->setReadOnly(true); + + gridLayout->addWidget(LEIterationParentName, 1, 3, 1, 2); + + Mesh_n = new QLabel(scrollAreaWidgetContents); + Mesh_n->setObjectName(QString::fromUtf8("Mesh_n")); + + gridLayout->addWidget(Mesh_n, 2, 0, 1, 1); + + horizontalSpacer_7 = new QSpacerItem(117, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_7, 2, 2, 1, 1); + + LEMeshName_n = new QLineEdit(scrollAreaWidgetContents); + LEMeshName_n->setObjectName(QString::fromUtf8("LEMeshName_n")); + LEMeshName_n->setMinimumSize(QSize(290, 21)); + LEMeshName_n->setMaxLength(64); + LEMeshName_n->setReadOnly(true); + + gridLayout->addWidget(LEMeshName_n, 2, 3, 1, 3); + + horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_4, 2, 6, 1, 1); + + Mesh_np1 = new QLabel(scrollAreaWidgetContents); + Mesh_np1->setObjectName(QString::fromUtf8("Mesh_np1")); + + gridLayout->addWidget(Mesh_np1, 3, 0, 1, 2); + + horizontalSpacer_8 = new QSpacerItem(117, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_8, 3, 2, 1, 1); + + LEMeshName_np1 = new QLineEdit(scrollAreaWidgetContents); + LEMeshName_np1->setObjectName(QString::fromUtf8("LEMeshName_np1")); + LEMeshName_np1->setMinimumSize(QSize(290, 21)); + LEMeshName_np1->setMaxLength(64); + + gridLayout->addWidget(LEMeshName_np1, 3, 3, 1, 3); + + horizontalSpacer_5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_5, 3, 6, 1, 1); + + verticalSpacer = new QSpacerItem(20, 62, QSizePolicy::Minimum, QSizePolicy::Expanding); + + gridLayout->addItem(verticalSpacer, 4, 0, 1, 1); + + GBField = new QGroupBox(scrollAreaWidgetContents); GBField->setObjectName(QString::fromUtf8("GBField")); gridLayout1 = new QGridLayout(GBField); #ifndef Q_OS_MAC @@ -175,86 +276,17 @@ public: gridLayout1->addWidget(FieldFile, 0, 0, 1, 1); - gridLayout->addWidget(GBField, 6, 0, 1, 4); + gridLayout->addWidget(GBField, 5, 0, 1, 6); - Iteration_Name = new QLabel(CreateIteration); - Iteration_Name->setObjectName(QString::fromUtf8("Iteration_Name")); - - gridLayout->addWidget(Iteration_Name, 0, 0, 1, 2); - - LEName = new QLineEdit(CreateIteration); - LEName->setObjectName(QString::fromUtf8("LEName")); - LEName->setMinimumSize(QSize(290, 21)); - LEName->setMaxLength(200); - - gridLayout->addWidget(LEName, 0, 2, 1, 2); - - Iter_Parent = new QLabel(CreateIteration); - Iter_Parent->setObjectName(QString::fromUtf8("Iter_Parent")); + horizontalSpacer_10 = new QSpacerItem(69, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - gridLayout->addWidget(Iter_Parent, 1, 0, 1, 1); - - spacerItem4 = new QSpacerItem(20, 24, QSizePolicy::Minimum, QSizePolicy::Expanding); - - gridLayout->addItem(spacerItem4, 1, 1, 1, 1); - - PBIterParent = new QPushButton(CreateIteration); - PBIterParent->setObjectName(QString::fromUtf8("PBIterParent")); - PBIterParent->setEnabled(true); - PBIterParent->setMaximumSize(QSize(50, 27)); - - gridLayout->addWidget(PBIterParent, 1, 2, 1, 1); - - LEIterationParentName = new QLineEdit(CreateIteration); - LEIterationParentName->setObjectName(QString::fromUtf8("LEIterationParentName")); - LEIterationParentName->setMinimumSize(QSize(0, 21)); - LEIterationParentName->setMaxLength(200); - LEIterationParentName->setReadOnly(true); - - gridLayout->addWidget(LEIterationParentName, 1, 3, 1, 1); - - Mesh_n = new QLabel(CreateIteration); - Mesh_n->setObjectName(QString::fromUtf8("Mesh_n")); - - gridLayout->addWidget(Mesh_n, 2, 0, 1, 1); + gridLayout->addItem(horizontalSpacer_10, 5, 6, 1, 1); - spacerItem5 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem4 = new QSpacerItem(20, 22, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout->addItem(spacerItem5, 2, 1, 1, 1); + gridLayout->addItem(spacerItem4, 6, 0, 1, 1); - LEMeshName_n = new QLineEdit(CreateIteration); - LEMeshName_n->setObjectName(QString::fromUtf8("LEMeshName_n")); - LEMeshName_n->setMinimumSize(QSize(290, 21)); - LEMeshName_n->setMaxLength(32); - LEMeshName_n->setReadOnly(true); - - gridLayout->addWidget(LEMeshName_n, 2, 2, 1, 2); - - spacerItem6 = new QSpacerItem(20, 22, QSizePolicy::Minimum, QSizePolicy::Expanding); - - gridLayout->addItem(spacerItem6, 3, 1, 1, 1); - - Mesh_np1 = new QLabel(CreateIteration); - Mesh_np1->setObjectName(QString::fromUtf8("Mesh_np1")); - - gridLayout->addWidget(Mesh_np1, 4, 0, 1, 2); - - LEMeshName_np1 = new QLineEdit(CreateIteration); - LEMeshName_np1->setObjectName(QString::fromUtf8("LEMeshName_np1")); - LEMeshName_np1->setMinimumSize(QSize(290, 21)); - LEMeshName_np1->setMaxLength(32); - - gridLayout->addWidget(LEMeshName_np1, 4, 2, 1, 2); - - spacerItem7 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); - - gridLayout->addItem(spacerItem7, 5, 1, 1, 1); - - spacerItem8 = new QSpacerItem(20, 22, QSizePolicy::Minimum, QSizePolicy::Expanding); - - gridLayout->addItem(spacerItem8, 7, 1, 1, 1); - - Hypothese = new QGroupBox(CreateIteration); + Hypothese = new QGroupBox(scrollAreaWidgetContents); Hypothese->setObjectName(QString::fromUtf8("Hypothese")); gridLayout2 = new QGridLayout(Hypothese); #ifndef Q_OS_MAC @@ -270,9 +302,9 @@ public: gridLayout2->addWidget(CBHypothese, 0, 0, 1, 1); - spacerItem9 = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum); + spacerItem5 = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum); - gridLayout2->addItem(spacerItem9, 0, 1, 1, 1); + gridLayout2->addItem(spacerItem5, 0, 1, 1, 1); PBHypoEdit = new QPushButton(Hypothese); PBHypoEdit->setObjectName(QString::fromUtf8("PBHypoEdit")); @@ -285,13 +317,17 @@ public: gridLayout2->addWidget(PBHypoNew, 0, 3, 1, 1); - gridLayout->addWidget(Hypothese, 8, 0, 1, 4); + gridLayout->addWidget(Hypothese, 7, 0, 1, 4); + + horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_2, 7, 4, 1, 2); - spacerItem10 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem6 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout->addItem(spacerItem10, 9, 0, 1, 1); + gridLayout->addItem(spacerItem6, 8, 1, 1, 1); - GroupButtons = new QGroupBox(CreateIteration); + GroupButtons = new QGroupBox(scrollAreaWidgetContents); GroupButtons->setObjectName(QString::fromUtf8("GroupButtons")); gridLayout3 = new QGridLayout(GroupButtons); #ifndef Q_OS_MAC @@ -324,8 +360,17 @@ public: gridLayout3->addWidget(buttonHelp, 0, 3, 1, 1); - gridLayout->addWidget(GroupButtons, 10, 0, 1, 4); + gridLayout->addWidget(GroupButtons, 9, 0, 1, 4); + + horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer, 9, 4, 1, 2); + horizontalSpacer_9 = new QSpacerItem(139, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_9, 1, 5, 1, 1); + + CreateIteration->setWidget(scrollAreaWidgetContents); retranslateUi(CreateIteration); @@ -335,9 +380,14 @@ public: QMetaObject::connectSlotsByName(CreateIteration); } // setupUi - void retranslateUi(QWidget *CreateIteration) + void retranslateUi(QScrollArea *CreateIteration) { CreateIteration->setWindowTitle(QApplication::translate("CreateIteration", "Create an iteration", 0, QApplication::UnicodeUTF8)); + Iteration_Name->setText(QApplication::translate("CreateIteration", "Iteration Name", 0, QApplication::UnicodeUTF8)); + Iter_Parent->setText(QApplication::translate("CreateIteration", "Previous iteration", 0, QApplication::UnicodeUTF8)); + PBIterParent->setText(QString()); + Mesh_n->setText(QApplication::translate("CreateIteration", "Mesh n", 0, QApplication::UnicodeUTF8)); + Mesh_np1->setText(QApplication::translate("CreateIteration", "Mesh n+1", 0, QApplication::UnicodeUTF8)); GBField->setTitle(QApplication::translate("CreateIteration", "Field information", 0, QApplication::UnicodeUTF8)); RBChosen->setText(QApplication::translate("CreateIteration", "Chosen time step", 0, QApplication::UnicodeUTF8)); Rank->setText(QApplication::translate("CreateIteration", "Rank", 0, QApplication::UnicodeUTF8)); @@ -346,11 +396,6 @@ public: RBNo->setText(QApplication::translate("CreateIteration", "No time step", 0, QApplication::UnicodeUTF8)); PushFieldFile->setText(QString()); FieldFile->setText(QApplication::translate("CreateIteration", "Field file", 0, QApplication::UnicodeUTF8)); - Iteration_Name->setText(QApplication::translate("CreateIteration", "Iteration Name", 0, QApplication::UnicodeUTF8)); - Iter_Parent->setText(QApplication::translate("CreateIteration", "Previous iteration", 0, QApplication::UnicodeUTF8)); - PBIterParent->setText(QString()); - Mesh_n->setText(QApplication::translate("CreateIteration", "Mesh n", 0, QApplication::UnicodeUTF8)); - Mesh_np1->setText(QApplication::translate("CreateIteration", "Mesh n+1", 0, QApplication::UnicodeUTF8)); Hypothese->setTitle(QApplication::translate("CreateIteration", "Hypothesis", 0, QApplication::UnicodeUTF8)); PBHypoEdit->setText(QApplication::translate("CreateIteration", "Edit", 0, QApplication::UnicodeUTF8)); PBHypoNew->setText(QApplication::translate("CreateIteration", "New", 0, QApplication::UnicodeUTF8)); diff --git a/src/HOMARDGUI/CreateIteration.ui b/src/HOMARDGUI/CreateIteration.ui index d355e1d3..2cc2827c 100644 --- a/src/HOMARDGUI/CreateIteration.ui +++ b/src/HOMARDGUI/CreateIteration.ui @@ -1,474 +1,599 @@ CreateIteration - + 0 0 - 610 - 598 + 777 + 668 + + + 0 + 0 + + + + + 750 + 400 + + + + + 1 + 1 + + + + + 750 + 400 + + Create an iteration - - - 9 + + true + + + + + 0 + 0 + 773 + 664 + - - 6 + + true - - - - Field information - - - - 9 - - - 6 - - - - - - 282 - 21 - - - - - - - - Qt::Vertical - - - - 138 - 18 - - - - - - - - Chosen time step - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 255 - 13 - - - - - - - - -1 - - - 1010000 - - - -1 - - - - - - - Rank - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 13 - - - - - - - - -2 - - - 100000 - - - -1 - - - - - - - Time step - - - - - - - Qt::Vertical - - - - 138 - 28 - - - - - - - - Last time step - - - - - - - No time step - - - true - - - true - - - - - - - - - - - - - - Field file - - - - - - - - - - Iteration Name - - - - - - - - 290 - 21 - - - - 200 - - - - - - - Previous iteration - - - - - - - Qt::Vertical - - - - 20 - 24 - - - - - - - - true - - - - 50 - 27 - - - - - - - - - - - - 0 - 21 - - - - 200 - - - true - - - - - - - Mesh n - - - - - - - Qt::Vertical - - - - 20 - 21 - - - - - - - - - 290 - 21 - - - - 32 - - - true - - - - - - - Qt::Vertical - - - - 20 - 22 - - - - - - - - Mesh n+1 - - - - - - - - 290 - 21 - - - - 32 - - - - - - - Qt::Vertical - - - - 20 - 21 - - - - - - - - Qt::Vertical - - - - 20 - 22 - - - - - - - - Hypothesis - - - - 9 - - - 6 - - - - - -1 - - - QComboBox::AdjustToContents - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 13 - - - - - - - - Edit - - - - - - - New - - - - - - - - - - Qt::Vertical - - - - 20 - 21 - - - - - - - - - - - - 9 - - - 6 - - - - - OK - - - false - - - false - - - - - - - Apply - - - - - - - Cancel - - - - - - - Help - - - - - - - + + + + + Iteration Name + + + + + + + Qt::Horizontal + + + + 117 + 20 + + + + + + + + + 290 + 21 + + + + 64 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Previous iteration + + + + + + + true + + + + 50 + 27 + + + + + + + + + + + + 0 + 21 + + + + 64 + + + true + + + + + + + Mesh n + + + + + + + Qt::Horizontal + + + + 117 + 20 + + + + + + + + + 290 + 21 + + + + 64 + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Mesh n+1 + + + + + + + Qt::Horizontal + + + + 117 + 20 + + + + + + + + + 290 + 21 + + + + 64 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 62 + + + + + + + + Field information + + + + 9 + + + 6 + + + + + + 282 + 21 + + + + + + + + Qt::Vertical + + + + 138 + 18 + + + + + + + + Chosen time step + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 255 + 13 + + + + + + + + -1 + + + 1010000 + + + -1 + + + + + + + Rank + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 13 + + + + + + + + -2 + + + 100000 + + + -1 + + + + + + + Time step + + + + + + + Qt::Vertical + + + + 138 + 28 + + + + + + + + Last time step + + + + + + + No time step + + + true + + + true + + + + + + + + + + + + + + Field file + + + + + + + + + + Qt::Horizontal + + + + 69 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 22 + + + + + + + + Hypothesis + + + + 9 + + + 6 + + + + + -1 + + + QComboBox::AdjustToContents + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 13 + + + + + + + + Edit + + + + + + + New + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 21 + + + + + + + + + + + + 9 + + + 6 + + + + + OK + + + false + + + false + + + + + + + Apply + + + + + + + Cancel + + + + + + + Help + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 139 + 20 + + + + + + diff --git a/src/HOMARDGUI/CreateYACS.h b/src/HOMARDGUI/CreateYACS.h index 9ce7a302..760010b8 100644 --- a/src/HOMARDGUI/CreateYACS.h +++ b/src/HOMARDGUI/CreateYACS.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CreateYACS.ui' ** -** Created: Mon Sep 23 13:29:12 2013 +** Created: Wed Jan 15 08:42:01 2014 ** by: Qt User Interface Compiler version 4.6.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -23,16 +23,23 @@ #include #include #include +#include #include +#include +#include QT_BEGIN_NAMESPACE class Ui_CreateYACS { public: + QWidget *scrollAreaWidgetContents; + QGridLayout *gridLayout_5; + QWidget *WName; QGridLayout *gridLayout_2; QLabel *Name; QLineEdit *LEName; + QSpacerItem *horizontalSpacer; QGridLayout *gridLayout; QLabel *Case; QPushButton *PBCaseName; @@ -53,6 +60,23 @@ public: QHBoxLayout *_4; QRadioButton *RBConstant; QRadioButton *RBVariable; + QGroupBox *GBMax; + QGridLayout *gridLayout_3; + QLabel *TLMaxIteration; + QSpinBox *SpinBoxMaxIter; + QLabel *TLMaxNodes; + QSpinBox *SpinBoxMaxNode; + QLabel *TLMaxElem; + QSpinBox *SpinBoxMaxElem; + QSpacerItem *horizontalSpacer_2; + QGroupBox *GBConvergence; + QGridLayout *gridLayout_4; + QRadioButton *RBNone; + QRadioButton *RBVMinAbs; + QRadioButton *RBVMaxAbs; + QLabel *labelVref; + QDoubleSpinBox *doubleSpinBoxConvergence; + QSpacerItem *horizontalSpacer_3; QGroupBox *GroupButtons; QGridLayout *gridLayout1; QPushButton *buttonHelp; @@ -61,52 +85,70 @@ public: QPushButton *buttonCancel; QSpacerItem *spacer_2; - void setupUi(QDialog *CreateYACS) + void setupUi(QScrollArea *CreateYACS) { if (CreateYACS->objectName().isEmpty()) CreateYACS->setObjectName(QString::fromUtf8("CreateYACS")); - CreateYACS->resize(538, 340); - QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + CreateYACS->resize(684, 649); + QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(CreateYACS->sizePolicy().hasHeightForWidth()); CreateYACS->setSizePolicy(sizePolicy); - CreateYACS->setAutoFillBackground(true); - gridLayout_2 = new QGridLayout(CreateYACS); + CreateYACS->setMinimumSize(QSize(600, 500)); + CreateYACS->setSizeIncrement(QSize(1, 1)); + CreateYACS->setBaseSize(QSize(600, 500)); + CreateYACS->setWidgetResizable(true); + scrollAreaWidgetContents = new QWidget(); + scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); + scrollAreaWidgetContents->setGeometry(QRect(0, 0, 680, 645)); + scrollAreaWidgetContents->setProperty("sizeGripEnabled", QVariant(true)); + gridLayout_5 = new QGridLayout(scrollAreaWidgetContents); + gridLayout_5->setObjectName(QString::fromUtf8("gridLayout_5")); + WName = new QWidget(scrollAreaWidgetContents); + WName->setObjectName(QString::fromUtf8("WName")); + gridLayout_2 = new QGridLayout(WName); gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); - Name = new QLabel(CreateYACS); + Name = new QLabel(WName); Name->setObjectName(QString::fromUtf8("Name")); gridLayout_2->addWidget(Name, 0, 0, 1, 1); - LEName = new QLineEdit(CreateYACS); + LEName = new QLineEdit(WName); LEName->setObjectName(QString::fromUtf8("LEName")); LEName->setMaxLength(32); gridLayout_2->addWidget(LEName, 0, 1, 1, 1); + + gridLayout_5->addWidget(WName, 0, 0, 1, 1); + + horizontalSpacer = new QSpacerItem(131, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_5->addItem(horizontalSpacer, 0, 1, 1, 1); + gridLayout = new QGridLayout(); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - Case = new QLabel(CreateYACS); + Case = new QLabel(scrollAreaWidgetContents); Case->setObjectName(QString::fromUtf8("Case")); gridLayout->addWidget(Case, 0, 0, 1, 1); - PBCaseName = new QPushButton(CreateYACS); + PBCaseName = new QPushButton(scrollAreaWidgetContents); PBCaseName->setObjectName(QString::fromUtf8("PBCaseName")); PBCaseName->setEnabled(true); PBCaseName->setMaximumSize(QSize(50, 27)); gridLayout->addWidget(PBCaseName, 0, 1, 1, 1); - LECaseName = new QLineEdit(CreateYACS); + LECaseName = new QLineEdit(scrollAreaWidgetContents); LECaseName->setObjectName(QString::fromUtf8("LECaseName")); LECaseName->setMinimumSize(QSize(382, 21)); gridLayout->addWidget(LECaseName, 0, 2, 1, 1); - gridLayout_2->addLayout(gridLayout, 1, 0, 1, 3); + gridLayout_5->addLayout(gridLayout, 1, 0, 1, 2); _2 = new QHBoxLayout(); #ifndef Q_OS_MAC @@ -114,25 +156,25 @@ public: #endif _2->setContentsMargins(0, 0, 0, 0); _2->setObjectName(QString::fromUtf8("_2")); - Script = new QLabel(CreateYACS); + Script = new QLabel(scrollAreaWidgetContents); Script->setObjectName(QString::fromUtf8("Script")); _2->addWidget(Script); - PBScriptFile = new QPushButton(CreateYACS); + PBScriptFile = new QPushButton(scrollAreaWidgetContents); PBScriptFile->setObjectName(QString::fromUtf8("PBScriptFile")); PBScriptFile->setAutoDefault(false); _2->addWidget(PBScriptFile); - LEScriptFile = new QLineEdit(CreateYACS); + LEScriptFile = new QLineEdit(scrollAreaWidgetContents); LEScriptFile->setObjectName(QString::fromUtf8("LEScriptFile")); LEScriptFile->setMinimumSize(QSize(382, 21)); _2->addWidget(LEScriptFile); - gridLayout_2->addLayout(_2, 2, 0, 1, 3); + gridLayout_5->addLayout(_2, 2, 0, 1, 2); hboxLayout = new QHBoxLayout(); #ifndef Q_OS_MAC @@ -140,25 +182,25 @@ public: #endif hboxLayout->setContentsMargins(0, 0, 0, 0); hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); - DirectoryStart = new QLabel(CreateYACS); + DirectoryStart = new QLabel(scrollAreaWidgetContents); DirectoryStart->setObjectName(QString::fromUtf8("DirectoryStart")); hboxLayout->addWidget(DirectoryStart); - PBDir = new QPushButton(CreateYACS); + PBDir = new QPushButton(scrollAreaWidgetContents); PBDir->setObjectName(QString::fromUtf8("PBDir")); PBDir->setAutoDefault(false); hboxLayout->addWidget(PBDir); - LEDirName = new QLineEdit(CreateYACS); + LEDirName = new QLineEdit(scrollAreaWidgetContents); LEDirName->setObjectName(QString::fromUtf8("LEDirName")); LEDirName->setMinimumSize(QSize(382, 21)); hboxLayout->addWidget(LEDirName); - gridLayout_2->addLayout(hboxLayout, 3, 0, 1, 3); + gridLayout_5->addLayout(hboxLayout, 3, 0, 1, 2); _3 = new QHBoxLayout(); #ifndef Q_OS_MAC @@ -166,27 +208,27 @@ public: #endif _3->setContentsMargins(0, 0, 0, 0); _3->setObjectName(QString::fromUtf8("_3")); - MeshFile = new QLabel(CreateYACS); + MeshFile = new QLabel(scrollAreaWidgetContents); MeshFile->setObjectName(QString::fromUtf8("MeshFile")); _3->addWidget(MeshFile); - PBMeshFile = new QPushButton(CreateYACS); + PBMeshFile = new QPushButton(scrollAreaWidgetContents); PBMeshFile->setObjectName(QString::fromUtf8("PBMeshFile")); PBMeshFile->setAutoDefault(false); _3->addWidget(PBMeshFile); - LEMeshFile = new QLineEdit(CreateYACS); + LEMeshFile = new QLineEdit(scrollAreaWidgetContents); LEMeshFile->setObjectName(QString::fromUtf8("LEMeshFile")); LEMeshFile->setMinimumSize(QSize(382, 21)); _3->addWidget(LEMeshFile); - gridLayout_2->addLayout(_3, 4, 0, 1, 3); + gridLayout_5->addLayout(_3, 4, 0, 1, 2); - GBTypeSchema = new QGroupBox(CreateYACS); + GBTypeSchema = new QGroupBox(scrollAreaWidgetContents); GBTypeSchema->setObjectName(QString::fromUtf8("GBTypeSchema")); _4 = new QHBoxLayout(GBTypeSchema); #ifndef Q_OS_MAC @@ -208,9 +250,111 @@ public: _4->addWidget(RBVariable); - gridLayout_2->addWidget(GBTypeSchema, 5, 0, 1, 2); + gridLayout_5->addWidget(GBTypeSchema, 5, 0, 1, 1); + + GBMax = new QGroupBox(scrollAreaWidgetContents); + GBMax->setObjectName(QString::fromUtf8("GBMax")); + gridLayout_3 = new QGridLayout(GBMax); + gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); + TLMaxIteration = new QLabel(GBMax); + TLMaxIteration->setObjectName(QString::fromUtf8("TLMaxIteration")); + QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(TLMaxIteration->sizePolicy().hasHeightForWidth()); + TLMaxIteration->setSizePolicy(sizePolicy1); + TLMaxIteration->setWordWrap(false); + + gridLayout_3->addWidget(TLMaxIteration, 0, 0, 1, 1); + + SpinBoxMaxIter = new QSpinBox(GBMax); + SpinBoxMaxIter->setObjectName(QString::fromUtf8("SpinBoxMaxIter")); + SpinBoxMaxIter->setMinimum(0); + SpinBoxMaxIter->setMaximum(999999999); + SpinBoxMaxIter->setValue(0); + + gridLayout_3->addWidget(SpinBoxMaxIter, 0, 1, 1, 1); + + TLMaxNodes = new QLabel(GBMax); + TLMaxNodes->setObjectName(QString::fromUtf8("TLMaxNodes")); + sizePolicy1.setHeightForWidth(TLMaxNodes->sizePolicy().hasHeightForWidth()); + TLMaxNodes->setSizePolicy(sizePolicy1); + TLMaxNodes->setWordWrap(false); + + gridLayout_3->addWidget(TLMaxNodes, 1, 0, 1, 1); + + SpinBoxMaxNode = new QSpinBox(GBMax); + SpinBoxMaxNode->setObjectName(QString::fromUtf8("SpinBoxMaxNode")); + SpinBoxMaxNode->setMinimum(0); + SpinBoxMaxNode->setMaximum(999999999); + SpinBoxMaxNode->setValue(0); + + gridLayout_3->addWidget(SpinBoxMaxNode, 1, 1, 1, 1); + + TLMaxElem = new QLabel(GBMax); + TLMaxElem->setObjectName(QString::fromUtf8("TLMaxElem")); + sizePolicy1.setHeightForWidth(TLMaxElem->sizePolicy().hasHeightForWidth()); + TLMaxElem->setSizePolicy(sizePolicy1); + TLMaxElem->setWordWrap(false); + + gridLayout_3->addWidget(TLMaxElem, 1, 2, 1, 1); + + SpinBoxMaxElem = new QSpinBox(GBMax); + SpinBoxMaxElem->setObjectName(QString::fromUtf8("SpinBoxMaxElem")); + SpinBoxMaxElem->setMinimum(0); + SpinBoxMaxElem->setMaximum(999999999); + SpinBoxMaxElem->setValue(0); + + gridLayout_3->addWidget(SpinBoxMaxElem, 1, 3, 1, 1); + + + gridLayout_5->addWidget(GBMax, 6, 0, 1, 1); + + horizontalSpacer_2 = new QSpacerItem(269, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_5->addItem(horizontalSpacer_2, 6, 1, 1, 1); + + GBConvergence = new QGroupBox(scrollAreaWidgetContents); + GBConvergence->setObjectName(QString::fromUtf8("GBConvergence")); + gridLayout_4 = new QGridLayout(GBConvergence); + gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4")); + RBNone = new QRadioButton(GBConvergence); + RBNone->setObjectName(QString::fromUtf8("RBNone")); + RBNone->setChecked(true); + + gridLayout_4->addWidget(RBNone, 0, 0, 1, 1); + + RBVMinAbs = new QRadioButton(GBConvergence); + RBVMinAbs->setObjectName(QString::fromUtf8("RBVMinAbs")); + + gridLayout_4->addWidget(RBVMinAbs, 0, 1, 1, 1); + + RBVMaxAbs = new QRadioButton(GBConvergence); + RBVMaxAbs->setObjectName(QString::fromUtf8("RBVMaxAbs")); + + gridLayout_4->addWidget(RBVMaxAbs, 0, 2, 1, 1); + + labelVref = new QLabel(GBConvergence); + labelVref->setObjectName(QString::fromUtf8("labelVref")); + + gridLayout_4->addWidget(labelVref, 1, 0, 1, 1); + + doubleSpinBoxConvergence = new QDoubleSpinBox(GBConvergence); + doubleSpinBoxConvergence->setObjectName(QString::fromUtf8("doubleSpinBoxConvergence")); + doubleSpinBoxConvergence->setDecimals(4); + doubleSpinBoxConvergence->setMinimum(-1e+09); + doubleSpinBoxConvergence->setMaximum(1e+09); + + gridLayout_4->addWidget(doubleSpinBoxConvergence, 1, 1, 1, 1); + + + gridLayout_5->addWidget(GBConvergence, 7, 0, 1, 1); + + horizontalSpacer_3 = new QSpacerItem(269, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout_5->addItem(horizontalSpacer_3, 7, 1, 1, 1); - GroupButtons = new QGroupBox(CreateYACS); + GroupButtons = new QGroupBox(scrollAreaWidgetContents); GroupButtons->setObjectName(QString::fromUtf8("GroupButtons")); gridLayout1 = new QGridLayout(GroupButtons); #ifndef Q_OS_MAC @@ -245,19 +389,20 @@ public: gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1); - gridLayout_2->addWidget(GroupButtons, 6, 0, 1, 2); + gridLayout_5->addWidget(GroupButtons, 8, 0, 1, 1); spacer_2 = new QSpacerItem(128, 25, QSizePolicy::Fixed, QSizePolicy::Minimum); - gridLayout_2->addItem(spacer_2, 6, 2, 1, 1); + gridLayout_5->addItem(spacer_2, 8, 1, 1, 1); + CreateYACS->setWidget(scrollAreaWidgetContents); retranslateUi(CreateYACS); QMetaObject::connectSlotsByName(CreateYACS); } // setupUi - void retranslateUi(QDialog *CreateYACS) + void retranslateUi(QScrollArea *CreateYACS) { CreateYACS->setWindowTitle(QApplication::translate("CreateYACS", "Create YACS", 0, QApplication::UnicodeUTF8)); Name->setText(QApplication::translate("CreateYACS", "Name", 0, QApplication::UnicodeUTF8)); @@ -272,6 +417,15 @@ public: GBTypeSchema->setTitle(QApplication::translate("CreateYACS", "Type of schema", 0, QApplication::UnicodeUTF8)); RBConstant->setText(QApplication::translate("CreateYACS", "Constant", 0, QApplication::UnicodeUTF8)); RBVariable->setText(QApplication::translate("CreateYACS", "Variable", 0, QApplication::UnicodeUTF8)); + GBMax->setTitle(QApplication::translate("CreateYACS", "Maximum of ...", 0, QApplication::UnicodeUTF8)); + TLMaxIteration->setText(QApplication::translate("CreateYACS", "Iterations", 0, QApplication::UnicodeUTF8)); + TLMaxNodes->setText(QApplication::translate("CreateYACS", "Nodes", 0, QApplication::UnicodeUTF8)); + TLMaxElem->setText(QApplication::translate("CreateYACS", "Elements", 0, QApplication::UnicodeUTF8)); + GBConvergence->setTitle(QApplication::translate("CreateYACS", "Test of convergence", 0, QApplication::UnicodeUTF8)); + RBNone->setText(QApplication::translate("CreateYACS", "None", 0, QApplication::UnicodeUTF8)); + RBVMinAbs->setText(QApplication::translate("CreateYACS", "Vtest > Vref", 0, QApplication::UnicodeUTF8)); + RBVMaxAbs->setText(QApplication::translate("CreateYACS", "Vtest < Vref", 0, QApplication::UnicodeUTF8)); + labelVref->setText(QApplication::translate("CreateYACS", "Vref", 0, QApplication::UnicodeUTF8)); GroupButtons->setTitle(QString()); buttonHelp->setText(QApplication::translate("CreateYACS", "Help", 0, QApplication::UnicodeUTF8)); buttonApply->setText(QApplication::translate("CreateYACS", "Apply", 0, QApplication::UnicodeUTF8)); diff --git a/src/HOMARDGUI/CreateYACS.ui b/src/HOMARDGUI/CreateYACS.ui index e1819619..11602651 100644 --- a/src/HOMARDGUI/CreateYACS.ui +++ b/src/HOMARDGUI/CreateYACS.ui @@ -1,294 +1,519 @@ CreateYACS - + 0 0 - 538 - 340 + 684 + 649 - + 0 0 + + + 600 + 500 + + + + + 1 + 1 + + + + + 600 + 500 + + Create YACS - + true - - - - - Name - - - - - - - 32 - - - - - - - - - Case - - - - - - - true - - - - 50 - 27 - - - - - - - - - - - - 382 - 21 - - - - - - - - - - 6 - - - 0 - - - - - Script - - - - - - - - - - false - - - - - - - - 382 - 21 - - - - - - - - - - 6 - - - 0 - - - - - Directory - - - - - - - - - - false - - - - - - - - 382 - 21 - - - - - - - - - - 6 - - - 0 - - - - - Mesh file - - - - - - - - - - false - - - - - - - - 382 - 21 - - - - - - - - - - Type of schema - - + + + + 0 + 0 + 680 + 645 + + + + true + + + + + + + + + Name + + + + + + + 32 + + + + + + + + + + Qt::Horizontal + + + + 131 + 20 + + + + + + + + + + Case + + + + + + + true + + + + 50 + 27 + + + + + + + + + + + + 382 + 21 + + + + + + + + 6 - 9 + 0 - + - Constant - - - true + Script - + - Variable + + + + false + + + + + + + + 382 + 21 + - - - - - - - - - - 9 - + + + 6 - - + + 0 + + + - Help - - - false + Directory - - + + - Apply + false - - - - OK + + + + + 382 + 21 + - - false + + + + + + + + 6 + + + 0 + + + + + Mesh file - - + + - Cancel + false + + + + + 382 + 21 + + + + - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 128 - 25 - - - - - + + + + + Type of schema + + + + 6 + + + 9 + + + + + Constant + + + true + + + + + + + Variable + + + + + + + + + + Maximum of ... + + + + + + + 0 + 0 + + + + Iterations + + + false + + + + + + + 0 + + + 999999999 + + + 0 + + + + + + + + 0 + 0 + + + + Nodes + + + false + + + + + + + 0 + + + 999999999 + + + 0 + + + + + + + + 0 + 0 + + + + Elements + + + false + + + + + + + 0 + + + 999999999 + + + 0 + + + + + + + + + + Qt::Horizontal + + + + 269 + 20 + + + + + + + + Test of convergence + + + + + + None + + + true + + + + + + + Vtest > Vref + + + + + + + Vtest < Vref + + + + + + + Vref + + + + + + + 4 + + + -999999999.000000000000000 + + + 999999999.000000000000000 + + + + + + + + + + Qt::Horizontal + + + + 269 + 20 + + + + + + + + + + + + 9 + + + 6 + + + + + Help + + + false + + + + + + + Apply + + + false + + + + + + + OK + + + false + + + + + + + Cancel + + + false + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 128 + 25 + + + + + + diff --git a/src/HOMARDGUI/CreateZone.h b/src/HOMARDGUI/CreateZone.h index 77893ea9..5a968248 100644 --- a/src/HOMARDGUI/CreateZone.h +++ b/src/HOMARDGUI/CreateZone.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CreateZone.ui' ** -** Created: Tue Sep 17 14:09:38 2013 +** Created: Wed Jan 15 08:42:10 2014 ** by: Qt User Interface Compiler version 4.6.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -23,6 +23,7 @@ #include #include #include +#include QT_BEGIN_NAMESPACE @@ -30,20 +31,42 @@ class Ui_CreateZone { public: QGridLayout *gridLayout; - QGroupBox *GBButtons; - QGridLayout *gridLayout1; - QPushButton *buttonHelp; - QPushButton *buttonCancel; - QPushButton *buttonApply; - QPushButton *buttonOk; + QLabel *Name; + QLineEdit *LEName; + QSpacerItem *horizontalSpacer_3; QGroupBox *TypeZone; - QGridLayout *gridLayout2; + QGridLayout *gridLayout1; QRadioButton *RBSphere; QRadioButton *RBPipe; QRadioButton *RBCylinder; QRadioButton *RBBox; - QGroupBox *gBCylindre; + QSpacerItem *horizontalSpacer_2; + QGroupBox *gBBox; + QGridLayout *gridLayout2; + QLabel *TLXmini; + QDoubleSpinBox *SpinBox_Xmini; + QLabel *TLYmini; + QDoubleSpinBox *SpinBox_Ymini; + QLabel *TLZmini; + QDoubleSpinBox *SpinBox_Zmini; + QLabel *TLXmaxi; + QLabel *TLZmaxi; + QDoubleSpinBox *SpinBox_Zmaxi; + QLabel *TLYmaxi; + QDoubleSpinBox *SpinBox_Xmaxi; + QDoubleSpinBox *SpinBox_Ymaxi; + QGroupBox *gBSphere; QGridLayout *gridLayout3; + QLabel *TLXcentre; + QDoubleSpinBox *SpinBox_Xcentre; + QLabel *TLYcentre; + QDoubleSpinBox *SpinBox_Ycentre; + QLabel *TLRayon; + QDoubleSpinBox *SpinBox_Rayon; + QLabel *TLZcentre; + QDoubleSpinBox *SpinBox_Zcentre; + QGroupBox *gBCylindre; + QGridLayout *gridLayout4; QDoubleSpinBox *SpinBox_Haut; QLabel *TLHaut; QLabel *TLRadius; @@ -60,34 +83,8 @@ public: QDoubleSpinBox *SpinBox_Radius; QLabel *TLXbase; QDoubleSpinBox *SpinBox_Xbase; - QGroupBox *gBSphere; - QGridLayout *gridLayout4; - QLabel *TLXcentre; - QDoubleSpinBox *SpinBox_Xcentre; - QLabel *TLYcentre; - QDoubleSpinBox *SpinBox_Ycentre; - QLabel *TLRayon; - QDoubleSpinBox *SpinBox_Rayon; - QLabel *TLZcentre; - QDoubleSpinBox *SpinBox_Zcentre; - QGroupBox *gBBox; - QGridLayout *gridLayout5; - QLabel *TLXmini; - QDoubleSpinBox *SpinBox_Xmini; - QLabel *TLYmini; - QDoubleSpinBox *SpinBox_Ymini; - QLabel *TLZmini; - QDoubleSpinBox *SpinBox_Zmini; - QLabel *TLXmaxi; - QLabel *TLZmaxi; - QDoubleSpinBox *SpinBox_Zmaxi; - QLabel *TLYmaxi; - QDoubleSpinBox *SpinBox_Xmaxi; - QDoubleSpinBox *SpinBox_Ymaxi; - QLineEdit *LEName; - QLabel *Name; QGroupBox *gBPipe; - QGridLayout *gridLayout6; + QGridLayout *gridLayout5; QLabel *TLHaut_p; QDoubleSpinBox *SpinBox_Xbase_p; QLabel *TLXbase_p; @@ -106,282 +103,242 @@ public: QDoubleSpinBox *SpinBox_Radius_ext; QLabel *TLRadius_ext; QDoubleSpinBox *SpinBox_Haut_p; + QGroupBox *GBButtons; + QGridLayout *gridLayout6; + QPushButton *buttonHelp; + QPushButton *buttonCancel; + QPushButton *buttonApply; + QPushButton *buttonOk; + QSpacerItem *horizontalSpacer; void setupUi(QDialog *CreateZone) { if (CreateZone->objectName().isEmpty()) CreateZone->setObjectName(QString::fromUtf8("CreateZone")); - CreateZone->resize(551, 880); + CreateZone->resize(550, 770); + CreateZone->setSizeIncrement(QSize(1, 1)); + CreateZone->setBaseSize(QSize(550, 400)); CreateZone->setAutoFillBackground(true); CreateZone->setSizeGripEnabled(true); gridLayout = new QGridLayout(CreateZone); -#ifndef Q_OS_MAC - gridLayout->setSpacing(6); -#endif -#ifndef Q_OS_MAC - gridLayout->setContentsMargins(9, 9, 9, 9); -#endif gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - GBButtons = new QGroupBox(CreateZone); - GBButtons->setObjectName(QString::fromUtf8("GBButtons")); - QSizePolicy sizePolicy(static_cast(0), static_cast(0)); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(GBButtons->sizePolicy().hasHeightForWidth()); - GBButtons->setSizePolicy(sizePolicy); - gridLayout1 = new QGridLayout(GBButtons); -#ifndef Q_OS_MAC - gridLayout1->setSpacing(6); -#endif -#ifndef Q_OS_MAC - gridLayout1->setContentsMargins(9, 9, 9, 9); -#endif - gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); - buttonHelp = new QPushButton(GBButtons); - buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - - gridLayout1->addWidget(buttonHelp, 0, 3, 1, 1); - - buttonCancel = new QPushButton(GBButtons); - buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - - gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1); - - buttonApply = new QPushButton(GBButtons); - buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + Name = new QLabel(CreateZone); + Name->setObjectName(QString::fromUtf8("Name")); - gridLayout1->addWidget(buttonApply, 0, 1, 1, 1); + gridLayout->addWidget(Name, 0, 0, 1, 1); - buttonOk = new QPushButton(GBButtons); - buttonOk->setObjectName(QString::fromUtf8("buttonOk")); + LEName = new QLineEdit(CreateZone); + LEName->setObjectName(QString::fromUtf8("LEName")); + LEName->setMaxLength(32); - gridLayout1->addWidget(buttonOk, 0, 0, 1, 1); + gridLayout->addWidget(LEName, 0, 1, 1, 1); + horizontalSpacer_3 = new QSpacerItem(142, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - gridLayout->addWidget(GBButtons, 6, 0, 1, 2); + gridLayout->addItem(horizontalSpacer_3, 0, 2, 1, 1); TypeZone = new QGroupBox(CreateZone); TypeZone->setObjectName(QString::fromUtf8("TypeZone")); + QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(TypeZone->sizePolicy().hasHeightForWidth()); TypeZone->setSizePolicy(sizePolicy); TypeZone->setMinimumSize(QSize(340, 0)); - gridLayout2 = new QGridLayout(TypeZone); + gridLayout1 = new QGridLayout(TypeZone); #ifndef Q_OS_MAC - gridLayout2->setSpacing(6); + gridLayout1->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout2->setContentsMargins(9, 9, 9, 9); + gridLayout1->setContentsMargins(9, 9, 9, 9); #endif - gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); RBSphere = new QRadioButton(TypeZone); RBSphere->setObjectName(QString::fromUtf8("RBSphere")); - const QIcon icon = QIcon(QString::fromUtf8("../../resources/zone_spherepoint.png")); + QIcon icon; + icon.addFile(QString::fromUtf8("../../resources/zone_spherepoint.png"), QSize(), QIcon::Normal, QIcon::Off); RBSphere->setIcon(icon); - gridLayout2->addWidget(RBSphere, 0, 3, 1, 1); + gridLayout1->addWidget(RBSphere, 0, 3, 1, 1); RBPipe = new QRadioButton(TypeZone); RBPipe->setObjectName(QString::fromUtf8("RBPipe")); - const QIcon icon1 = QIcon(QString::fromUtf8("../../resources/pipe.png")); + QIcon icon1; + icon1.addFile(QString::fromUtf8("../../resources/pipe.png"), QSize(), QIcon::Normal, QIcon::Off); RBPipe->setIcon(icon1); - gridLayout2->addWidget(RBPipe, 0, 2, 1, 1); + gridLayout1->addWidget(RBPipe, 0, 2, 1, 1); RBCylinder = new QRadioButton(TypeZone); RBCylinder->setObjectName(QString::fromUtf8("RBCylinder")); - const QIcon icon2 = QIcon(QString::fromUtf8("../../resources/cylinderpointvector.png")); + QIcon icon2; + icon2.addFile(QString::fromUtf8("../../resources/cylinderpointvector.png"), QSize(), QIcon::Normal, QIcon::Off); RBCylinder->setIcon(icon2); - gridLayout2->addWidget(RBCylinder, 0, 1, 1, 1); + gridLayout1->addWidget(RBCylinder, 0, 1, 1, 1); RBBox = new QRadioButton(TypeZone); RBBox->setObjectName(QString::fromUtf8("RBBox")); - const QIcon icon3 = QIcon(QString::fromUtf8("../../resources/zone_boxdxyz.png")); + QIcon icon3; + icon3.addFile(QString::fromUtf8("../../resources/zone_boxdxyz.png"), QSize(), QIcon::Normal, QIcon::Off); RBBox->setIcon(icon3); RBBox->setCheckable(true); RBBox->setChecked(true); - gridLayout2->addWidget(RBBox, 0, 0, 1, 1); + gridLayout1->addWidget(RBBox, 0, 0, 1, 1); - gridLayout->addWidget(TypeZone, 1, 0, 1, 2); + gridLayout->addWidget(TypeZone, 1, 0, 1, 4); - gBCylindre = new QGroupBox(CreateZone); - gBCylindre->setObjectName(QString::fromUtf8("gBCylindre")); - sizePolicy.setHeightForWidth(gBCylindre->sizePolicy().hasHeightForWidth()); - gBCylindre->setSizePolicy(sizePolicy); - gBCylindre->setFocusPolicy(Qt::TabFocus); - gridLayout3 = new QGridLayout(gBCylindre); + horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + + gridLayout->addItem(horizontalSpacer_2, 1, 4, 1, 1); + + gBBox = new QGroupBox(CreateZone); + gBBox->setObjectName(QString::fromUtf8("gBBox")); + sizePolicy.setHeightForWidth(gBBox->sizePolicy().hasHeightForWidth()); + gBBox->setSizePolicy(sizePolicy); + gridLayout2 = new QGridLayout(gBBox); #ifndef Q_OS_MAC - gridLayout3->setSpacing(6); + gridLayout2->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout3->setContentsMargins(9, 9, 9, 9); + gridLayout2->setContentsMargins(9, 9, 9, 9); #endif - gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); - SpinBox_Haut = new QDoubleSpinBox(gBCylindre); - SpinBox_Haut->setObjectName(QString::fromUtf8("SpinBox_Haut")); - SpinBox_Haut->setDecimals(5); - SpinBox_Haut->setMaximum(1e+09); - - gridLayout3->addWidget(SpinBox_Haut, 4, 1, 1, 1); - - TLHaut = new QLabel(gBCylindre); - TLHaut->setObjectName(QString::fromUtf8("TLHaut")); - sizePolicy.setHeightForWidth(TLHaut->sizePolicy().hasHeightForWidth()); - TLHaut->setSizePolicy(sizePolicy); - TLHaut->setWordWrap(false); - - gridLayout3->addWidget(TLHaut, 4, 0, 1, 1); - - TLRadius = new QLabel(gBCylindre); - TLRadius->setObjectName(QString::fromUtf8("TLRadius")); - sizePolicy.setHeightForWidth(TLRadius->sizePolicy().hasHeightForWidth()); - TLRadius->setSizePolicy(sizePolicy); - TLRadius->setWordWrap(false); - - gridLayout3->addWidget(TLRadius, 3, 0, 1, 1); - - SpinBox_Xaxis = new QDoubleSpinBox(gBCylindre); - SpinBox_Xaxis->setObjectName(QString::fromUtf8("SpinBox_Xaxis")); - SpinBox_Xaxis->setDecimals(5); - SpinBox_Xaxis->setMaximum(1e+09); - SpinBox_Xaxis->setMinimum(-1e+09); - SpinBox_Xaxis->setValue(0); - - gridLayout3->addWidget(SpinBox_Xaxis, 0, 3, 1, 1); - - SpinBox_Yaxis = new QDoubleSpinBox(gBCylindre); - SpinBox_Yaxis->setObjectName(QString::fromUtf8("SpinBox_Yaxis")); - SpinBox_Yaxis->setDecimals(5); - SpinBox_Yaxis->setMaximum(1e+09); - SpinBox_Yaxis->setMinimum(-1e+09); - SpinBox_Yaxis->setValue(0); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + TLXmini = new QLabel(gBBox); + TLXmini->setObjectName(QString::fromUtf8("TLXmini")); + sizePolicy.setHeightForWidth(TLXmini->sizePolicy().hasHeightForWidth()); + TLXmini->setSizePolicy(sizePolicy); + TLXmini->setWordWrap(false); - gridLayout3->addWidget(SpinBox_Yaxis, 1, 3, 1, 1); + gridLayout2->addWidget(TLXmini, 0, 0, 1, 1); - SpinBox_Zaxis = new QDoubleSpinBox(gBCylindre); - SpinBox_Zaxis->setObjectName(QString::fromUtf8("SpinBox_Zaxis")); - SpinBox_Zaxis->setDecimals(5); - SpinBox_Zaxis->setMaximum(1e+09); - SpinBox_Zaxis->setMinimum(-1e+09); - SpinBox_Zaxis->setValue(0); + SpinBox_Xmini = new QDoubleSpinBox(gBBox); + SpinBox_Xmini->setObjectName(QString::fromUtf8("SpinBox_Xmini")); + SpinBox_Xmini->setDecimals(5); + SpinBox_Xmini->setMinimum(-1e+09); + SpinBox_Xmini->setMaximum(1e+09); + SpinBox_Xmini->setValue(0); - gridLayout3->addWidget(SpinBox_Zaxis, 2, 3, 1, 1); + gridLayout2->addWidget(SpinBox_Xmini, 0, 1, 1, 1); - TLZaxis = new QLabel(gBCylindre); - TLZaxis->setObjectName(QString::fromUtf8("TLZaxis")); - sizePolicy.setHeightForWidth(TLZaxis->sizePolicy().hasHeightForWidth()); - TLZaxis->setSizePolicy(sizePolicy); - TLZaxis->setWordWrap(false); + TLYmini = new QLabel(gBBox); + TLYmini->setObjectName(QString::fromUtf8("TLYmini")); + sizePolicy.setHeightForWidth(TLYmini->sizePolicy().hasHeightForWidth()); + TLYmini->setSizePolicy(sizePolicy); + TLYmini->setWordWrap(false); - gridLayout3->addWidget(TLZaxis, 2, 2, 1, 1); + gridLayout2->addWidget(TLYmini, 1, 0, 1, 1); - TLYaxis = new QLabel(gBCylindre); - TLYaxis->setObjectName(QString::fromUtf8("TLYaxis")); - sizePolicy.setHeightForWidth(TLYaxis->sizePolicy().hasHeightForWidth()); - TLYaxis->setSizePolicy(sizePolicy); - TLYaxis->setWordWrap(false); + SpinBox_Ymini = new QDoubleSpinBox(gBBox); + SpinBox_Ymini->setObjectName(QString::fromUtf8("SpinBox_Ymini")); + SpinBox_Ymini->setDecimals(5); + SpinBox_Ymini->setMinimum(-1e+09); + SpinBox_Ymini->setMaximum(1e+09); + SpinBox_Ymini->setValue(0); - gridLayout3->addWidget(TLYaxis, 1, 2, 1, 1); + gridLayout2->addWidget(SpinBox_Ymini, 1, 1, 1, 1); - TLXaxis = new QLabel(gBCylindre); - TLXaxis->setObjectName(QString::fromUtf8("TLXaxis")); - sizePolicy.setHeightForWidth(TLXaxis->sizePolicy().hasHeightForWidth()); - TLXaxis->setSizePolicy(sizePolicy); - TLXaxis->setWordWrap(false); + TLZmini = new QLabel(gBBox); + TLZmini->setObjectName(QString::fromUtf8("TLZmini")); + sizePolicy.setHeightForWidth(TLZmini->sizePolicy().hasHeightForWidth()); + TLZmini->setSizePolicy(sizePolicy); + TLZmini->setWordWrap(false); - gridLayout3->addWidget(TLXaxis, 0, 2, 1, 1); + gridLayout2->addWidget(TLZmini, 2, 0, 1, 1); - SpinBox_Ybase = new QDoubleSpinBox(gBCylindre); - SpinBox_Ybase->setObjectName(QString::fromUtf8("SpinBox_Ybase")); - SpinBox_Ybase->setDecimals(5); - SpinBox_Ybase->setMaximum(1e+09); - SpinBox_Ybase->setMinimum(-1e+09); - SpinBox_Ybase->setValue(0); + SpinBox_Zmini = new QDoubleSpinBox(gBBox); + SpinBox_Zmini->setObjectName(QString::fromUtf8("SpinBox_Zmini")); + SpinBox_Zmini->setDecimals(5); + SpinBox_Zmini->setMinimum(-1e+09); + SpinBox_Zmini->setMaximum(1e+09); + SpinBox_Zmini->setValue(0); - gridLayout3->addWidget(SpinBox_Ybase, 1, 1, 1, 1); + gridLayout2->addWidget(SpinBox_Zmini, 2, 1, 1, 1); - TLYbase = new QLabel(gBCylindre); - TLYbase->setObjectName(QString::fromUtf8("TLYbase")); - sizePolicy.setHeightForWidth(TLYbase->sizePolicy().hasHeightForWidth()); - TLYbase->setSizePolicy(sizePolicy); - TLYbase->setWordWrap(false); + TLXmaxi = new QLabel(gBBox); + TLXmaxi->setObjectName(QString::fromUtf8("TLXmaxi")); + sizePolicy.setHeightForWidth(TLXmaxi->sizePolicy().hasHeightForWidth()); + TLXmaxi->setSizePolicy(sizePolicy); + TLXmaxi->setWordWrap(false); - gridLayout3->addWidget(TLYbase, 1, 0, 1, 1); + gridLayout2->addWidget(TLXmaxi, 0, 2, 1, 1); - TLZbase = new QLabel(gBCylindre); - TLZbase->setObjectName(QString::fromUtf8("TLZbase")); - sizePolicy.setHeightForWidth(TLZbase->sizePolicy().hasHeightForWidth()); - TLZbase->setSizePolicy(sizePolicy); - TLZbase->setWordWrap(false); + TLZmaxi = new QLabel(gBBox); + TLZmaxi->setObjectName(QString::fromUtf8("TLZmaxi")); + sizePolicy.setHeightForWidth(TLZmaxi->sizePolicy().hasHeightForWidth()); + TLZmaxi->setSizePolicy(sizePolicy); + TLZmaxi->setWordWrap(false); - gridLayout3->addWidget(TLZbase, 2, 0, 1, 1); + gridLayout2->addWidget(TLZmaxi, 2, 2, 1, 1); - SpinBox_Zbase = new QDoubleSpinBox(gBCylindre); - SpinBox_Zbase->setObjectName(QString::fromUtf8("SpinBox_Zbase")); - SpinBox_Zbase->setDecimals(5); - SpinBox_Zbase->setMaximum(1e+09); - SpinBox_Zbase->setMinimum(-1e+09); - SpinBox_Zbase->setValue(0); + SpinBox_Zmaxi = new QDoubleSpinBox(gBBox); + SpinBox_Zmaxi->setObjectName(QString::fromUtf8("SpinBox_Zmaxi")); + SpinBox_Zmaxi->setDecimals(5); + SpinBox_Zmaxi->setMinimum(-1e+09); + SpinBox_Zmaxi->setMaximum(1e+09); + SpinBox_Zmaxi->setValue(0); - gridLayout3->addWidget(SpinBox_Zbase, 2, 1, 1, 1); + gridLayout2->addWidget(SpinBox_Zmaxi, 2, 3, 1, 1); - SpinBox_Radius = new QDoubleSpinBox(gBCylindre); - SpinBox_Radius->setObjectName(QString::fromUtf8("SpinBox_Radius")); - SpinBox_Radius->setDecimals(5); - SpinBox_Radius->setMaximum(1e+09); + TLYmaxi = new QLabel(gBBox); + TLYmaxi->setObjectName(QString::fromUtf8("TLYmaxi")); + sizePolicy.setHeightForWidth(TLYmaxi->sizePolicy().hasHeightForWidth()); + TLYmaxi->setSizePolicy(sizePolicy); + TLYmaxi->setWordWrap(false); - gridLayout3->addWidget(SpinBox_Radius, 3, 1, 1, 1); + gridLayout2->addWidget(TLYmaxi, 1, 2, 1, 1); - TLXbase = new QLabel(gBCylindre); - TLXbase->setObjectName(QString::fromUtf8("TLXbase")); - sizePolicy.setHeightForWidth(TLXbase->sizePolicy().hasHeightForWidth()); - TLXbase->setSizePolicy(sizePolicy); - TLXbase->setWordWrap(false); + SpinBox_Xmaxi = new QDoubleSpinBox(gBBox); + SpinBox_Xmaxi->setObjectName(QString::fromUtf8("SpinBox_Xmaxi")); + SpinBox_Xmaxi->setDecimals(5); + SpinBox_Xmaxi->setMinimum(-1e+09); + SpinBox_Xmaxi->setMaximum(1e+09); + SpinBox_Xmaxi->setValue(0); - gridLayout3->addWidget(TLXbase, 0, 0, 1, 1); + gridLayout2->addWidget(SpinBox_Xmaxi, 0, 3, 1, 1); - SpinBox_Xbase = new QDoubleSpinBox(gBCylindre); - SpinBox_Xbase->setObjectName(QString::fromUtf8("SpinBox_Xbase")); - SpinBox_Xbase->setDecimals(5); - SpinBox_Xbase->setMaximum(1e+09); - SpinBox_Xbase->setMinimum(-1e+09); - SpinBox_Xbase->setValue(0); + SpinBox_Ymaxi = new QDoubleSpinBox(gBBox); + SpinBox_Ymaxi->setObjectName(QString::fromUtf8("SpinBox_Ymaxi")); + SpinBox_Ymaxi->setDecimals(5); + SpinBox_Ymaxi->setMinimum(-1e+09); + SpinBox_Ymaxi->setMaximum(1e+09); + SpinBox_Ymaxi->setValue(0); - gridLayout3->addWidget(SpinBox_Xbase, 0, 1, 1, 1); + gridLayout2->addWidget(SpinBox_Ymaxi, 1, 3, 1, 1); - gridLayout->addWidget(gBCylindre, 4, 0, 1, 2); + gridLayout->addWidget(gBBox, 2, 0, 1, 4); gBSphere = new QGroupBox(CreateZone); gBSphere->setObjectName(QString::fromUtf8("gBSphere")); sizePolicy.setHeightForWidth(gBSphere->sizePolicy().hasHeightForWidth()); gBSphere->setSizePolicy(sizePolicy); - gridLayout4 = new QGridLayout(gBSphere); + gridLayout3 = new QGridLayout(gBSphere); #ifndef Q_OS_MAC - gridLayout4->setSpacing(6); + gridLayout3->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout4->setContentsMargins(9, 9, 9, 9); + gridLayout3->setContentsMargins(9, 9, 9, 9); #endif - gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); TLXcentre = new QLabel(gBSphere); TLXcentre->setObjectName(QString::fromUtf8("TLXcentre")); sizePolicy.setHeightForWidth(TLXcentre->sizePolicy().hasHeightForWidth()); TLXcentre->setSizePolicy(sizePolicy); TLXcentre->setWordWrap(false); - gridLayout4->addWidget(TLXcentre, 0, 0, 1, 1); + gridLayout3->addWidget(TLXcentre, 0, 0, 1, 1); SpinBox_Xcentre = new QDoubleSpinBox(gBSphere); SpinBox_Xcentre->setObjectName(QString::fromUtf8("SpinBox_Xcentre")); SpinBox_Xcentre->setDecimals(5); - SpinBox_Xcentre->setMaximum(1e+09); SpinBox_Xcentre->setMinimum(-1e+09); + SpinBox_Xcentre->setMaximum(1e+09); SpinBox_Xcentre->setValue(0); - gridLayout4->addWidget(SpinBox_Xcentre, 0, 1, 1, 1); + gridLayout3->addWidget(SpinBox_Xcentre, 0, 1, 1, 1); TLYcentre = new QLabel(gBSphere); TLYcentre->setObjectName(QString::fromUtf8("TLYcentre")); @@ -389,16 +346,16 @@ public: TLYcentre->setSizePolicy(sizePolicy); TLYcentre->setWordWrap(false); - gridLayout4->addWidget(TLYcentre, 1, 0, 1, 1); + gridLayout3->addWidget(TLYcentre, 1, 0, 1, 1); SpinBox_Ycentre = new QDoubleSpinBox(gBSphere); SpinBox_Ycentre->setObjectName(QString::fromUtf8("SpinBox_Ycentre")); SpinBox_Ycentre->setDecimals(5); - SpinBox_Ycentre->setMaximum(1e+09); SpinBox_Ycentre->setMinimum(-1e+09); + SpinBox_Ycentre->setMaximum(1e+09); SpinBox_Ycentre->setValue(0); - gridLayout4->addWidget(SpinBox_Ycentre, 1, 1, 1, 1); + gridLayout3->addWidget(SpinBox_Ycentre, 1, 1, 1, 1); TLRayon = new QLabel(gBSphere); TLRayon->setObjectName(QString::fromUtf8("TLRayon")); @@ -406,16 +363,16 @@ public: TLRayon->setSizePolicy(sizePolicy); TLRayon->setWordWrap(false); - gridLayout4->addWidget(TLRayon, 1, 2, 1, 1); + gridLayout3->addWidget(TLRayon, 1, 2, 1, 1); SpinBox_Rayon = new QDoubleSpinBox(gBSphere); SpinBox_Rayon->setObjectName(QString::fromUtf8("SpinBox_Rayon")); SpinBox_Rayon->setDecimals(5); - SpinBox_Rayon->setMaximum(1e+09); SpinBox_Rayon->setMinimum(-1e+09); + SpinBox_Rayon->setMaximum(1e+09); SpinBox_Rayon->setValue(0); - gridLayout4->addWidget(SpinBox_Rayon, 1, 3, 1, 1); + gridLayout3->addWidget(SpinBox_Rayon, 1, 3, 1, 1); TLZcentre = new QLabel(gBSphere); TLZcentre->setObjectName(QString::fromUtf8("TLZcentre")); @@ -423,176 +380,196 @@ public: TLZcentre->setSizePolicy(sizePolicy); TLZcentre->setWordWrap(false); - gridLayout4->addWidget(TLZcentre, 2, 0, 1, 1); + gridLayout3->addWidget(TLZcentre, 2, 0, 1, 1); SpinBox_Zcentre = new QDoubleSpinBox(gBSphere); SpinBox_Zcentre->setObjectName(QString::fromUtf8("SpinBox_Zcentre")); SpinBox_Zcentre->setDecimals(5); - SpinBox_Zcentre->setMaximum(1e+09); SpinBox_Zcentre->setMinimum(-1e+09); + SpinBox_Zcentre->setMaximum(1e+09); SpinBox_Zcentre->setValue(0); - gridLayout4->addWidget(SpinBox_Zcentre, 2, 1, 1, 1); + gridLayout3->addWidget(SpinBox_Zcentre, 2, 1, 1, 1); - gridLayout->addWidget(gBSphere, 3, 0, 1, 2); + gridLayout->addWidget(gBSphere, 3, 0, 1, 4); - gBBox = new QGroupBox(CreateZone); - gBBox->setObjectName(QString::fromUtf8("gBBox")); - sizePolicy.setHeightForWidth(gBBox->sizePolicy().hasHeightForWidth()); - gBBox->setSizePolicy(sizePolicy); - gridLayout5 = new QGridLayout(gBBox); + gBCylindre = new QGroupBox(CreateZone); + gBCylindre->setObjectName(QString::fromUtf8("gBCylindre")); + sizePolicy.setHeightForWidth(gBCylindre->sizePolicy().hasHeightForWidth()); + gBCylindre->setSizePolicy(sizePolicy); + gBCylindre->setFocusPolicy(Qt::TabFocus); + gridLayout4 = new QGridLayout(gBCylindre); #ifndef Q_OS_MAC - gridLayout5->setSpacing(6); + gridLayout4->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout5->setContentsMargins(9, 9, 9, 9); + gridLayout4->setContentsMargins(9, 9, 9, 9); #endif - gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); - TLXmini = new QLabel(gBBox); - TLXmini->setObjectName(QString::fromUtf8("TLXmini")); - sizePolicy.setHeightForWidth(TLXmini->sizePolicy().hasHeightForWidth()); - TLXmini->setSizePolicy(sizePolicy); - TLXmini->setWordWrap(false); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); + SpinBox_Haut = new QDoubleSpinBox(gBCylindre); + SpinBox_Haut->setObjectName(QString::fromUtf8("SpinBox_Haut")); + SpinBox_Haut->setDecimals(5); + SpinBox_Haut->setMaximum(1e+09); - gridLayout5->addWidget(TLXmini, 0, 0, 1, 1); + gridLayout4->addWidget(SpinBox_Haut, 4, 1, 1, 1); - SpinBox_Xmini = new QDoubleSpinBox(gBBox); - SpinBox_Xmini->setObjectName(QString::fromUtf8("SpinBox_Xmini")); - SpinBox_Xmini->setDecimals(5); - SpinBox_Xmini->setMaximum(1e+09); - SpinBox_Xmini->setMinimum(-1e+09); - SpinBox_Xmini->setValue(0); + TLHaut = new QLabel(gBCylindre); + TLHaut->setObjectName(QString::fromUtf8("TLHaut")); + sizePolicy.setHeightForWidth(TLHaut->sizePolicy().hasHeightForWidth()); + TLHaut->setSizePolicy(sizePolicy); + TLHaut->setWordWrap(false); - gridLayout5->addWidget(SpinBox_Xmini, 0, 1, 1, 1); + gridLayout4->addWidget(TLHaut, 4, 0, 1, 1); - TLYmini = new QLabel(gBBox); - TLYmini->setObjectName(QString::fromUtf8("TLYmini")); - sizePolicy.setHeightForWidth(TLYmini->sizePolicy().hasHeightForWidth()); - TLYmini->setSizePolicy(sizePolicy); - TLYmini->setWordWrap(false); + TLRadius = new QLabel(gBCylindre); + TLRadius->setObjectName(QString::fromUtf8("TLRadius")); + sizePolicy.setHeightForWidth(TLRadius->sizePolicy().hasHeightForWidth()); + TLRadius->setSizePolicy(sizePolicy); + TLRadius->setWordWrap(false); - gridLayout5->addWidget(TLYmini, 1, 0, 1, 1); + gridLayout4->addWidget(TLRadius, 3, 0, 1, 1); - SpinBox_Ymini = new QDoubleSpinBox(gBBox); - SpinBox_Ymini->setObjectName(QString::fromUtf8("SpinBox_Ymini")); - SpinBox_Ymini->setDecimals(5); - SpinBox_Ymini->setMaximum(1e+09); - SpinBox_Ymini->setMinimum(-1e+09); - SpinBox_Ymini->setValue(0); + SpinBox_Xaxis = new QDoubleSpinBox(gBCylindre); + SpinBox_Xaxis->setObjectName(QString::fromUtf8("SpinBox_Xaxis")); + SpinBox_Xaxis->setDecimals(5); + SpinBox_Xaxis->setMinimum(-1e+09); + SpinBox_Xaxis->setMaximum(1e+09); + SpinBox_Xaxis->setValue(0); - gridLayout5->addWidget(SpinBox_Ymini, 1, 1, 1, 1); + gridLayout4->addWidget(SpinBox_Xaxis, 0, 3, 1, 1); - TLZmini = new QLabel(gBBox); - TLZmini->setObjectName(QString::fromUtf8("TLZmini")); - sizePolicy.setHeightForWidth(TLZmini->sizePolicy().hasHeightForWidth()); - TLZmini->setSizePolicy(sizePolicy); - TLZmini->setWordWrap(false); + SpinBox_Yaxis = new QDoubleSpinBox(gBCylindre); + SpinBox_Yaxis->setObjectName(QString::fromUtf8("SpinBox_Yaxis")); + SpinBox_Yaxis->setDecimals(5); + SpinBox_Yaxis->setMinimum(-1e+09); + SpinBox_Yaxis->setMaximum(1e+09); + SpinBox_Yaxis->setValue(0); - gridLayout5->addWidget(TLZmini, 2, 0, 1, 1); + gridLayout4->addWidget(SpinBox_Yaxis, 1, 3, 1, 1); - SpinBox_Zmini = new QDoubleSpinBox(gBBox); - SpinBox_Zmini->setObjectName(QString::fromUtf8("SpinBox_Zmini")); - SpinBox_Zmini->setDecimals(5); - SpinBox_Zmini->setMaximum(1e+09); - SpinBox_Zmini->setMinimum(-1e+09); - SpinBox_Zmini->setValue(0); + SpinBox_Zaxis = new QDoubleSpinBox(gBCylindre); + SpinBox_Zaxis->setObjectName(QString::fromUtf8("SpinBox_Zaxis")); + SpinBox_Zaxis->setDecimals(5); + SpinBox_Zaxis->setMinimum(-1e+09); + SpinBox_Zaxis->setMaximum(1e+09); + SpinBox_Zaxis->setValue(0); - gridLayout5->addWidget(SpinBox_Zmini, 2, 1, 1, 1); + gridLayout4->addWidget(SpinBox_Zaxis, 2, 3, 1, 1); - TLXmaxi = new QLabel(gBBox); - TLXmaxi->setObjectName(QString::fromUtf8("TLXmaxi")); - sizePolicy.setHeightForWidth(TLXmaxi->sizePolicy().hasHeightForWidth()); - TLXmaxi->setSizePolicy(sizePolicy); - TLXmaxi->setWordWrap(false); + TLZaxis = new QLabel(gBCylindre); + TLZaxis->setObjectName(QString::fromUtf8("TLZaxis")); + sizePolicy.setHeightForWidth(TLZaxis->sizePolicy().hasHeightForWidth()); + TLZaxis->setSizePolicy(sizePolicy); + TLZaxis->setWordWrap(false); - gridLayout5->addWidget(TLXmaxi, 0, 2, 1, 1); + gridLayout4->addWidget(TLZaxis, 2, 2, 1, 1); - TLZmaxi = new QLabel(gBBox); - TLZmaxi->setObjectName(QString::fromUtf8("TLZmaxi")); - sizePolicy.setHeightForWidth(TLZmaxi->sizePolicy().hasHeightForWidth()); - TLZmaxi->setSizePolicy(sizePolicy); - TLZmaxi->setWordWrap(false); + TLYaxis = new QLabel(gBCylindre); + TLYaxis->setObjectName(QString::fromUtf8("TLYaxis")); + sizePolicy.setHeightForWidth(TLYaxis->sizePolicy().hasHeightForWidth()); + TLYaxis->setSizePolicy(sizePolicy); + TLYaxis->setWordWrap(false); - gridLayout5->addWidget(TLZmaxi, 2, 2, 1, 1); + gridLayout4->addWidget(TLYaxis, 1, 2, 1, 1); - SpinBox_Zmaxi = new QDoubleSpinBox(gBBox); - SpinBox_Zmaxi->setObjectName(QString::fromUtf8("SpinBox_Zmaxi")); - SpinBox_Zmaxi->setDecimals(5); - SpinBox_Zmaxi->setMaximum(1e+09); - SpinBox_Zmaxi->setMinimum(-1e+09); - SpinBox_Zmaxi->setValue(0); + TLXaxis = new QLabel(gBCylindre); + TLXaxis->setObjectName(QString::fromUtf8("TLXaxis")); + sizePolicy.setHeightForWidth(TLXaxis->sizePolicy().hasHeightForWidth()); + TLXaxis->setSizePolicy(sizePolicy); + TLXaxis->setWordWrap(false); - gridLayout5->addWidget(SpinBox_Zmaxi, 2, 3, 1, 1); + gridLayout4->addWidget(TLXaxis, 0, 2, 1, 1); - TLYmaxi = new QLabel(gBBox); - TLYmaxi->setObjectName(QString::fromUtf8("TLYmaxi")); - sizePolicy.setHeightForWidth(TLYmaxi->sizePolicy().hasHeightForWidth()); - TLYmaxi->setSizePolicy(sizePolicy); - TLYmaxi->setWordWrap(false); + SpinBox_Ybase = new QDoubleSpinBox(gBCylindre); + SpinBox_Ybase->setObjectName(QString::fromUtf8("SpinBox_Ybase")); + SpinBox_Ybase->setDecimals(5); + SpinBox_Ybase->setMinimum(-1e+09); + SpinBox_Ybase->setMaximum(1e+09); + SpinBox_Ybase->setValue(0); - gridLayout5->addWidget(TLYmaxi, 1, 2, 1, 1); + gridLayout4->addWidget(SpinBox_Ybase, 1, 1, 1, 1); - SpinBox_Xmaxi = new QDoubleSpinBox(gBBox); - SpinBox_Xmaxi->setObjectName(QString::fromUtf8("SpinBox_Xmaxi")); - SpinBox_Xmaxi->setDecimals(5); - SpinBox_Xmaxi->setMaximum(1e+09); - SpinBox_Xmaxi->setMinimum(-1e+09); - SpinBox_Xmaxi->setValue(0); + TLYbase = new QLabel(gBCylindre); + TLYbase->setObjectName(QString::fromUtf8("TLYbase")); + sizePolicy.setHeightForWidth(TLYbase->sizePolicy().hasHeightForWidth()); + TLYbase->setSizePolicy(sizePolicy); + TLYbase->setWordWrap(false); - gridLayout5->addWidget(SpinBox_Xmaxi, 0, 3, 1, 1); + gridLayout4->addWidget(TLYbase, 1, 0, 1, 1); - SpinBox_Ymaxi = new QDoubleSpinBox(gBBox); - SpinBox_Ymaxi->setObjectName(QString::fromUtf8("SpinBox_Ymaxi")); - SpinBox_Ymaxi->setDecimals(5); - SpinBox_Ymaxi->setMaximum(1e+09); - SpinBox_Ymaxi->setMinimum(-1e+09); - SpinBox_Ymaxi->setValue(0); + TLZbase = new QLabel(gBCylindre); + TLZbase->setObjectName(QString::fromUtf8("TLZbase")); + sizePolicy.setHeightForWidth(TLZbase->sizePolicy().hasHeightForWidth()); + TLZbase->setSizePolicy(sizePolicy); + TLZbase->setWordWrap(false); - gridLayout5->addWidget(SpinBox_Ymaxi, 1, 3, 1, 1); + gridLayout4->addWidget(TLZbase, 2, 0, 1, 1); + SpinBox_Zbase = new QDoubleSpinBox(gBCylindre); + SpinBox_Zbase->setObjectName(QString::fromUtf8("SpinBox_Zbase")); + SpinBox_Zbase->setDecimals(5); + SpinBox_Zbase->setMinimum(-1e+09); + SpinBox_Zbase->setMaximum(1e+09); + SpinBox_Zbase->setValue(0); - gridLayout->addWidget(gBBox, 2, 0, 1, 2); + gridLayout4->addWidget(SpinBox_Zbase, 2, 1, 1, 1); - LEName = new QLineEdit(CreateZone); - LEName->setObjectName(QString::fromUtf8("LEName")); - LEName->setMaxLength(32); + SpinBox_Radius = new QDoubleSpinBox(gBCylindre); + SpinBox_Radius->setObjectName(QString::fromUtf8("SpinBox_Radius")); + SpinBox_Radius->setDecimals(5); + SpinBox_Radius->setMaximum(1e+09); - gridLayout->addWidget(LEName, 0, 1, 1, 1); + gridLayout4->addWidget(SpinBox_Radius, 3, 1, 1, 1); - Name = new QLabel(CreateZone); - Name->setObjectName(QString::fromUtf8("Name")); + TLXbase = new QLabel(gBCylindre); + TLXbase->setObjectName(QString::fromUtf8("TLXbase")); + sizePolicy.setHeightForWidth(TLXbase->sizePolicy().hasHeightForWidth()); + TLXbase->setSizePolicy(sizePolicy); + TLXbase->setWordWrap(false); - gridLayout->addWidget(Name, 0, 0, 1, 1); + gridLayout4->addWidget(TLXbase, 0, 0, 1, 1); + + SpinBox_Xbase = new QDoubleSpinBox(gBCylindre); + SpinBox_Xbase->setObjectName(QString::fromUtf8("SpinBox_Xbase")); + SpinBox_Xbase->setDecimals(5); + SpinBox_Xbase->setMinimum(-1e+09); + SpinBox_Xbase->setMaximum(1e+09); + SpinBox_Xbase->setValue(0); + + gridLayout4->addWidget(SpinBox_Xbase, 0, 1, 1, 1); + + + gridLayout->addWidget(gBCylindre, 4, 0, 1, 4); gBPipe = new QGroupBox(CreateZone); gBPipe->setObjectName(QString::fromUtf8("gBPipe")); sizePolicy.setHeightForWidth(gBPipe->sizePolicy().hasHeightForWidth()); gBPipe->setSizePolicy(sizePolicy); - gridLayout6 = new QGridLayout(gBPipe); + gridLayout5 = new QGridLayout(gBPipe); #ifndef Q_OS_MAC - gridLayout6->setSpacing(6); + gridLayout5->setSpacing(6); #endif #ifndef Q_OS_MAC - gridLayout6->setContentsMargins(9, 9, 9, 9); + gridLayout5->setContentsMargins(9, 9, 9, 9); #endif - gridLayout6->setObjectName(QString::fromUtf8("gridLayout6")); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); TLHaut_p = new QLabel(gBPipe); TLHaut_p->setObjectName(QString::fromUtf8("TLHaut_p")); sizePolicy.setHeightForWidth(TLHaut_p->sizePolicy().hasHeightForWidth()); TLHaut_p->setSizePolicy(sizePolicy); TLHaut_p->setWordWrap(false); - gridLayout6->addWidget(TLHaut_p, 4, 0, 1, 1); + gridLayout5->addWidget(TLHaut_p, 4, 0, 1, 1); SpinBox_Xbase_p = new QDoubleSpinBox(gBPipe); SpinBox_Xbase_p->setObjectName(QString::fromUtf8("SpinBox_Xbase_p")); SpinBox_Xbase_p->setDecimals(5); - SpinBox_Xbase_p->setMaximum(1e+09); SpinBox_Xbase_p->setMinimum(-1e+09); + SpinBox_Xbase_p->setMaximum(1e+09); SpinBox_Xbase_p->setValue(0); - gridLayout6->addWidget(SpinBox_Xbase_p, 0, 1, 1, 1); + gridLayout5->addWidget(SpinBox_Xbase_p, 0, 1, 1, 1); TLXbase_p = new QLabel(gBPipe); TLXbase_p->setObjectName(QString::fromUtf8("TLXbase_p")); @@ -600,23 +577,23 @@ public: TLXbase_p->setSizePolicy(sizePolicy); TLXbase_p->setWordWrap(false); - gridLayout6->addWidget(TLXbase_p, 0, 0, 1, 1); + gridLayout5->addWidget(TLXbase_p, 0, 0, 1, 1); SpinBox_Radius_int = new QDoubleSpinBox(gBPipe); SpinBox_Radius_int->setObjectName(QString::fromUtf8("SpinBox_Radius_int")); SpinBox_Radius_int->setDecimals(5); SpinBox_Radius_int->setMaximum(1e+09); - gridLayout6->addWidget(SpinBox_Radius_int, 3, 1, 1, 1); + gridLayout5->addWidget(SpinBox_Radius_int, 3, 1, 1, 1); SpinBox_Zbase_p = new QDoubleSpinBox(gBPipe); SpinBox_Zbase_p->setObjectName(QString::fromUtf8("SpinBox_Zbase_p")); SpinBox_Zbase_p->setDecimals(5); - SpinBox_Zbase_p->setMaximum(1e+09); SpinBox_Zbase_p->setMinimum(-1e+09); + SpinBox_Zbase_p->setMaximum(1e+09); SpinBox_Zbase_p->setValue(0); - gridLayout6->addWidget(SpinBox_Zbase_p, 2, 1, 1, 1); + gridLayout5->addWidget(SpinBox_Zbase_p, 2, 1, 1, 1); TLRadius_int = new QLabel(gBPipe); TLRadius_int->setObjectName(QString::fromUtf8("TLRadius_int")); @@ -624,7 +601,7 @@ public: TLRadius_int->setSizePolicy(sizePolicy); TLRadius_int->setWordWrap(false); - gridLayout6->addWidget(TLRadius_int, 3, 0, 1, 1); + gridLayout5->addWidget(TLRadius_int, 3, 0, 1, 1); TLZbase_p = new QLabel(gBPipe); TLZbase_p->setObjectName(QString::fromUtf8("TLZbase_p")); @@ -632,7 +609,7 @@ public: TLZbase_p->setSizePolicy(sizePolicy); TLZbase_p->setWordWrap(false); - gridLayout6->addWidget(TLZbase_p, 2, 0, 1, 1); + gridLayout5->addWidget(TLZbase_p, 2, 0, 1, 1); TLYbase_p = new QLabel(gBPipe); TLYbase_p->setObjectName(QString::fromUtf8("TLYbase_p")); @@ -640,16 +617,16 @@ public: TLYbase_p->setSizePolicy(sizePolicy); TLYbase_p->setWordWrap(false); - gridLayout6->addWidget(TLYbase_p, 1, 0, 1, 1); + gridLayout5->addWidget(TLYbase_p, 1, 0, 1, 1); SpinBox_Ybase_p = new QDoubleSpinBox(gBPipe); SpinBox_Ybase_p->setObjectName(QString::fromUtf8("SpinBox_Ybase_p")); SpinBox_Ybase_p->setDecimals(5); - SpinBox_Ybase_p->setMaximum(1e+09); SpinBox_Ybase_p->setMinimum(-1e+09); + SpinBox_Ybase_p->setMaximum(1e+09); SpinBox_Ybase_p->setValue(0); - gridLayout6->addWidget(SpinBox_Ybase_p, 1, 1, 1, 1); + gridLayout5->addWidget(SpinBox_Ybase_p, 1, 1, 1, 1); TLXaxis_p = new QLabel(gBPipe); TLXaxis_p->setObjectName(QString::fromUtf8("TLXaxis_p")); @@ -657,7 +634,7 @@ public: TLXaxis_p->setSizePolicy(sizePolicy); TLXaxis_p->setWordWrap(false); - gridLayout6->addWidget(TLXaxis_p, 0, 2, 1, 1); + gridLayout5->addWidget(TLXaxis_p, 0, 2, 1, 1); TLYaxis_p = new QLabel(gBPipe); TLYaxis_p->setObjectName(QString::fromUtf8("TLYaxis_p")); @@ -665,7 +642,7 @@ public: TLYaxis_p->setSizePolicy(sizePolicy); TLYaxis_p->setWordWrap(false); - gridLayout6->addWidget(TLYaxis_p, 1, 2, 1, 1); + gridLayout5->addWidget(TLYaxis_p, 1, 2, 1, 1); TLZaxis_p = new QLabel(gBPipe); TLZaxis_p->setObjectName(QString::fromUtf8("TLZaxis_p")); @@ -673,41 +650,41 @@ public: TLZaxis_p->setSizePolicy(sizePolicy); TLZaxis_p->setWordWrap(false); - gridLayout6->addWidget(TLZaxis_p, 2, 2, 1, 1); + gridLayout5->addWidget(TLZaxis_p, 2, 2, 1, 1); SpinBox_Zaxis_p = new QDoubleSpinBox(gBPipe); SpinBox_Zaxis_p->setObjectName(QString::fromUtf8("SpinBox_Zaxis_p")); SpinBox_Zaxis_p->setDecimals(5); - SpinBox_Zaxis_p->setMaximum(1e+09); SpinBox_Zaxis_p->setMinimum(-1e+09); + SpinBox_Zaxis_p->setMaximum(1e+09); SpinBox_Zaxis_p->setValue(0); - gridLayout6->addWidget(SpinBox_Zaxis_p, 2, 3, 1, 1); + gridLayout5->addWidget(SpinBox_Zaxis_p, 2, 3, 1, 1); SpinBox_Yaxis_p = new QDoubleSpinBox(gBPipe); SpinBox_Yaxis_p->setObjectName(QString::fromUtf8("SpinBox_Yaxis_p")); SpinBox_Yaxis_p->setDecimals(5); - SpinBox_Yaxis_p->setMaximum(1e+09); SpinBox_Yaxis_p->setMinimum(-1e+09); + SpinBox_Yaxis_p->setMaximum(1e+09); SpinBox_Yaxis_p->setValue(0); - gridLayout6->addWidget(SpinBox_Yaxis_p, 1, 3, 1, 1); + gridLayout5->addWidget(SpinBox_Yaxis_p, 1, 3, 1, 1); SpinBox_Xaxis_p = new QDoubleSpinBox(gBPipe); SpinBox_Xaxis_p->setObjectName(QString::fromUtf8("SpinBox_Xaxis_p")); SpinBox_Xaxis_p->setDecimals(5); - SpinBox_Xaxis_p->setMaximum(1e+09); SpinBox_Xaxis_p->setMinimum(-1e+09); + SpinBox_Xaxis_p->setMaximum(1e+09); SpinBox_Xaxis_p->setValue(0); - gridLayout6->addWidget(SpinBox_Xaxis_p, 0, 3, 1, 1); + gridLayout5->addWidget(SpinBox_Xaxis_p, 0, 3, 1, 1); SpinBox_Radius_ext = new QDoubleSpinBox(gBPipe); SpinBox_Radius_ext->setObjectName(QString::fromUtf8("SpinBox_Radius_ext")); SpinBox_Radius_ext->setDecimals(5); SpinBox_Radius_ext->setMaximum(1e+09); - gridLayout6->addWidget(SpinBox_Radius_ext, 3, 3, 1, 1); + gridLayout5->addWidget(SpinBox_Radius_ext, 3, 3, 1, 1); TLRadius_ext = new QLabel(gBPipe); TLRadius_ext->setObjectName(QString::fromUtf8("TLRadius_ext")); @@ -715,17 +692,56 @@ public: TLRadius_ext->setSizePolicy(sizePolicy); TLRadius_ext->setWordWrap(false); - gridLayout6->addWidget(TLRadius_ext, 3, 2, 1, 1); + gridLayout5->addWidget(TLRadius_ext, 3, 2, 1, 1); SpinBox_Haut_p = new QDoubleSpinBox(gBPipe); SpinBox_Haut_p->setObjectName(QString::fromUtf8("SpinBox_Haut_p")); SpinBox_Haut_p->setDecimals(5); SpinBox_Haut_p->setMaximum(1e+09); - gridLayout6->addWidget(SpinBox_Haut_p, 4, 1, 1, 1); + gridLayout5->addWidget(SpinBox_Haut_p, 4, 1, 1, 1); + + + gridLayout->addWidget(gBPipe, 5, 0, 1, 5); + + GBButtons = new QGroupBox(CreateZone); + GBButtons->setObjectName(QString::fromUtf8("GBButtons")); + sizePolicy.setHeightForWidth(GBButtons->sizePolicy().hasHeightForWidth()); + GBButtons->setSizePolicy(sizePolicy); + gridLayout6 = new QGridLayout(GBButtons); +#ifndef Q_OS_MAC + gridLayout6->setSpacing(6); +#endif +#ifndef Q_OS_MAC + gridLayout6->setContentsMargins(9, 9, 9, 9); +#endif + gridLayout6->setObjectName(QString::fromUtf8("gridLayout6")); + buttonHelp = new QPushButton(GBButtons); + buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); + + gridLayout6->addWidget(buttonHelp, 0, 3, 1, 1); + + buttonCancel = new QPushButton(GBButtons); + buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); + + gridLayout6->addWidget(buttonCancel, 0, 2, 1, 1); + + buttonApply = new QPushButton(GBButtons); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + + gridLayout6->addWidget(buttonApply, 0, 1, 1, 1); + + buttonOk = new QPushButton(GBButtons); + buttonOk->setObjectName(QString::fromUtf8("buttonOk")); + + gridLayout6->addWidget(buttonOk, 0, 0, 1, 1); + + + gridLayout->addWidget(GBButtons, 6, 0, 1, 3); + horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - gridLayout->addWidget(gBPipe, 5, 0, 1, 2); + gridLayout->addItem(horizontalSpacer, 6, 3, 1, 1); retranslateUi(CreateZone); @@ -736,16 +752,24 @@ public: void retranslateUi(QDialog *CreateZone) { CreateZone->setWindowTitle(QApplication::translate("CreateZone", "Create a zone", 0, QApplication::UnicodeUTF8)); - GBButtons->setTitle(QString()); - buttonHelp->setText(QApplication::translate("CreateZone", "Help", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateZone", "Cancel", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateZone", "Apply", 0, QApplication::UnicodeUTF8)); - buttonOk->setText(QApplication::translate("CreateZone", "OK", 0, QApplication::UnicodeUTF8)); + Name->setText(QApplication::translate("CreateZone", "Name", 0, QApplication::UnicodeUTF8)); TypeZone->setTitle(QApplication::translate("CreateZone", "Type of zone", 0, QApplication::UnicodeUTF8)); RBSphere->setText(QApplication::translate("CreateZone", "Sphere", 0, QApplication::UnicodeUTF8)); RBPipe->setText(QApplication::translate("CreateZone", "Pipe", 0, QApplication::UnicodeUTF8)); RBCylinder->setText(QApplication::translate("CreateZone", "Cylinder", 0, QApplication::UnicodeUTF8)); RBBox->setText(QApplication::translate("CreateZone", "Box", 0, QApplication::UnicodeUTF8)); + gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); + TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0, QApplication::UnicodeUTF8)); + TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0, QApplication::UnicodeUTF8)); + TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0, QApplication::UnicodeUTF8)); + TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0, QApplication::UnicodeUTF8)); + TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0, QApplication::UnicodeUTF8)); + TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0, QApplication::UnicodeUTF8)); + gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); + TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8)); + TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8)); + TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8)); + TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); gBCylindre->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); TLHaut->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8)); TLRadius->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8)); @@ -755,19 +779,6 @@ public: TLYbase->setText(QApplication::translate("CreateZone", "Y base", 0, QApplication::UnicodeUTF8)); TLZbase->setText(QApplication::translate("CreateZone", "Z base", 0, QApplication::UnicodeUTF8)); TLXbase->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8)); - gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); - TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8)); - TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8)); - TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8)); - TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); - gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); - TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0, QApplication::UnicodeUTF8)); - TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0, QApplication::UnicodeUTF8)); - TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0, QApplication::UnicodeUTF8)); - TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0, QApplication::UnicodeUTF8)); - TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0, QApplication::UnicodeUTF8)); - TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0, QApplication::UnicodeUTF8)); - Name->setText(QApplication::translate("CreateZone", "Name", 0, QApplication::UnicodeUTF8)); gBPipe->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); TLHaut_p->setText(QApplication::translate("CreateZone", "Height", 0, QApplication::UnicodeUTF8)); TLXbase_p->setText(QApplication::translate("CreateZone", "X base", 0, QApplication::UnicodeUTF8)); @@ -778,6 +789,11 @@ public: TLYaxis_p->setText(QApplication::translate("CreateZone", "Y axis", 0, QApplication::UnicodeUTF8)); TLZaxis_p->setText(QApplication::translate("CreateZone", "Z axis", 0, QApplication::UnicodeUTF8)); TLRadius_ext->setText(QApplication::translate("CreateZone", "External radius", 0, QApplication::UnicodeUTF8)); + GBButtons->setTitle(QString()); + buttonHelp->setText(QApplication::translate("CreateZone", "Help", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateZone", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateZone", "Apply", 0, QApplication::UnicodeUTF8)); + buttonOk->setText(QApplication::translate("CreateZone", "OK", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; diff --git a/src/HOMARDGUI/CreateZone.ui b/src/HOMARDGUI/CreateZone.ui index 112e4f6c..7ac07232 100644 --- a/src/HOMARDGUI/CreateZone.ui +++ b/src/HOMARDGUI/CreateZone.ui @@ -1,149 +1,134 @@ - + + CreateZone - - + + 0 0 - 551 - 880 + 550 + 770 - + + + 1 + 1 + + + + + 550 + 400 + + + Create a zone - + true - + true - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - + + + + + Name - - + + + + + + 32 - - - 9 - - - 6 - - - - - Help - - - - - - - Cancel - - - - - - - Apply - - - - - - - OK - - - - - - - - - 0 - 0 + + + + Qt::Horizontal + + + + 142 + 20 + + + + + + + + 0 0 - + 340 0 - + Type of zone - - + + 9 - + 6 - - - + + + Sphere - - ../../resources/zone_spherepoint.png + + + ../../resources/zone_spherepoint.png../../resources/zone_spherepoint.png - - - + + + Pipe - - ../../resources/pipe.png + + + ../../resources/pipe.png../../resources/pipe.png - - - + + + Cylinder - - ../../resources/cylinderpointvector.png + + + ../../resources/cylinderpointvector.png../../resources/cylinderpointvector.png - - - + + + Box - - ../../resources/zone_boxdxyz.png + + + ../../resources/zone_boxdxyz.png../../resources/zone_boxdxyz.png - + true - + true @@ -151,285 +136,225 @@ - - - - - 0 - 0 + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 0 0 - - Qt::TabFocus - - + Coordinates - - + + 9 - + 6 - - - - 5 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - 0 - 0 - - - - Height - - - false - - - - - - - - 0 - 0 + + + + 0 0 - - Radius + + X mini - + false - - - - 5 - - - 999999999.000000000000000 - - - -999999999.000000000000000 - - - 0.000000000000000 - - - - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - - 0.000000000000000 - - - - - - - 5 - - + 999999999.000000000000000 - - -999999999.000000000000000 - - + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - - Z axis + + Y mini - + false - - - - - 0 - 0 - 0 - 0 - + + + + 5 - - Y axis + + -999999999.000000000000000 - - false + + 999999999.000000000000000 + + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - - X axis + + Z mini - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - - Y base + + X maxi - + false - - - - - 0 - 0 + + + + 0 0 - - Z base + + Z maxi - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - - 0.000000000000000 - - - - - - - 5 + + 999999999.000000000000000 - - 1000000000.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - - X base + + Y maxi - + false - - - + + + 5 - + + -999999999.000000000000000 + + 999999999.000000000000000 - + + 0.000000000000000 + + + + + + + 5 + + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 @@ -437,158 +362,148 @@ - - - - - 0 - 0 + + + + 0 0 - + Coordinates - - + + 9 - + 6 - - - - - 0 - 0 + + + + 0 0 - + X centre - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - + Y centre - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - + Radius - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - + Z centre - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 @@ -596,226 +511,267 @@ - - - - - 0 - 0 + + + + 0 0 - + + Qt::TabFocus + + Coordinates - - + + 9 - + 6 - - - - - 0 - 0 + + + + 5 + + + 1000000000.000000000000000 + + + + + + + 0 0 - - X mini + + Height - + false - - - + + + + + 0 + 0 + + + + Radius + + + false + + + + + + 5 - + + -999999999.000000000000000 + + 999999999.000000000000000 - + + 0.000000000000000 + + + + + + + 5 + + + -999999999.000000000000000 + + + 999999999.000000000000000 + + + 0.000000000000000 + + + + + + + 5 + + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - - Y mini + + Z axis - + false - - - - 5 - - - 999999999.000000000000000 + + + + + 0 + 0 + - - -999999999.000000000000000 + + Y axis - - 0.000000000000000 + + false - - - - - 0 - 0 + + + + 0 0 - - Z mini + + X axis - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - - X maxi + + Y base - + false - - - - - 0 - 0 + + + + 0 0 - - Z maxi + + Z base - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 5 + + + 1000000000.000000000000000 + + + + + + + 0 0 - - Y maxi + + X base - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - - 0.000000000000000 - - - - - - - 5 - - + 999999999.000000000000000 - - -999999999.000000000000000 - - + 0.000000000000000 @@ -823,324 +779,290 @@ - - - - 32 - - - - - - - Name - - - - - - - - 0 - 0 + + + + 0 0 - + Coordinates - - + + 9 - + 6 - - - - - 0 - 0 + + + + 0 0 - + Height - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - + X base - + false - - - + + + 5 - + 1000000000.000000000000000 - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - + Internal radius - + false - - - - - 0 - 0 + + + + 0 0 - + Z base - + false - - - - - 0 - 0 + + + + 0 0 - + Y base - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - - - 0 - 0 + + + + 0 0 - + X axis - + false - - - - - 0 - 0 + + + + 0 0 - + Y axis - + false - - - - - 0 - 0 + + + + 0 0 - + Z axis - + false - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - + + + 5 - - 999999999.000000000000000 - - + -999999999.000000000000000 - + + 999999999.000000000000000 + + 0.000000000000000 - - - + + + 5 - + 1000000000.000000000000000 - - - - - 0 - 0 + + + + 0 0 - + External radius - + false - - - + + + 5 - + 1000000000.000000000000000 @@ -1148,6 +1070,68 @@ + + + + + 0 + 0 + + + + + + + + 9 + + + 6 + + + + + Help + + + + + + + Cancel + + + + + + + Apply + + + + + + + OK + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx index 4ea5c5b6..c116df3d 100644 --- a/src/HOMARDGUI/HOMARDGUI.cxx +++ b/src/HOMARDGUI/HOMARDGUI.cxx @@ -123,6 +123,7 @@ void HOMARDGUI::initialize( CAM_Application* app ) anId = 0; createActions(); createMenus(); + recupPreferences(); } //================================================ @@ -161,7 +162,9 @@ void HOMARDGUI::createActions(){ createHOMARDAction( 1102, "PURSUE_ITERATION", "iter_poursuite.png" ); createHOMARDAction( 1103, "NEW_ITERATION", "iter_next.png" ); createHOMARDAction( 1111, "COMPUTE", "mesh_compute.png" ); + createHOMARDAction( 1112, "COMPUTE_PUBLISH", "mesh_compute.png" ); createHOMARDAction( 1121, "MESH_INFO", "advanced_mesh_info.png" ); + createHOMARDAction( 1131, "MESH_PUBLICATION", "mesh_tree_mesh.png" ); // createHOMARDAction( 1201, "EDIT", "loop.png" ); createHOMARDAction( 1211, "DELETE", "delete.png" ); @@ -175,28 +178,60 @@ void HOMARDGUI::createActions(){ //================================================ // function : createPreferences -// No preferences for Homard -// Just a test //================================================ -void HOMARDGUI::createPreferences(){ - QString toto = tr( "PREF_GROUP_GENERAL" ); - int tabId = addPreference( tr( "PREF_GROUP_GENERAL" ) ); - int genGroup = addPreference( tr( "PREF_TAB_SETTINGS" ), tabId ); - addPreference( tr( "PREF_TEST" ), genGroup, LightApp_Preferences::Color, "Homard", "shading_color" ); +void HOMARDGUI::createPreferences() +{ + MESSAGE("createPreferences") + + int Onglet, Bloc, Pref ; + // 1. Generalites + Onglet = addPreference( tr( "PREF_TAB_GENERAL" ) ); +// Onglet = addPreference( tr( "PREF_TAB_SETTINGS" ) ) ; + + Bloc = addPreference( tr( "PREF_PUBLICATION" ), Onglet ); + setPreferenceProperty( Bloc, "columns", 1 ); + + Pref = addPreference( tr( "PREF_PUBLICATION_MAILLAGE_IN" ), Bloc, LightApp_Preferences::Bool, "HOMARD", "publish_mesh_in" ); + + Pref = addPreference( tr( "PREF_PUBLICATION_MAILLAGE_OUT" ), Bloc, LightApp_Preferences::Bool, "HOMARD", "publish_mesh_out" ); + + // 2. YACS + Onglet = addPreference( tr( "PREF_YACS" ) ) ; + + Bloc = addPreference( tr( "PREF_YACS_MAX" ), Onglet ); + setPreferenceProperty( Bloc, "columns", 1 ); + + Pref = addPreference( tr( "PREF_YACS_MAX_ITER" ), Bloc, LightApp_Preferences::IntSpin, "HOMARD", "max_iter" ); + setPreferenceProperty( Pref, "min", 0 ); + setPreferenceProperty( Pref, "max", 100000000 ); + setPreferenceProperty( Pref, "step", 1 ); + + Pref = addPreference( tr( "PREF_YACS_MAX_NODE" ), Bloc, LightApp_Preferences::IntSpin, "HOMARD", "max_node" ); + setPreferenceProperty( Pref, "min", 0 ); + setPreferenceProperty( Pref, "max", 100000000 ); + setPreferenceProperty( Pref, "step", 1000 ); + + Pref = addPreference( tr( "PREF_YACS_MAX_ELEM" ), Bloc, LightApp_Preferences::IntSpin, "HOMARD", "max_elem" ); + setPreferenceProperty( Pref, "min", 0 ); + setPreferenceProperty( Pref, "max", 100000000 ); + setPreferenceProperty( Pref, "step", 1000 ); } //================================================ // function : createMenus //================================================ -void HOMARDGUI::createMenus(){ +void HOMARDGUI::createMenus() +{ MESSAGE("createMenus") // int HOMARD_Id = createMenu( tr( "HOM_MEN_HOMARD" ), -1, 5, 10 ); createMenu( 1101, HOMARD_Id, -1 ); //Create_Case createMenu( 1102, HOMARD_Id, -1 ); //Pursue_Iteration + createMenu( separator(), HOMARD_Id,-1); createMenu( 1103, HOMARD_Id, -1 ); //Create_Iteration - createMenu( 1111, HOMARD_Id, -1 ); //COMPUTE + createMenu( 1111, HOMARD_Id, -1 ); //Compute + createMenu( 1112, HOMARD_Id, -1 ); //Compute and publish // HOMARD_Id = createMenu( tr( "HOM_MEN_MODIFICATION" ), -1, 5, 10 ); createMenu( 1201, HOMARD_Id, -1 ); //Edit @@ -204,6 +239,7 @@ void HOMARDGUI::createMenus(){ // HOMARD_Id = createMenu( tr( "HOM_MEN_INFORMATION" ), -1, 5, 10 ); createMenu( 1301, HOMARD_Id, -1 ); //Information sur un maillage + createMenu( 1131, HOMARD_Id, -1 ); //Mesh publication createMenu( separator(), HOMARD_Id,-1); createMenu( 1302, HOMARD_Id, -1 ); //EditAsciiFile pour le fichier listeStd ou bilan createMenu( separator(), HOMARD_Id,-1); @@ -213,15 +249,35 @@ void HOMARDGUI::createMenus(){ HOMARD_Id = createMenu( tr( "HOM_MEN_YACS" ), -1, 5, 10 ); createMenu( 1401, HOMARD_Id, -1 ); // Création d'un schéma YACS createMenu( separator(), HOMARD_Id,-1); +} + +//================================================ +// function : recupPreferences +//================================================ +void HOMARDGUI::recupPreferences() +{ + MESSAGE("recupPreferences") // -// La langue des preferences +// . La langue SUIT_ResourceMgr* resMgr = getApp()->resourceMgr(); _LanguageShort = resMgr->stringValue("language", "language", "en"); MESSAGE("_LanguageShort " << _LanguageShort.toStdString().c_str() ); // +// . Les publications + _publish_mesh_in = resMgr->booleanValue("HOMARD", "publish_mesh_in", false ); + int pu_m_in = 0 ; + if ( _publish_mesh_in ) pu_m_in = 1 ; +// + _publish_mesh_out = resMgr->booleanValue("HOMARD", "publish_mesh_out", false ); + int pu_m_out = 0 ; + if ( _publish_mesh_out ) pu_m_out = 1 ; + MESSAGE("_publish_mesh_in " << _publish_mesh_in << ", _publish_mesh_out " << _publish_mesh_out ); +// +// . Enregistrement dans l'objet general SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() ); HOMARD::HOMARD_Gen_var homardGen = HOMARDGUI::InitHOMARDGen(app); homardGen->SetLanguageShort(_LanguageShort.toStdString().c_str()); + homardGen->SetPublisMesh(pu_m_in, pu_m_out); } //================================================ @@ -294,24 +350,31 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) case 1103: // Creation d une Iteration { - MESSAGE("command " << theCommandID << " activated"); - QString IterParentName=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("IterationHomard"), 0); - MESSAGE("IterParentName " << IterParentName.toStdString().c_str() << " choisi dans arbre"); + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); MonCreateIteration *IterDlg = new MonCreateIteration( parent, true, - HOMARD::HOMARD_Gen::_duplicate(homardGen), IterParentName ) ; + HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; IterDlg->show(); break; } - case 1111: // Compute une Iteration + case 1111: // Compute une iteration { - MESSAGE("command " << theCommandID << " activated"); - QString monIter=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("IterationHomard"), 1); - if (monIter == QString("")) break; - try + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); + try { homardGen->Compute(_ObjectName.toStdString().c_str(), 0, 1, -1, 1); } + catch( SALOME::SALOME_Exception& S_ex ) { - homardGen->Compute(monIter.toStdString().c_str(), 0, 1, -1, 1); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr(CORBA::string_dup(S_ex.details.text)) ); + getApp()->updateObjectBrowser(); + return false; } + break; + } + + case 1112: // Compute une iteration et publication + { + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); + try { homardGen->Compute(_ObjectName.toStdString().c_str(), 0, 1, -1, 2); } catch( SALOME::SALOME_Exception& S_ex ) { QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), @@ -324,14 +387,26 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) case 1121: // Information sur le maillage de l'iteration { - MESSAGE("command " << theCommandID << " activated"); - QString IterName=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("IterationHomard"), 0); - MESSAGE("IterName " << IterName.toStdString().c_str() << " choisi dans arbre"); - MonIterInfo *IterDlg = new MonIterInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), IterName ) ; + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); + MonIterInfo *IterDlg = new MonIterInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; IterDlg->show(); break; } + case 1131: // Publication du maillage de l'iteration + { + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); + homardGen->PublishMeshIterInSmesh(_ObjectName.toStdString().c_str()); + break; + } + + case 1132: // Publication du maillage de l'iteration a partir du fichier + { + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); + homardGen->PublishResultInSmesh(_ObjectName.toStdString().c_str(), 1); + break; + } + case 1201: // Edition d'un objet { MESSAGE("command " << theCommandID << " activated"); @@ -498,13 +573,11 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) break; } - case 1401: // Création d'un schéma YACS + case 1401: // Création d'un schema YACS { MESSAGE("etape 1401") - MESSAGE("command " << theCommandID << " activated"); - QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("CasHomard"), 1); - MESSAGE("Name " << Name.toStdString().c_str() << " choisi dans arbre"); - MonCreateYACS *aDlg = new MonCreateYACS( true, HOMARD::HOMARD_Gen::_duplicate(homardGen), Name ) ; + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); + MonCreateYACS *aDlg = new MonCreateYACS( true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; aDlg->show(); break; } @@ -512,13 +585,8 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) case 1402: // Ecriture d'un schéma YACS { MESSAGE("etape 1402") - MESSAGE("command " << theCommandID << " activated"); - QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("YACSHomard"), 1); - if (Name == QString("")) break; - try - { - homardGen->YACSWrite(Name.toStdString().c_str()); - } + MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); + try { homardGen->YACSWrite(_ObjectName.toStdString().c_str()); } catch( SALOME::SALOME_Exception& S_ex ) { QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), @@ -661,10 +729,14 @@ void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& t { pix = resMgr->loadPixmap( "HOMARD", "iter_next.png" ); menu->addAction(QIcon(pix), tr(QString("HOM_MEN_NEW_ITERATION").toLatin1().data()), this, SLOT(NextIter())); - QPixmap pix2 = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" ); - menu->addAction(QIcon(pix2), tr(QString("HOM_MEN_COMPUTE").toLatin1().data()), this, SLOT(LanceCalcul())); - pix2 = resMgr->loadPixmap( "HOMARD", "advanced_mesh_info.png" ); - menu->addAction(QIcon(pix2), tr(QString("HOM_MEN_MESH_INFO").toLatin1().data()), this, SLOT(IterInfo())); + pix = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" ); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_COMPUTE").toLatin1().data()), this, SLOT(LanceCalcul0())); + pix = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" ); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_COMPUTE_PUBLISH").toLatin1().data()), this, SLOT(LanceCalcul1())); + pix = resMgr->loadPixmap( "HOMARD", "advanced_mesh_info.png" ); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_MESH_INFO").toLatin1().data()), this, SLOT(IterInfo())); + pix = resMgr->loadPixmap( "HOMARD", "mesh_tree_mesh.png" ); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_MESH_PUBLICATION").toLatin1().data()), this, SLOT(MeshPublish0())); EditObject = true ; DeleteObject = true ; } @@ -685,6 +757,11 @@ void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& t pix = resMgr->loadPixmap( "HOMARD", "texte.png" ); menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_MESS_FILE").toLatin1().data()), this, SLOT(EditAsciiFile())); } + else if ( HOMARD_UTILS::isFileType(obj,QString("Mesh")) ) + { + pix = resMgr->loadPixmap( "HOMARD", "mesh_tree_mesh.png" ); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_MESH_PUBLICATION").toLatin1().data()), this, SLOT(MeshPublish1())); + } // Ajout d'un menu d'edition pour les objets qui le proposent if ( EditObject ) { @@ -705,16 +782,31 @@ void HOMARDGUI::NextIter() this->OnGUIEvent(1103); } -void HOMARDGUI::LanceCalcul() +void HOMARDGUI::LanceCalcul0() { this->OnGUIEvent(1111); } +void HOMARDGUI::LanceCalcul1() +{ + this->OnGUIEvent(1112); +} + void HOMARDGUI::IterInfo() { this->OnGUIEvent(1121); } +void HOMARDGUI::MeshPublish0() +{ + this->OnGUIEvent(1131); +} + +void HOMARDGUI::MeshPublish1() +{ + this->OnGUIEvent(1132); +} + void HOMARDGUI::Edit() { this->OnGUIEvent(1201); diff --git a/src/HOMARDGUI/HOMARDGUI.h b/src/HOMARDGUI/HOMARDGUI.h index c00798cb..2bca7287 100644 --- a/src/HOMARDGUI/HOMARDGUI.h +++ b/src/HOMARDGUI/HOMARDGUI.h @@ -64,9 +64,12 @@ public slots: private slots: void OnGUIEvent(); void EditAsciiFile(); - void LanceCalcul(); + void LanceCalcul0(); + void LanceCalcul1(); void IterInfo(); void NextIter(); + void MeshPublish0(); + void MeshPublish1(); void YACSCreate(); void YACSWrite(); void Edit(); @@ -81,6 +84,7 @@ private: const int key = 0, const bool toggle = false ); void createActions(); void createMenus(); + void recupPreferences(); void createPopupMenus(); _PTR(SObject) chercheMonObjet(); @@ -91,6 +95,8 @@ private: int anId; QString _ObjectName; QString _LanguageShort ; + bool _publish_mesh_in ; + bool _publish_mesh_out ; }; #endif diff --git a/src/HOMARDGUI/HOMARDGUI_Utils.cxx b/src/HOMARDGUI/HOMARDGUI_Utils.cxx index 47f4fa6b..4adb4849 100644 --- a/src/HOMARDGUI/HOMARDGUI_Utils.cxx +++ b/src/HOMARDGUI/HOMARDGUI_Utils.cxx @@ -117,8 +117,8 @@ const SALOME_ListIO& HOMARD_UTILS::selectedIO() if( aSelectionMgr ) { aSelectionMgr->selectedObjects( mySelected ); - for (SALOME_ListIteratorOfListIO it (mySelected); it.More(); it.Next()) - SCRUTE(it.Value()->getEntry()); + for (SALOME_ListIteratorOfListIO it (mySelected); it.More(); it.Next()) + SCRUTE(it.Value()->getEntry()); }; return mySelected; } @@ -135,7 +135,7 @@ int HOMARD_UTILS::IObjectCount() { aSelectionMgr->selectedObjects( mySelected ); SCRUTE(mySelected.Extent()); - return mySelected.Extent(); + return mySelected.Extent(); } return 0; } @@ -161,7 +161,7 @@ Handle(SALOME_InteractiveObject) HOMARD_UTILS::lastIObject() } //================================================================ -// Retourne vrai si l objet est du type voulu +// Retourne vrai si l'objet est du type voulu // . Dans le cas d'un cas, d'une hypothese, d'une zone, on se contente // d'une comparaison simple entre le type stocke et TypeObject. // . Pour l'iteration, le type stocke en attribut est sous la forme @@ -188,6 +188,7 @@ bool HOMARD_UTILS::isObject(_PTR(SObject) MonObj, QString TypeObject, int option if ( option == 0 ) { int position = Type.lastIndexOf(TypeObject); +// MESSAGE("position = "<( app->module( "Homard" ) ); // Repertoire de reference de la documentation QString rep = aHomardGUI ? app->moduleName(aHomardGUI->moduleName()) : QString("") ; - // WARNING/ATTENTION : si on savait recuperer la langue depuis les preferences, on ne fera pas le passage par argument + // WARNING/ATTENTION : si on savait recuperer la langue depuis les preferences, on ne ferait pas le passage par argument // SUIT_ResourceMgr* resMgr = getApp()->resourceMgr(); // SUIT_ResourceMgr* resMgr = myModule->getApp()->resourceMgr(); // QString langue = resMgr->stringValue("language", "language", "en"); diff --git a/src/HOMARDGUI/HOMARD_msg_en.ts b/src/HOMARDGUI/HOMARD_msg_en.ts index 8386a721..cb8bde0d 100644 --- a/src/HOMARDGUI/HOMARD_msg_en.ts +++ b/src/HOMARDGUI/HOMARD_msg_en.ts @@ -29,12 +29,16 @@ HOM_MEN_PURSUE_ITERATION - Pursuit of an iteration + Case: pursuit of a stored iteration HOM_MEN_COMPUTE Compute + + HOM_MEN_COMPUTE_PUBLISH + Compute and publish + HOM_MEN_EDIT Edit @@ -47,6 +51,10 @@ HOM_MEN_MESH_INFO Mesh analysis + + HOM_MEN_MESH_PUBLICATION + Mesh publication + HOM_MEN_EDIT_MESS_FILE Show the file @@ -69,12 +77,16 @@ HOM_TOP_PURSUE_ITERATION - Pursuit of an iteration + Case: pursuit of a stored iteration HOM_TOP_COMPUTE Compute + + HOM_TOP_COMPUTE_PUBLISH + Compute and publish + HOM_TOP_EDIT Edit @@ -101,12 +113,16 @@ HOM_STB_PURSUE_ITERATION - Pursuit of an iteration + Case: pursuit of a stored iteration HOM_STB_COMPUTE Compute + + HOM_STB_COMPUTE_PUBLISH + Compute and publish + HOM_STB_EDIT Edit @@ -143,6 +159,10 @@ HOM_SELECT_OBJECT_3 Select an object with type %1. + + HOM_SELECT_FILE_0 + File selection + HOM_SELECT_FILE_1 Select a file. @@ -237,7 +257,7 @@ HOM_CASE_PURSUE_WINDOW_TITLE - Pursuit of an iteration + Case: pursuit of a stored iteration HOM_ITER_NAME @@ -379,5 +399,41 @@ HOM_YACS_EDIT_WINDOW_TITLE Edition of a schema YACS + + PREF_TAB_GENERAL + General + + + PREF_PUBLICATION + Publication + + + PREF_PUBLICATION_MAILLAGE_IN + IN meshes + + + PREF_PUBLICATION_MAILLAGE_OUT + OUT meshes + + + PREF_YACS + YACS + + + PREF_YACS_MAX + Maximum numbers + + + PREF_YACS_MAX_ITER + Iterations + + + PREF_YACS_MAX_NODE + Nodes + + + PREF_YACS_MAX_ELEM + Elements + diff --git a/src/HOMARDGUI/HOMARD_msg_fr.ts b/src/HOMARDGUI/HOMARD_msg_fr.ts index db8348bc..71295cf1 100644 --- a/src/HOMARDGUI/HOMARD_msg_fr.ts +++ b/src/HOMARDGUI/HOMARD_msg_fr.ts @@ -29,12 +29,16 @@ HOM_MEN_PURSUE_ITERATION - Poursuite d'une itération + Cas de poursuite d'une itération HOM_MEN_COMPUTE Calculer + + HOM_MEN_COMPUTE_PUBLISH + Calculer et publier + HOM_MEN_EDIT Editer @@ -47,6 +51,10 @@ HOM_MEN_MESH_INFO Analyse de maillage + + HOM_MEN_MESH_PUBLICATION + Publication du maillage + HOM_MEN_EDIT_MESS_FILE Afficher le fichier @@ -69,12 +77,16 @@ HOM_TOP_PURSUE_ITERATION - Poursuite d'une itération + Cas de poursuite d'une itération HOM_TOP_COMPUTE Calculer + + HOM_TOP_COMPUTE_PUBLISH + Calculer et publier + HOM_TOP_EDIT Editer @@ -101,12 +113,16 @@ HOM_STB_PURSUE_ITERATION - Poursuite d'une itération + Cas de poursuite d'une itération HOM_STB_COMPUTE Calculer + + HOM_STB_COMPUTE_PUBLISH + Calculer et publier + HOM_STB_EDIT Editer @@ -195,6 +211,10 @@ HOM_SELECT_OBJECT_3 Sélectionner un objet de type %1. + + HOM_SELECT_FILE_0 + Choix de fichier + HOM_SELECT_FILE_1 Sélectionner un fichier. @@ -293,7 +313,7 @@ HOM_CASE_PURSUE_WINDOW_TITLE - Poursuite d'une itération + Cas de poursuite d'une itération The configuration file cannot be found. @@ -1007,6 +1027,26 @@ Type of schema Type de schema + + Maximum of ... + Maximum de ... + + + Iterations + Itérations + + + Nodes + Noeuds + + + Elements + Eléments + + + Test of convergence + Test de convergence + Edit a file Affichage d'un fichier @@ -1023,5 +1063,41 @@ HOM_YACS_EDIT_WINDOW_TITLE Edition d'un schéma YACS + + PREF_TAB_GENERAL + Général + + + PREF_PUBLICATION + Publication + + + PREF_PUBLICATION_MAILLAGE_IN + Les maillages d'entrée + + + PREF_PUBLICATION_MAILLAGE_OUT + Les maillages de sortie + + + PREF_YACS + YACS + + + PREF_YACS_MAX + Nombres maximum + + + PREF_YACS_MAX_ITER + Itérations + + + PREF_YACS_MAX_NODE + Noeuds + + + PREF_YACS_MAX_ELEM + Eléments + diff --git a/src/HOMARDGUI/HOMARD_msg_ja.ts b/src/HOMARDGUI/HOMARD_msg_ja.ts index cb153fe0..2c322ebf 100644 --- a/src/HOMARDGUI/HOMARD_msg_ja.ts +++ b/src/HOMARDGUI/HOMARD_msg_ja.ts @@ -380,5 +380,9 @@ HOM_YACS_EDIT_WINDOW_TITLE YACS スキーマ編集スキーマへんしゅう - + + PREF_TAB_GENERAL + 一般的な + + diff --git a/src/HOMARDGUI/HomardQtCommun.cxx b/src/HOMARDGUI/HomardQtCommun.cxx index e7f9070a..578e4d67 100644 --- a/src/HOMARDGUI/HomardQtCommun.cxx +++ b/src/HOMARDGUI/HomardQtCommun.cxx @@ -50,13 +50,13 @@ QString HOMARD_QT_COMMUN::SelectionArbreEtude(QString commentaire, int option ) // . si le commentaire est une chaine vide, on ne tient pas compte du type de l'objet // et on retourne le nom de cet objet // . sinon : -// . si l'objet est du type defini par commentaite, retourne le nom de cet objet +// . si l'objet est du type defini par commentaire, retourne le nom de cet objet // . sinon on retourne une QString("") // option : // . Si option = 0, ce n'est pas grave de ne rien trouver ; aucun message n'est emis // . Si option = 1, ce n'est pas grave de ne rien trouver mais on emet un message { - MESSAGE("SelectionArbreEtude : commentaire = " << commentaire.toStdString().c_str() << " et option = " << option); +// MESSAGE("SelectionArbreEtude : commentaire = " << commentaire.toStdString().c_str() << " et option = " << option); int nbSel = HOMARD_UTILS::IObjectCount() ; if ( nbSel == 0 ) { @@ -77,6 +77,7 @@ QString HOMARD_QT_COMMUN::SelectionArbreEtude(QString commentaire, int option ) Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); if ( aIO->hasEntry() ) { +// MESSAGE("aIO->getEntry() = " << aIO->getEntry()); _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument(); _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) ); _PTR(GenericAttribute) anAttr; @@ -86,9 +87,9 @@ QString HOMARD_QT_COMMUN::SelectionArbreEtude(QString commentaire, int option ) { _PTR(AttributeComment) attributComment = anAttr; QString aComment= QString(attributComment->Value().data()); - MESSAGE("... aComment = " << aComment.toStdString().c_str()); +// MESSAGE("... aComment = " << aComment.toStdString().c_str()); int iaux = aComment.lastIndexOf(commentaire); - MESSAGE("... iaux = " << iaux); +// MESSAGE("... iaux = " << iaux); if ( iaux !=0 ) { QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), @@ -144,7 +145,7 @@ QString HOMARD_QT_COMMUN::SelectionCasEtude() } // ======================================================================= -QString HOMARD_QT_COMMUN::PushNomFichier(bool avertir) +QString HOMARD_QT_COMMUN::PushNomFichier(bool avertir, QString TypeFichier) // ======================================================================= // Gestion les boutons qui permettent de // 1) retourne le nom d'un fichier par une fenetre de dialogue si aucun @@ -152,19 +153,31 @@ QString HOMARD_QT_COMMUN::PushNomFichier(bool avertir) // 2) retourne le nom du fichier asocie a l objet // selectionne dans l arbre d etude { - MESSAGE("PushNomFichier"); - QString aFile=QString::null; +// MESSAGE("PushNomFichier avec avertir "< 1) - { - QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), - QObject::tr("HOM_SELECT_FILE_2") ); +// aFile = QFileDialog::getOpenFileName(0, QObject::tr("HOM_SELECT_FILE_0"), QString(""), QString("Med files (*.med);;all (*) ") ); + aFile = QFileDialog::getOpenFileName(0, QObject::tr("HOM_SELECT_FILE_0"), QString(""), filtre ); } - if (nbSel == 1) + // B.2. Un objet est selectionne + else if (nbSel == 1) { Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); if ( aIO->hasEntry() ) @@ -191,17 +204,19 @@ QString HOMARD_QT_COMMUN::PushNomFichier(bool avertir) { if ( avertir ) { QMessageBox::warning( 0, QObject::tr("HOM_WARNING"), - QObject::tr("HOM_SELECT_STUDY") ); - } - aFile = QFileDialog::getOpenFileName(); - if (!aFile.isEmpty()) - { - aFile=aFile; + QObject::tr("HOM_SELECT_STUDY") ); } + aFile = QFileDialog::getOpenFileName(0, QObject::tr("HOM_SELECT_FILE_0"), QString(""), filtre ); } } - return aFile; + // B.3. Bizarre + else + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_SELECT_FILE_2") ); + } + return aFile; } // ======================================================================= int HOMARD_QT_COMMUN::OuvrirFichier(QString aFile) diff --git a/src/HOMARDGUI/HomardQtCommun.h b/src/HOMARDGUI/HomardQtCommun.h index 83d5417c..f5c96f59 100644 --- a/src/HOMARDGUI/HomardQtCommun.h +++ b/src/HOMARDGUI/HomardQtCommun.h @@ -39,7 +39,7 @@ class QComboBox; namespace HOMARD_QT_COMMUN { - HOMARD_EXPORT QString PushNomFichier(bool avertir=true); + HOMARD_EXPORT QString PushNomFichier(bool avertir, QString TypeFichier=""); HOMARD_EXPORT QString LireNomMaillage(int Medidt,int MeshId); HOMARD_EXPORT QString LireNomMaillage(QString aFile); diff --git a/src/HOMARDGUI/MonCreateBoundaryAn.cxx b/src/HOMARDGUI/MonCreateBoundaryAn.cxx index 91537d20..993f5400 100644 --- a/src/HOMARDGUI/MonCreateBoundaryAn.cxx +++ b/src/HOMARDGUI/MonCreateBoundaryAn.cxx @@ -475,9 +475,9 @@ void MonCreateBoundaryAn::SetNewName() { if ( aName == QString(MyObjects[i])) { - num=num+1; - aName=""; - break; + num ++ ; + aName = "" ; + break ; } } } @@ -491,8 +491,10 @@ void MonCreateBoundaryAn::SetCylinder() gBCylindre->setVisible(1); gBSphere->setVisible(0); gBCone->setVisible(0); - adjustSize(); +// _Type=1; +// + adjustSize(); // MESSAGE("Fin de SetCylinder") } // ------------------------------------------------------------------------ @@ -503,8 +505,10 @@ void MonCreateBoundaryAn::SetSphere() gBCylindre->setVisible(0); gBSphere->setVisible(1); gBCone->setVisible(0); - adjustSize(); +// _Type=2; +// + adjustSize(); // MESSAGE("Fin de SetSphere") } // ------------------------------------------------------------------------ @@ -624,7 +628,6 @@ void MonCreateBoundaryAn::SetCone() gBSphere->setVisible(0); gBCone->setVisible(1); // - adjustSize(); if ( RB_Def_radius->isChecked() ) { SetConeR(); @@ -633,6 +636,8 @@ void MonCreateBoundaryAn::SetCone() { SetConeA(); } +// + adjustSize(); // MESSAGE("Fin de SetCone") } // ------------------------------------------------------------------------ diff --git a/src/HOMARDGUI/MonCreateBoundaryDi.cxx b/src/HOMARDGUI/MonCreateBoundaryDi.cxx index 18aaa246..3af08800 100644 --- a/src/HOMARDGUI/MonCreateBoundaryDi.cxx +++ b/src/HOMARDGUI/MonCreateBoundaryDi.cxx @@ -171,9 +171,9 @@ void MonCreateBoundaryDi::SetNewName() { if ( aName == QString(MyObjects[i])) { - num=num+1; - aName=""; - break; + num ++ ; + aName = "" ; + break ; } } } @@ -183,7 +183,7 @@ void MonCreateBoundaryDi::SetNewName() void MonCreateBoundaryDi::SetMeshFile() // ------------------------------------------------------------------------ { - QString aMeshFile = HOMARD_QT_COMMUN::PushNomFichier(); + QString aMeshFile = HOMARD_QT_COMMUN::PushNomFichier( false, QString("med") ); if (!(aMeshFile.isEmpty())) LEFileName->setText(aMeshFile); } diff --git a/src/HOMARDGUI/MonCreateCase.cxx b/src/HOMARDGUI/MonCreateCase.cxx index 42250931..417bae8f 100644 --- a/src/HOMARDGUI/MonCreateCase.cxx +++ b/src/HOMARDGUI/MonCreateCase.cxx @@ -63,9 +63,10 @@ MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 ) GBAdvancedOptions->setVisible(0); Comment->setVisible(0); CBPyramid->setChecked(false); - +// adjustSize(); - MESSAGE("Fin du constructeur de MonCreateCase"); + +// MESSAGE("Fin du constructeur de MonCreateCase"); } // ------------------------------------------------------------------------ MonCreateCase::~MonCreateCase() @@ -332,9 +333,9 @@ void MonCreateCase::SetNewName() { if ( aCaseName == QString((MyCases)[i])) { - num=num+1; - aCaseName=""; - break; + num ++ ; + aCaseName = "" ; + break ; } } } @@ -354,7 +355,7 @@ void MonCreateCase::SetFileName() // ------------------------------------------------------------------------ { QString fileName0 = LEFileName->text().trimmed(); - QString fileName = HOMARD_QT_COMMUN::PushNomFichier(); + QString fileName = HOMARD_QT_COMMUN::PushNomFichier( false, QString("med") ) ; if (fileName.isEmpty()) fileName = fileName0 ; LEFileName->setText(fileName); } @@ -363,8 +364,10 @@ void MonCreateCase::SetConforme() // ------------------------------------------------------------------------ { GBTypeNoConf->setVisible(0); - adjustSize(); +// _ConfType=1; +// + adjustSize(); } // ------------------------------------------------------------------------ void MonCreateCase::SetNonConforme() @@ -372,8 +375,10 @@ void MonCreateCase::SetNonConforme() { GBTypeNoConf->setVisible(1); RB1NpM->setChecked(true); - adjustSize(); +// _ConfType=2; +// + adjustSize(); } // ------------------------------------------------------------------------ void MonCreateCase::Set1NpM() @@ -407,6 +412,7 @@ void MonCreateCase::SetBoundaryD() CBBoundaryD->setCheckState(Qt::Unchecked); } } else { GBBoundaryD->setVisible(0); } +// adjustSize(); } // ------------------------------------------------------------------------ @@ -454,6 +460,7 @@ void MonCreateCase::SetBoundaryA() CBBoundaryA->setCheckState(Qt::Unchecked); } } else { GBBoundaryA->setVisible(0); } +// adjustSize(); // // MESSAGE("Fin de SetBoundaryA "); @@ -540,5 +547,6 @@ void MonCreateCase::SetAdvanced() CBPyramid->setChecked(false); _Pyram = 0 ; } +// adjustSize(); } diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx index fcbfc518..21c52bc2 100644 --- a/src/HOMARDGUI/MonCreateHypothesis.cxx +++ b/src/HOMARDGUI/MonCreateHypothesis.cxx @@ -41,7 +41,7 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, // --------------------------------------------------------------------------------- /* Constructs a MonCreateHypothesis */ : - QDialog(0), Ui_CreateHypothesis(), + QScrollArea(0), Ui_CreateHypothesis(), _parent(parent), _Name(Name), _aCaseName(caseName), _aFieldFile(aFieldFile), _aFieldName(""), @@ -58,7 +58,9 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, MESSAGE("Constructeur") ; myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); setupUi(this); - setModal(modal); + if ( modal ) { setWindowModality(Qt::WindowModal); } + else { setWindowModality(Qt::NonModal); } + setWindowFlags( Qt::WindowStaysOnTopHint ) ; InitConnect(); SetNewName(); @@ -73,6 +75,8 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, SetFieldNo(); GBAdvancedOptions->setVisible(0); CBLevelOutput->setChecked(false); +// + adjustSize(); } // ------------------------------------------------------------------------ @@ -174,7 +178,7 @@ bool MonCreateHypothesis::PushOnApply() if (CBAdvanced->isChecked()) { // Enregistrement du niveau maximal - _NivMax = spinBoxNivMax->value() ; + _NivMax = SpinBoxNivMax->value() ; aHypothesis->SetNivMax(_NivMax); // Enregistrement du diametre minimal _DiamMin = doubleSpinBoxDiamMin->value() ; @@ -222,9 +226,9 @@ void MonCreateHypothesis::SetNewName() { if ( aName == QString(MyObjects[i])) { - num=num+1; - aName=""; - break; + num ++ ; + aName = "" ; + break ; } } } @@ -241,8 +245,10 @@ void MonCreateHypothesis::SetUniforme() else { GBFieldFile->setVisible(1); } GBAreaManagement->setVisible(0); GBUniform->setVisible(1); - adjustSize(); + _aTypeAdap = -1 ; +// + adjustSize(); } // ------------------------------------------------------------------------ void MonCreateHypothesis::SetChamp() @@ -268,9 +274,10 @@ void MonCreateHypothesis::SetChamp() GBAreaManagement->adjustSize(); GBFieldManagement->adjustSize(); GBFieldFile->adjustSize(); - adjustSize(); _aTypeAdap = 1 ; +// + adjustSize(); } // ------------------------------------------------------------------------ void MonCreateHypothesis::SetZone() @@ -282,10 +289,12 @@ void MonCreateHypothesis::SetZone() if ( _TypeFieldInterp == 0 ) { GBFieldFile->setVisible(0); } else { GBFieldFile->setVisible(1); } GBAreaManagement->setVisible(1); - adjustSize(); + _aTypeRaff = 1 ; _aTypeDera = 0 ; _aTypeAdap = 0 ; +// + adjustSize(); } // ------------------------------------------------------------------------ @@ -797,8 +806,9 @@ void MonCreateHypothesis::SetFieldNo() else { GBFieldFile->setVisible(0); } TWField->setVisible(0); // - adjustSize(); _TypeFieldInterp = 0 ; +// + adjustSize(); } // ------------------------------------------------------------------------ void MonCreateHypothesis::SetFieldAll() @@ -819,7 +829,8 @@ void MonCreateHypothesis::SetFieldAll() TWField->setVisible(0); // _TypeFieldInterp = 1 ; - adjustSize(); +// + adjustSize(); } // ------------------------------------------------------------------------ void MonCreateHypothesis::SetFieldChosen() @@ -866,7 +877,8 @@ void MonCreateHypothesis::SetFieldChosen() TWField->setVisible(1); _TypeFieldInterp = 2 ; - adjustSize(); +// + adjustSize(); } // ------------------------------------------------------------------------ void MonCreateHypothesis::SetAdvanced() @@ -890,6 +902,7 @@ void MonCreateHypothesis::SetAdvanced() CBLevelOutput->setChecked(false); _LevelOutput = 0 ; } +// adjustSize(); } // ------------------------------------------------------------------------ diff --git a/src/HOMARDGUI/MonCreateHypothesis.h b/src/HOMARDGUI/MonCreateHypothesis.h index 2e9ee24e..df052e35 100644 --- a/src/HOMARDGUI/MonCreateHypothesis.h +++ b/src/HOMARDGUI/MonCreateHypothesis.h @@ -30,10 +30,10 @@ #include CORBA_CLIENT_HEADER(HOMARD_Hypothesis) #include -#include +#include class MonCreateIteration; -class HOMARD_EXPORT MonCreateHypothesis : public QDialog, public Ui_CreateHypothesis +class HOMARD_EXPORT MonCreateHypothesis : public QScrollArea, public Ui_CreateHypothesis { Q_OBJECT diff --git a/src/HOMARDGUI/MonCreateIteration.cxx b/src/HOMARDGUI/MonCreateIteration.cxx index 5314ccc7..5a1d967d 100644 --- a/src/HOMARDGUI/MonCreateIteration.cxx +++ b/src/HOMARDGUI/MonCreateIteration.cxx @@ -39,7 +39,7 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, * Inherits from CasHomard * Sets attributes to default values */ - QDialog(0), + QScrollArea(0), Ui_CreateIteration(), _Name(""), _IterParentName(IterParentName), @@ -48,16 +48,17 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, MESSAGE("Constructeur"); myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); setupUi(this); - setModal(modal); + if ( modal ) { setWindowModality(Qt::WindowModal); } + else { setWindowModality(Qt::NonModal); } InitConnect(); SetNewName(); GetHypotheses(); - if (_IterParentName != QString("")) - { SetIterParentName(); } - else - {setModal(false); /* permet selection de l iteration dans l arbre d etude */} + if (_IterParentName != QString("")) { SetIterParentName(); } + else { setWindowModality(Qt::NonModal) ; /* permet selection de l'iteration dans l arbre d etude */} SetTSNo(); +// + adjustSize(); } // ------------------------------------------------------------------------ MonCreateIteration::~MonCreateIteration() @@ -97,7 +98,7 @@ bool MonCreateIteration::PushOnApply() // ------------------------------------------------------------------------ // Appele lorsque l'un des boutons Ok ou Apply est presse { - MESSAGE("MonCreateIteration::PushOnApply"); + MESSAGE("PushOnApply"); // QString aName = LEName->text().trimmed(); if ( aName == QString ("")) @@ -227,9 +228,9 @@ void MonCreateIteration::SetNewName() { if ( aName == QString((MyObjects)[i])) { - num=num+1; - aName=""; - break; + num ++ ; + aName = "" ; + break ; } } } @@ -284,7 +285,7 @@ void MonCreateIteration::SetFieldFile() // ------------------------------------------------------------------------ { QString fileName0 = LEFieldFile->text().trimmed(); - QString fileName = HOMARD_QT_COMMUN::PushNomFichier(false); + QString fileName = HOMARD_QT_COMMUN::PushNomFichier( false, QString("med") ) ; if (fileName.isEmpty()) fileName = fileName0 ; LEFieldFile->setText(fileName); raise(); @@ -302,7 +303,7 @@ void MonCreateIteration::SetTSNo() TimeStep->setVisible(0); SpinBox_TimeStep->setVisible(0); SpinBox_TimeStep->setValue(-1); - +// adjustSize(); } // ------------------------------------------------------------------------ @@ -317,7 +318,7 @@ void MonCreateIteration::SetTSLast() TimeStep->setVisible(0); SpinBox_TimeStep->setVisible(0); SpinBox_TimeStep->setValue(-2); - +// adjustSize(); } // ------------------------------------------------------------------------ @@ -332,7 +333,7 @@ void MonCreateIteration::SetTSChosen() TimeStep->setVisible(1); SpinBox_TimeStep->setVisible(1); SpinBox_TimeStep->setValue(0); - +// adjustSize(); } diff --git a/src/HOMARDGUI/MonCreateIteration.h b/src/HOMARDGUI/MonCreateIteration.h index 88083ced..8bca4968 100644 --- a/src/HOMARDGUI/MonCreateIteration.h +++ b/src/HOMARDGUI/MonCreateIteration.h @@ -30,10 +30,11 @@ #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include -#include -#include +#include +// #include +// #include -class HOMARD_EXPORT MonCreateIteration : public QDialog, public Ui_CreateIteration +class HOMARD_EXPORT MonCreateIteration : public QScrollArea, public Ui_CreateIteration { Q_OBJECT diff --git a/src/HOMARDGUI/MonCreateYACS.cxx b/src/HOMARDGUI/MonCreateYACS.cxx index 11cdc461..2463febe 100644 --- a/src/HOMARDGUI/MonCreateYACS.cxx +++ b/src/HOMARDGUI/MonCreateYACS.cxx @@ -44,26 +44,27 @@ MonCreateYACS::MonCreateYACS (bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, Q _aScriptFile(""), _aDirName(""), _aMeshFile(""), - _Type(1) - // La valeur de _Type doit etre la meme que celle dans HOMARD_Gen_i::CreateYACSSchema - // et doit correspondre aux defauts des boutons + _Type(1), + _MaxIter(0), + _MaxNode(0), + _MaxElem(0) + // Les valeurs de _Type, _MaxIter, _MaxNode, _MaxElem doivent etre les memes que celles dans HOMARD_Gen_i::CreateYACSSchema + // et doivent correspondre aux defauts des boutons { // MESSAGE("Debut du constructeur de MonCreateYACS"); myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); setupUi(this); - setModal(modal); + if ( modal ) { setWindowModality(Qt::WindowModal); } + else { setWindowModality(Qt::NonModal); } InitConnect(); SetNewName() ; - if (_aCaseName != QString("")) - { SetCaseName(); } - else - {setModal(false); /* permet selection du cas dans l arbre d etude */} - + if (_aCaseName != QString("")) { SetCaseName(); } + else { setWindowModality(Qt::NonModal); /* permet selection du cas dans l arbre d etude */} +// adjustSize(); -// MESSAGE("Fin du constructeur de MonCreateYACS"); } // ---------------------------------------------------------------------- @@ -72,17 +73,18 @@ MonCreateYACS::MonCreateYACS(HOMARD::HOMARD_Gen_var myHomardGen0, // ---------------------------------------------------------------------- // Constructeur appele par MonEditYACS // - myHomardGen(myHomardGen0), - _Name (""), - Chgt (false) - { +myHomardGen(myHomardGen0), +_Name (""), +Chgt (false) +{ // MESSAGE("Debut du constructeur de MonCreateYACS appele par MonEditYACS"); - setupUi(this) ; - - setModal(true) ; - InitConnect() ; - } + setupUi(this) ; + setWindowModality(Qt::WindowModal); + InitConnect() ; +// + adjustSize(); +} // ------------------------------------------------------------------------ MonCreateYACS::~MonCreateYACS() // ------------------------------------------------------------------------ @@ -181,14 +183,15 @@ bool MonCreateYACS:: CreateOrUpdate() MESSAGE("CreateOrUpdate"); bool bOK = true ; - // Le cas + // 1. Verification des donnees + // 1.1. Le cas if ( _aCaseName == QString ("")) { QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), QObject::tr("HOM_CASE_NAME") ); return false; } - // Les donnees + // 1.2. Les donnees QString aScriptFile=LEScriptFile->text().trimmed(); if ( aScriptFile != _aScriptFile ) { @@ -208,7 +211,7 @@ bool MonCreateYACS:: CreateOrUpdate() Chgt = true ; } - // Creation de l'objet CORBA + // 2. Creation de l'objet CORBA try { _Name=LEName->text().trimmed(); @@ -221,11 +224,25 @@ bool MonCreateYACS:: CreateOrUpdate() bOK = false; } - // Options + // 3. Options if ( bOK ) - { aYACS->SetType(_Type) ; } + { + // 3.1. Le type du schema + aYACS->SetType(_Type) ; + + // 3.2. Les maximums + _MaxIter = SpinBoxMaxIter->value() ; +// aYACS->SetMaxIter(_MaxIter) ; + + _MaxNode = SpinBoxMaxNode->value() ; +// aYACS->SetMaxNode(_MaxNode) ; + + _MaxElem = SpinBoxMaxElem->value() ; +// aYACS->SetMaxElem(_MaxElem) ; + + } - // Ecriture du fichier + // 4. Ecriture du fichier if ( bOK ) { int codret = aYACS->Write() ; @@ -263,9 +280,9 @@ void MonCreateYACS::SetNewName() { if ( aName == QString(MyObjects[i])) { - num=num+1; - aName=""; - break; + num ++ ; + aName = "" ; + break ; } } } @@ -295,7 +312,7 @@ void MonCreateYACS::SetScriptFile() // ------------------------------------------------------------------------ { QString fileName0 = LEScriptFile->text().trimmed(); - QString fileName = HOMARD_QT_COMMUN::PushNomFichier(false); + QString fileName = HOMARD_QT_COMMUN::PushNomFichier( false, QString("py") ) ; if (fileName.isEmpty()) fileName = fileName0 ; LEScriptFile->setText(fileName); } @@ -304,7 +321,7 @@ void MonCreateYACS::SetMeshFile() // ------------------------------------------------------------------------ { QString fileName0 = LEMeshFile->text().trimmed(); - QString fileName = HOMARD_QT_COMMUN::PushNomFichier(false); + QString fileName = HOMARD_QT_COMMUN::PushNomFichier( false, QString("med") ) ; if (fileName.isEmpty()) fileName = fileName0 ; LEMeshFile->setText(fileName); } diff --git a/src/HOMARDGUI/MonCreateYACS.h b/src/HOMARDGUI/MonCreateYACS.h index fc84cd60..ddc97c8b 100644 --- a/src/HOMARDGUI/MonCreateYACS.h +++ b/src/HOMARDGUI/MonCreateYACS.h @@ -30,9 +30,9 @@ #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include -#include +#include -class HOMARD_EXPORT MonCreateYACS : public QDialog, public Ui_CreateYACS +class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS { Q_OBJECT @@ -50,6 +50,9 @@ class HOMARD_EXPORT MonCreateYACS : public QDialog, public Ui_CreateYACS QString _aMeshFile; int _Type; + int _MaxIter; + int _MaxNode; + int _MaxElem; bool Chgt; diff --git a/src/HOMARDGUI/MonCreateZone.cxx b/src/HOMARDGUI/MonCreateZone.cxx index 1b153118..33aac925 100644 --- a/src/HOMARDGUI/MonCreateZone.cxx +++ b/src/HOMARDGUI/MonCreateZone.cxx @@ -606,9 +606,9 @@ void MonCreateZone::SetNewName() { if ( aName == QString(MyObjects[i])) { - num=num+1; - aName=""; - break; + num ++ ; + aName = "" ; + break ; } } } diff --git a/src/HOMARDGUI/MonEditBoundaryAn.cxx b/src/HOMARDGUI/MonEditBoundaryAn.cxx index 1557d9a0..58e154d2 100644 --- a/src/HOMARDGUI/MonEditBoundaryAn.cxx +++ b/src/HOMARDGUI/MonEditBoundaryAn.cxx @@ -159,11 +159,9 @@ void MonEditBoundaryAn::SetCylinder() gBSphere->setVisible(0); gBCone->setVisible(0); RBCylindre->setChecked(1); - adjustSize(); _Type=1; RBSphere->setDisabled(true); RBCone->setDisabled(true); - adjustSize(); SpinBox_Xcent->setValue(_BoundaryAnXcentre); SpinBox_Ycent->setValue(_BoundaryAnYcentre); @@ -183,7 +181,8 @@ void MonEditBoundaryAn::SetCylinder() // Rayon SpinBox_Radius->setValue(_BoundaryAnRayon); SpinBox_Radius->setSingleStep(_BoundaryAnRayon/10.); - +// + adjustSize(); } // ------------------------------------------------------------------------ void MonEditBoundaryAn::SetSphere() @@ -195,7 +194,6 @@ void MonEditBoundaryAn::SetSphere() gBCone->setVisible(0); RBCylindre->setDisabled(true); RBCone->setDisabled(true); - adjustSize(); _Type=2 ; SpinBox_Xcentre->setValue(_BoundaryAnXcentre); @@ -212,6 +210,8 @@ void MonEditBoundaryAn::SetSphere() SpinBox_Rayon->setMinimum(0.); SpinBox_Rayon->setValue(_BoundaryAnRayon); +// + adjustSize(); } // ------------------------------------------------------------------------ void MonEditBoundaryAn::SetConeA() @@ -224,7 +224,6 @@ void MonEditBoundaryAn::SetConeA() RB_Def_angle->setChecked(1); RBCylindre->setDisabled(true); RBSphere->setDisabled(true); - adjustSize(); _Type=3; // TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X axis", 0, QApplication::UnicodeUTF8)); @@ -248,6 +247,8 @@ void MonEditBoundaryAn::SetConeA() // TLCone_V2->setVisible(0); SpinBox_Cone_V2->setVisible(0); +// + adjustSize(); } // ------------------------------------------------------------------------ void MonEditBoundaryAn::SetConeR() @@ -260,7 +261,6 @@ void MonEditBoundaryAn::SetConeR() RB_Def_radius->setChecked(1); RBCylindre->setDisabled(true); RBSphere->setDisabled(true); - adjustSize(); _Type=4; // TLCone_X1->setText(QApplication::translate("CreateBoundaryAn", "X centre 1", 0, QApplication::UnicodeUTF8)); @@ -286,6 +286,8 @@ void MonEditBoundaryAn::SetConeR() SpinBox_Cone_V2->setVisible(1); TLCone_V2->setText(QApplication::translate("CreateBoundaryAn", "Radius 2", 0, QApplication::UnicodeUTF8)); SpinBox_Cone_V2->setValue(_BoundaryAnRayon2); +// + adjustSize(); } // --------------------------------------------------- bool MonEditBoundaryAn::CreateOrUpdateBoundaryAn() diff --git a/src/HOMARDGUI/MonEditBoundaryDi.cxx b/src/HOMARDGUI/MonEditBoundaryDi.cxx index b50c4c76..aff6a930 100644 --- a/src/HOMARDGUI/MonEditBoundaryDi.cxx +++ b/src/HOMARDGUI/MonEditBoundaryDi.cxx @@ -64,7 +64,6 @@ MonEditBoundaryDi::~MonEditBoundaryDi() // ------------------------------ { } - // ------------------------------ void MonEditBoundaryDi::InitValEdit() // ------------------------------ @@ -76,6 +75,7 @@ void MonEditBoundaryDi::InitValEdit() LEFileName->setText(aMeshFile); LEFileName->setReadOnly(1); PushFichier->setVisible(0); +// adjustSize(); } // ------------------------------ diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx index 6f28eab4..eeab1792 100644 --- a/src/HOMARDGUI/MonEditHypothesis.cxx +++ b/src/HOMARDGUI/MonEditHypothesis.cxx @@ -107,11 +107,11 @@ void MonEditHypothesis::InitValEdit() if ( NivMax > 0 || DiamMin > 0 || AdapInit != 0 || LevelOutput != 0 ) { GBAdvancedOptions->setVisible(1); if ( NivMax > 0 ) - { spinBoxNivMax->setValue(NivMax); - spinBoxNivMax->setDisabled(true); } + { SpinBoxNivMax->setValue(NivMax); + SpinBoxNivMax->setDisabled(true); } else { TLMaximalLevel->setVisible(0); - spinBoxNivMax->setVisible(0); } + SpinBoxNivMax->setVisible(0); } if ( DiamMin > 0 ) { doubleSpinBoxDiamMin->setValue(DiamMin); doubleSpinBoxDiamMin->setDisabled(true); } @@ -143,7 +143,6 @@ void MonEditHypothesis::InitValEdit() else { GBAdvancedOptions->setVisible(0); } // - adjustSize(); } // ---------------------------------------- void MonEditHypothesis::InitAdaptUniforme() @@ -151,28 +150,29 @@ void MonEditHypothesis::InitAdaptUniforme() // Affichage des informations pour une adaptation uniforme { // Choix des options generales - GBFieldManagement->setVisible(0); - GBAreaManagement->setVisible(0); - GBUniform->setVisible(1); - adjustSize(); - RBUniforme->setChecked(true); - RBUniforme->setEnabled(false); - RBChamp->setEnabled(false); - RBZone->setEnabled(false); + GBFieldManagement->setVisible(0); + GBAreaManagement->setVisible(0); + GBUniform->setVisible(1); + RBUniforme->setChecked(true); + RBUniforme->setEnabled(false); + RBChamp->setEnabled(false); + RBZone->setEnabled(false); // // Raffinement ou deraffinement ? - if (_aTypeDera == 0) - { - VERIFICATION(_aTypeRaff==1); - RBUniDera->setChecked(false); - RBUniRaff->setChecked(true); - } - if (_aTypeDera == 1) - { - VERIFICATION(_aTypeRaff==0); - RBUniDera->setChecked(true); - RBUniRaff->setChecked(false); - } + if (_aTypeDera == 0) + { + VERIFICATION(_aTypeRaff==1); + RBUniDera->setChecked(false); + RBUniRaff->setChecked(true); + } + if (_aTypeDera == 1) + { + VERIFICATION(_aTypeRaff==0); + RBUniDera->setChecked(true); + RBUniRaff->setChecked(false); + } +// + adjustSize(); // } // ------------------------------------- @@ -180,52 +180,53 @@ void MonEditHypothesis::InitAdaptZone() // ------------------------------------- // Affichage des informations pour une adaptation selon des zones : { - MESSAGE ("Debut de InitAdaptZone"); + MESSAGE ("Debut de InitAdaptZone"); // Choix des options generales - GBUniform->setVisible(0); - GBFieldManagement->setVisible(0); - GBAreaManagement->setVisible(1); - adjustSize(); - RBZone->setChecked(true); - RBChamp->setEnabled(false); - RBUniforme->setEnabled(false); - RBZone->setEnabled(false); + GBUniform->setVisible(0); + GBFieldManagement->setVisible(0); + GBAreaManagement->setVisible(1); + RBZone->setChecked(true); + RBChamp->setEnabled(false); + RBUniforme->setEnabled(false); + RBZone->setEnabled(false); // Recuperation de toutes les zones decrites et notation de celles retenues - GetAllZones(); - HOMARD::listeZonesHypo_var mesZonesAvant = aHypothesis->GetZones(); - for (int i=0; ilength(); i++) + GetAllZones(); + HOMARD::listeZonesHypo_var mesZonesAvant = aHypothesis->GetZones(); + for (int i=0; ilength(); i++) + { + MESSAGE ("i"<rowCount(); j++) { - MESSAGE ("i"<rowCount(); j++) + MESSAGE (". j"<item(j,2)->text().toStdString()); + if ( TWZone->item(j,2)->text().toStdString() == string(mesZonesAvant[i]) ) { - MESSAGE (". j"<item(j,2)->text().toStdString()); - if ( TWZone->item(j,2)->text().toStdString() == string(mesZonesAvant[i]) ) + MESSAGE ("OK avec "<item( j,0 )->setCheckState( Qt::Checked ); + TWZone->item( j,1 )->setCheckState( Qt::Unchecked ); } + else { - MESSAGE ("OK avec "<item( j,0 )->setCheckState( Qt::Checked ); - TWZone->item( j,1 )->setCheckState( Qt::Unchecked ); } - else - { - MESSAGE ("... DERA"); - TWZone->item( j,0 )->setCheckState( Qt::Unchecked ); - TWZone->item( j,1 )->setCheckState( Qt::Checked ); } - break; - } + MESSAGE ("... DERA"); + TWZone->item( j,0 )->setCheckState( Qt::Unchecked ); + TWZone->item( j,1 )->setCheckState( Qt::Checked ); } + break; } - i += 1 ; } + i += 1 ; + } // // Inactivation des choix - for ( int j =0 ; j < TWZone->rowCount(); j++) - { - TWZone->item( j, 0 )->setFlags(0); - TWZone->item( j, 1 )->setFlags(0); - } - PBZoneNew->setVisible(0); + for ( int j =0 ; j < TWZone->rowCount(); j++) + { + TWZone->item( j, 0 )->setFlags(0); + TWZone->item( j, 1 )->setFlags(0); + } + PBZoneNew->setVisible(0); +// + adjustSize(); // } // ------------------------------------- @@ -242,7 +243,6 @@ void MonEditHypothesis::InitAdaptChamps() GBUniform->setVisible(0); GBAreaManagement->setVisible(0); GBFieldManagement->setVisible(1); - adjustSize(); RBChamp->setChecked(true); RBUniforme->setEnabled(false); RBChamp->setEnabled(false); @@ -344,6 +344,8 @@ void MonEditHypothesis::InitAdaptChamps() RBInf->setChecked(true); RBInf->setEnabled(true); } +// + adjustSize(); } // ------------------------------------- void MonEditHypothesis::InitFieldInterp() diff --git a/src/HOMARDGUI/MonEditIteration.cxx b/src/HOMARDGUI/MonEditIteration.cxx index ca231f98..e66361fb 100644 --- a/src/HOMARDGUI/MonEditIteration.cxx +++ b/src/HOMARDGUI/MonEditIteration.cxx @@ -81,7 +81,6 @@ void MonEditIteration::InitValEdit0(int etat) // Invisibilite des hypotheses et des champs Hypothese->setVisible(0); GBField->setVisible(0); - adjustSize(); // } // ------------------------------ @@ -93,32 +92,32 @@ void MonEditIteration::InitValEdit() LEName->setText(_IterationName); LEName->setReadOnly(true); -// Affichage bloque du nom de l'iteration parent + // Affichage bloque du nom de l'iteration parent _IterParentName = aIter->GetIterParentName(); LEIterationParentName->setText(_IterParentName); LEIterationParentName->setReadOnly(true); PBIterParent->setEnabled(false); PBIterParent->setVisible(0); -// Affichage bloque du nom du maillage de l'iteration parent + // Affichage bloque du nom du maillage de l'iteration parent aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()); QString MeshNameParent = aIterParent->GetMeshName(); LEMeshName_n->setText(MeshNameParent); LEMeshName_n->setReadOnly(1); -// Affichage bloque du nom du maillage de l'iteration courante + // Affichage bloque du nom du maillage de l'iteration courante QString MeshName = aIter->GetMeshName(); LEMeshName_np1->setText(MeshName); LEMeshName_np1->setReadOnly(1); -// Affichage de la bonne hypothese + // Affichage de la bonne hypothese QString HypoName = aIter->GetHypoName(); CBHypothese->insertItem(0,HypoName); CBHypothese->setCurrentIndex(0); CBHypothese->setEnabled(false); PBHypoNew->setVisible(0); -// Pour une adaptation selon un champ + // Pour une adaptation selon un champ HOMARD::HOMARD_Hypothesis_var myHypo = myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ; _aTypeAdap = myHypo->GetAdapType() ; if ( _aTypeAdap == 1 ) @@ -130,7 +129,7 @@ void MonEditIteration::InitValEdit() _rank = aIter->GetRank() ; SpinBox_Rank->setValue(_rank); -// Cas ou on prend le dernier pas de temps ou sans pas de temps + // Cas ou on prend le dernier pas de temps ou sans pas de temps if ( _step <= -1 ) { Rank->setVisible(0); @@ -142,7 +141,7 @@ void MonEditIteration::InitValEdit() else { RBNo->setChecked(true); } } -// Cas avec pas de temps + // Cas avec pas de temps else { Rank->setVisible(1); @@ -156,6 +155,7 @@ void MonEditIteration::InitValEdit() { GBField->setVisible(0); } +// adjustSize(); // } diff --git a/src/HOMARDGUI/MonEditYACS.cxx b/src/HOMARDGUI/MonEditYACS.cxx index 9d2aa831..6d2571dd 100644 --- a/src/HOMARDGUI/MonEditYACS.cxx +++ b/src/HOMARDGUI/MonEditYACS.cxx @@ -75,7 +75,6 @@ void MonEditYACS::InitValEdit() RBConstant->setEnabled(false); RBVariable->setEnabled(false); // - adjustSize(); } // --------------------------------------------------- diff --git a/src/HOMARDGUI/MonMeshInfo.cxx b/src/HOMARDGUI/MonMeshInfo.cxx index 62e891f4..143f1bd6 100644 --- a/src/HOMARDGUI/MonMeshInfo.cxx +++ b/src/HOMARDGUI/MonMeshInfo.cxx @@ -207,9 +207,9 @@ void MonMeshInfo::SetNewCaseName() { if ( aCaseName == QString((MyCases)[i]) ) { - num += 1 ; - aCaseName=""; - break; + num ++ ; + aCaseName = "" ; + break ; } } } @@ -228,7 +228,7 @@ void MonMeshInfo::SetFileName() // ------------------------------------------------------------------------ { QString fileName0 = LEFileName->text().trimmed(); - QString fileName = HOMARD_QT_COMMUN::PushNomFichier(); + QString fileName = HOMARD_QT_COMMUN::PushNomFichier( false, QString("med") ) ; if (fileName.isEmpty()) fileName = fileName0 ; LEFileName->setText(fileName); } diff --git a/src/HOMARDGUI/MonPursueIteration.cxx b/src/HOMARDGUI/MonPursueIteration.cxx index 6d98b287..e441e581 100644 --- a/src/HOMARDGUI/MonPursueIteration.cxx +++ b/src/HOMARDGUI/MonPursueIteration.cxx @@ -53,7 +53,7 @@ MonPursueIteration::MonPursueIteration ( bool modal, HOMARD::HOMARD_Gen_var myHo SetNewCaseName() ; _Type = 1 ; GBIterationintoCase->setVisible(0); - spinBoxNumber->setVisible(0); + SpinBoxNumber->setVisible(0); adjustSize(); MESSAGE("Fin du constructeur de MonPursueIteration"); @@ -138,7 +138,7 @@ bool MonPursueIteration::PushOnApply() // 3. Enregistrement du numero d'iteration int Number ; - if ( _Type == 3 ) { Number = spinBoxNumber->value() ; } + if ( _Type == 3 ) { Number = SpinBoxNumber->value() ; } // 4. Creation du cas QString _aCaseName=LECaseName->text().trimmed(); @@ -238,9 +238,9 @@ void MonPursueIteration::SetNewCaseName() { if ( aCaseName == QString((MyCases)[i])) { - num += 1; - aCaseName = ""; - break; + num ++ ; + aCaseName = "" ; + break ; } } } @@ -266,7 +266,7 @@ void MonPursueIteration::FromIteration() // ------------------------------------------------------------------------ { GBIterationintoCase->setVisible(0); - spinBoxNumber->setVisible(0); + SpinBoxNumber->setVisible(0); _Type = 1 ; adjustSize(); } @@ -281,7 +281,7 @@ void MonPursueIteration::FromCase() void MonPursueIteration::CaseLastIteration() // ------------------------------------------------------------------------ { - spinBoxNumber->setVisible(0); + SpinBoxNumber->setVisible(0); _Type = 2 ; adjustSize(); } @@ -289,7 +289,7 @@ void MonPursueIteration::CaseLastIteration() void MonPursueIteration::CaseNIteration() // ------------------------------------------------------------------------ { - spinBoxNumber->setVisible(1); + SpinBoxNumber->setVisible(1); _Type = 3 ; adjustSize(); } diff --git a/src/HOMARDGUI/PursueIteration.h b/src/HOMARDGUI/PursueIteration.h index 565464ff..ee87c56f 100644 --- a/src/HOMARDGUI/PursueIteration.h +++ b/src/HOMARDGUI/PursueIteration.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'PursueIteration.ui' ** -** Created: Mon Apr 8 11:14:52 2013 +** Created: Wed Jan 15 08:41:44 2014 ** by: Qt User Interface Compiler version 4.6.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -49,7 +49,7 @@ public: QGridLayout *gridLayout; QRadioButton *RBCaseLastIteration; QRadioButton *RBCaseNIteration; - QSpinBox *spinBoxNumber; + QSpinBox *SpinBoxNumber; QGroupBox *GroupButtons; QGridLayout *gridLayout1; QPushButton *buttonHelp; @@ -171,11 +171,11 @@ public: gridLayout->addWidget(RBCaseNIteration, 1, 0, 1, 1); - spinBoxNumber = new QSpinBox(GBIterationintoCase); - spinBoxNumber->setObjectName(QString::fromUtf8("spinBoxNumber")); - spinBoxNumber->setMaximum(1789); + SpinBoxNumber = new QSpinBox(GBIterationintoCase); + SpinBoxNumber->setObjectName(QString::fromUtf8("SpinBoxNumber")); + SpinBoxNumber->setMaximum(1789); - gridLayout->addWidget(spinBoxNumber, 1, 1, 1, 1); + gridLayout->addWidget(SpinBoxNumber, 1, 1, 1, 1); gridLayout_2->addWidget(GBIterationintoCase, 4, 0, 1, 2); diff --git a/src/HOMARDGUI/PursueIteration.ui b/src/HOMARDGUI/PursueIteration.ui index cf2fbe23..ad3de235 100644 --- a/src/HOMARDGUI/PursueIteration.ui +++ b/src/HOMARDGUI/PursueIteration.ui @@ -165,7 +165,7 @@ - + 1789 diff --git a/src/HOMARD_I/HOMARD_Boundary_i.cxx b/src/HOMARD_I/HOMARD_Boundary_i.cxx index 3eec2c4c..45a73a8b 100644 --- a/src/HOMARD_I/HOMARD_Boundary_i.cxx +++ b/src/HOMARD_I/HOMARD_Boundary_i.cxx @@ -137,7 +137,8 @@ void HOMARD_Boundary_i::SetMeshFile( const char* MeshFile ) { ASSERT( myHomardBoundary ); myHomardBoundary->SetMeshFile( MeshFile ); - _gen_i->PublishResultInSmesh(MeshFile, 0); + int PublisMeshIN = _gen_i->GetPublisMeshIN () ; + if ( PublisMeshIN != 0 ) { _gen_i->PublishResultInSmesh(MeshFile, 0); } } //============================================================================= char* HOMARD_Boundary_i::GetMeshFile() diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx index 71966dc7..4169a8c4 100755 --- a/src/HOMARD_I/HOMARD_Gen_i.cxx +++ b/src/HOMARD_I/HOMARD_Gen_i.cxx @@ -104,8 +104,8 @@ Engines_Component_i(orb, poa, contId, instanceName, interfaceName) _tag_hypo = 0 ; _tag_yacs = 0 ; _tag_zone = 0 ; - _Langue = "Francais" ; - _LangueShort = "fr" ; + + SetPreferences( ) ; } //================================= /*! @@ -839,14 +839,11 @@ void HOMARD_Gen_i::AssociateIterHypo(const char* nomIter, const char* nomHypo) SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration))); ASSERT(!CORBA::is_nil(aIterSO)); - // Gestion de l'etude + // Gestion de l'arbre d'etudes SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder(); - aStudyBuilder->NewCommand(); - SALOMEDS::SObject_var aSubSO = aStudyBuilder->NewObject(aIterSO); aStudyBuilder->Addreference(aSubSO, aHypoSO); - aStudyBuilder->CommitCommand(); // Liens reciproques @@ -1088,7 +1085,9 @@ void HOMARD_Gen_i::MeshInfo(const char* nomCas, const char* MeshName, const char IsValidStudy () ; // Creation du cas - HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, 0, 1) ; + int option = 1 ; + if ( _PublisMeshIN != 0 ) option = 2 ; + HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, 0, option) ; myCase->SetDirName(DirName) ; // Analyse myCase->MeshInfo(Qual, Diam, Conn, Tail, Inte) ; @@ -1185,8 +1184,9 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase(const char* nomCas, const char* { INFOS ( "CreateCase : nomCas = " << nomCas << ", MeshName = " << MeshName << ", MeshFile = " << MeshFile ); - // Par defaut, on ne publie pas le maillage - HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 0, 0, 1) ; + int option = 1 ; + if ( _PublisMeshIN != 0 ) option = 2 ; + HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 0, 0, option) ; // Valeurs par defaut des filtrages myCase->SetPyram(0); @@ -1360,8 +1360,9 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromIteration(const char* nomCas, // C. Creation effective du cas - // Par defaut, on ne publie pas le maillage - HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, NumeIter, 1) ; + int option = 1 ; + if ( _PublisMeshIN != 0 ) option = 2 ; + HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, NumeIter, option) ; // D. Parametrages lus dans le fichier de configuration @@ -1877,6 +1878,14 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* NomIterat // Lien avec l'iteration precedente myIterationParent->LinkNextIteration(NomIteration); myIteration->SetIterParentName(nomIterParent); + // Gestion de l'arbre d'etudes + SALOMEDS::SObject_var aIterSOParent = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIterationParent))); + SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration))); + SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder(); + aStudyBuilder->NewCommand(); + SALOMEDS::SObject_var aSubSO = aStudyBuilder->NewObject(aIterSO); + aStudyBuilder->Addreference(aSubSO, aIterSOParent); + aStudyBuilder->CommitCommand(); return HOMARD::HOMARD_Iteration::_duplicate(myIteration); } @@ -2361,7 +2370,44 @@ CORBA::Long HOMARD_Gen_i::Compute(const char* NomIteration, CORBA::Long etatMena HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[NomIteration]; ASSERT(!CORBA::is_nil(myIteration)); - // A.2. Numero de l'iteration + // A.2. Controle de la possibilite d'agir + // A.2.1. Etat de l'iteration + int etat = myIteration->GetState(); + MESSAGE ( "etat = "<GetCaseName(); HOMARD::HOMARD_Cas_var myCase = myContextMap[GetCurrentStudyID()]._mesCas[nomCas]; ASSERT(!CORBA::is_nil(myCase)); @@ -2574,8 +2620,6 @@ CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOM // A. Prealable // A.1. Bases int codret = 0; - // Etat de l'iteration - int etat = myIteration->GetState(); // Numero de l'iteration int NumeIter = myIteration->GetNumber(); std::stringstream saux0 ; @@ -2583,18 +2627,7 @@ CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOM std::string siter = saux0.str() ; if (NumeIter < 11) { siter = "0" + siter ; } - // A.2. On ne calcule pas l iteration initiale - if ( etat <= 0 ) - { - MESSAGE ( "etat = "<GetHypoName(); if (std::string(nomHypo) == std::string("")) { @@ -2921,7 +2954,7 @@ char* HOMARD_Gen_i::ComputeDirManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD:: { SALOME::ExceptionStruct es; es.type = SALOME::BAD_PARAM; - std::string text = "Directory : " + DirCompute.str() + "is not empty"; + std::string text = "Directory : " + DirCompute.str() + " is not empty"; es.text = CORBA::string_dup(text.c_str()); throw SALOME::SALOME_Exception(es); VERIFICATION("Directory is not empty" == 0); @@ -3699,10 +3732,7 @@ void HOMARD_Gen_i::PublishResultInSmesh(const char* NomFich, CORBA::Long Option) { MESSAGE ( "PublishResultInSmesh : le fichier " << NomFich << " est deja publie." ); // Pour un fichier importe, on ne republie pas - if ( Option == 0 ) - { - return; - } + if ( Option == 0 ) { return; } // Pour un fichier calcule, on commence par faire la depublication else { @@ -3795,6 +3825,37 @@ void HOMARD_Gen_i::DeleteResultInSmesh(std::string NomFich, std::string MeshName return ; } //============================================================================= +void HOMARD_Gen_i::PublishMeshIterInSmesh(const char* NomIter) +{ + MESSAGE( "PublishMeshIterInSmesh " << NomIter); + HOMARD::HOMARD_Iteration_var myIteration = myContextMap[GetCurrentStudyID()]._mesIterations[NomIter]; + + SALOMEDS::SObject_var aIterSO=SALOMEDS::SObject::_narrow(myCurrentStudy->FindObjectIOR(_orb->object_to_string(myIteration))); + if (CORBA::is_nil(myIteration)) + { + SALOME::ExceptionStruct es; + es.type = SALOME::BAD_PARAM; + es.text = "Invalid iterationStudy Object"; + throw SALOME::SALOME_Exception(es); + return ; + }; + const char* MeshFile = myIteration->GetMeshFile() ; + const char* MeshName = myIteration->GetMeshName() ; + CORBA::Long Option = -1 ; + int etat = myIteration->GetState(); +// Iteration initiale + if ( etat <= 0 ) { Option = 0 ; } +// ou iteration calculee + else if ( etat == 2 ) { Option = 1 ; } +// Publication effective apres menage eventuel + if ( Option >= 0 ) + { + DeleteResultInSmesh(MeshFile, MeshName) ; + PublishResultInSmesh(MeshFile, Option) ; + } + +} +//============================================================================= void HOMARD_Gen_i::PublishFileUnderIteration(const char* NomIter, const char* NomFich, const char* Commentaire) { // MESSAGE ("PublishFileUnderIteration pour l'iteration " << NomIter << " du fichier " << NomFich << " avec le commentaire " << Commentaire ); @@ -4147,7 +4208,7 @@ std::string HOMARD_Gen_i::YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHy texte_control_0 = myDriver->Texte_Iter_1_Zone(ZoneType, pythonStructure, methode, ZoneName ); texte_control += texte_control_0 ; // 5. Decalage - iaux += 1 ; + iaux ++ ; } return texte_control ; @@ -4422,7 +4483,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, } else if (line.substr(0, iterSignature.size()) == iterSignature) { // re-create iteration - MESSAGE ("Recreation de l iteration" ); + MESSAGE ("Recreation de l'iteration" ); HOMARD::HOMARD_Iteration_var aIter = newIteration(); PortableServer::ServantBase_var aServant = GetServant(aIter); HOMARD_Iteration_i* aIterServant = dynamic_cast(aServant.in()); @@ -4640,7 +4701,7 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy, std::string aScript = "\"\"\"\n"; aScript += "Python script for HOMARD\n"; - aScript += "Copyright EDF-R&D 2013\n"; + aScript += "Copyright EDF-R&D 1996, 2011, 2014\n"; aScript += "\"\"\"\n"; aScript += "__revision__ = \"V1.2\"\n"; aScript += "import HOMARD\n"; @@ -4853,30 +4914,165 @@ char* HOMARD_Gen_i::getVersion() #endif } //=============================================================================== -// Recuperation de la chaine de caracteres par rapport a l'apparition d'un texte +// Recuperation de la chaine de caracteres par rapport a l'apparition d'un caractere // ligne : la ligne a manipuler -// texte : le texte a reperer -// option : 0 : la chaine avant le texte -// 1 : la chaine apres le texte -// Si le texte est absent, on retourne la chaine totale +// caractere : le caractere a reperer +// option : 0 : la chaine avant la premiere apparition du caractere +// 1 : la chaine apres la premiere apparition du caractere +// 2 : la chaine avant la derniere apparition du caractere +// 3 : la chaine apres la derniere apparition du caractere +// Si le caractere est absent, on retourne la chaine totale //=============================================================================== -std::string HOMARD_Gen_i::GetStringInTexte( const std::string ligne, const std::string texte, int option ) +std::string HOMARD_Gen_i::GetStringInTexte( const std::string ligne, const std::string caractere, int option ) { -// MESSAGE("GetStringInTexte, recherche de '"<> mot_cle ; + chaine = GetStringInTexte ( mot_cle, "\"", 1 ) ; + chaine = GetStringInTexte ( chaine, "\"", 0 ) ; + if ( chaine == "language" ) { section_langue = true ; } + if ( chaine == "HOMARD" ) { section_homard = true ; } + // MESSAGE ( "section_langue = "<" ) + { /*MESSAGE ( "Fin de la section : "<< ligne<<", section_langue = "<> mot_cle ; + chaine = GetStringInTexte ( mot_cle, "\"", 1 ) ; + chaine = GetStringInTexte ( chaine, "\"", 0 ) ; +// MESSAGE("chaine = "<> mot_cle ; + std::string chaine2 = GetStringInTexte ( mot_cle, "\"", 1 ) ; + chaine2 = GetStringInTexte ( chaine2, "\"", 0 ) ; +// MESSAGE("chaine2 = "<> PublisMeshIN ; } + if ( chaine2 == "publish_mesh_out" ) { chainebis >> PublisMeshOUT ; } + // 3.2.2. Les maximum pour YACS + if ( chaine2 == "max_iter" ) { chainebis >> YACSMaxIter ; } + if ( chaine2 == "max_node" ) { chainebis >> YACSMaxNode ; } + if ( chaine2 == "max_elem" ) { chainebis >> YACSMaxElem ; } + } + } + } + } + } + + // C. Enregistrement + MESSAGE ("Enregistrement de LanguageShort = " << LanguageShort ); + MESSAGE ("Enregistrement de PublisMeshIN = " << PublisMeshIN<<", PublisMeshOUT = "<< PublisMeshOUT); + MESSAGE ("Enregistrement de YACSMaxIter = " << YACSMaxIter<<", YACSMaxNode = "<< YACSMaxNode<<", YACSMaxElem = "<< YACSMaxElem); + SetLanguageShort( LanguageShort.c_str() ) ; + SetPublisMesh(PublisMeshIN, PublisMeshOUT) ; + SetYACSMaximum(YACSMaxIter, YACSMaxNode, YACSMaxElem) ; + + return ; +} +//=============================================================================== +// Langue de SALOME +//=============================================================================== void HOMARD_Gen_i::SetLanguageShort(const char* LanguageShort) { // MESSAGE ("SetLanguageShort pour LanguageShort = " << LanguageShort ); @@ -4890,6 +5086,45 @@ char* HOMARD_Gen_i::GetLanguageShort() // MESSAGE ("GetLanguageShort"); return CORBA::string_dup( _LangueShort.c_str() ); } +//=============================================================================== +// Options de publications +//=============================================================================== +void HOMARD_Gen_i::SetPublisMesh(CORBA::Long PublisMeshIN, CORBA::Long PublisMeshOUT) +{ + _PublisMeshIN = PublisMeshIN ; + _PublisMeshOUT = PublisMeshOUT ; + return ; +} +CORBA::Long HOMARD_Gen_i::GetPublisMeshIN() +{ + return _PublisMeshIN ; +} +CORBA::Long HOMARD_Gen_i::GetPublisMeshOUT() +{ + return _PublisMeshOUT ; +} +//=============================================================================== +// YACS - maximum +//=============================================================================== +void HOMARD_Gen_i::SetYACSMaximum(CORBA::Long YACSMaxIter, CORBA::Long YACSMaxNode, CORBA::Long YACSMaxElem) +{ + _YACSMaxIter = YACSMaxIter ; + _YACSMaxNode = YACSMaxNode ; + _YACSMaxElem = YACSMaxElem ; + return ; +} +CORBA::Long HOMARD_Gen_i::GetYACSMaxIter() +{ + return _YACSMaxIter ; +} +CORBA::Long HOMARD_Gen_i::GetYACSMaxNode() +{ + return _YACSMaxNode ; +} +CORBA::Long HOMARD_Gen_i::GetYACSMaxElem() +{ + return _YACSMaxElem ; +} //============================================================================= extern "C" diff --git a/src/HOMARD_I/HOMARD_Gen_i.hxx b/src/HOMARD_I/HOMARD_Gen_i.hxx index 0800863c..3ec90d91 100644 --- a/src/HOMARD_I/HOMARD_Gen_i.hxx +++ b/src/HOMARD_I/HOMARD_Gen_i.hxx @@ -187,6 +187,7 @@ public: void PublishCaseUnderYACS(const char* YACSName, const char* CaseName); void PublishResultInSmesh(const char* NomFich, CORBA::Long Option); void DeleteResultInSmesh(std::string NomFich, std::string MeshName); + void PublishMeshIterInSmesh(const char* NomIter); // YACS HOMARD::HOMARD_YACS_ptr CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile); @@ -195,9 +196,17 @@ public: std::string YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver); std::string YACSDriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, YACSDriver* myDriver); -// Divers +// Preferences + void SetPreferences() ; void SetLanguageShort(const char* LanguageShort); char* GetLanguageShort(); + void SetPublisMesh(CORBA::Long PublisMeshIN, CORBA::Long PublisMeshOUT); + CORBA::Long GetPublisMeshIN(); + CORBA::Long GetPublisMeshOUT(); + void SetYACSMaximum(CORBA::Long YACSMaxIter, CORBA::Long YACSMaxNode, CORBA::Long YACSMaxElem); + CORBA::Long GetYACSMaxIter(); + CORBA::Long GetYACSMaxNode(); + CORBA::Long GetYACSMaxElem(); // --------------------------------------------------------------- @@ -316,8 +325,16 @@ private: int _tag_hypo ; int _tag_yacs ; int _tag_zone ; + +// Preferences std::string _Langue ; std::string _LangueShort ; + int _PublisMeshIN ; + int _PublisMeshOUT ; + int _YACSMaxIter ; + int _YACSMaxNode ; + int _YACSMaxElem ; + ; }; -- 2.39.2