From d0cd6d785b96ac63b61c0951862450b982a9eb9d Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Mon, 31 Mar 2014 09:49:31 +0000 Subject: [PATCH] ajout CarmelCND en tant qu icone --- Makefile.in | 1 + resources/eficasCND.png | Bin 0 -> 8825 bytes src/EFICASGUI/EFICASGUI.py | 10 ++++++++++ src/EFICASGUI/eficasSalome.py | 8 +++++--- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 resources/eficasCND.png diff --git a/Makefile.in b/Makefile.in index 86bef06a..818def6f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,6 +25,7 @@ eficasternovice.png \ eficasotstd.png \ eficasotwrp.png \ eficascarmel.png \ +eficasCND.png \ moins.png \ plus.png \ select1.png \ diff --git a/resources/eficasCND.png b/resources/eficasCND.png new file mode 100644 index 0000000000000000000000000000000000000000..b752a2ff9b416c9ba338fd4ef6d2ee5dfa7aa2ce GIT binary patch literal 8825 zcmV-Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02~Pb03J;NK6?)200007bV*G`2i^k< z3la+8HCzG!0013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z001BW zNklNYF3#E`ygwAxHXqqNzo8e?U^RUm}>-WdWbaM8YPq@{~ z`#k55oU_-k*LS_|df)H6)(U(mAIgXFq5Q8FDb^2S_vSn3YC8`h!cU1fCB^XHrd*`! zzi88}?~P|{c%6~;NE6D73Ex$o-y&Un-BVF@ZTYheA&{>7ye*ZN6$k&mnBFs=!s8fg ztE}29t@zlFQ>tgrmRmTstB!)HNH=}Omd?P7U7PQ~-f1`VDdF zy92l~jef-HyfuxwUIU(rQ&*}3wOFGceZY@XtmhVBb((!hb$o4cHA_7FIU7YKUm_Sd zFQw)U2Iy>Ulz#lGZA?R7|2$7N&SCCHtONt8y^hgzl8W=6l0JLCEv%jEY`pMGnEMec z0(i{ShKlpY*B91`!`s4tl~!7lnAu}maQgl5C&HXd7OuI~nu3N{IkJ81uO$uE z6tye-4#|$kr5_)yUmu11hR1EZzo(vnFYRT}ZJ8=3Hj@_+<}on`twjx(_)}k9#QT_wNrV94eS4 zoj7r#S*MA-vp;>8#qWt+pIQ&p5R%ib&VFR?NPR}$-vdf$>_@LF(OPKb$o4w=&JugF z2nLSrOLk4Q(%l~Mh3E9iWXqm6T3&O~!~m=1=xF`XV0E`;>|%EJ4{-bKx7$Md-(HH} zn^9eXkiwq5d)dG4x8FsMT=NtmIBW0a_S|g(X)91RNa- zo6cp+mPLXkj_xeV$YiO4mpdHz6hUQWCAtiOKj{px-R>seY^2yAG_}|hQkgbwTDbok z|6t?9-Ux3ok#x9&yxZf!VzB@;#(g+9FX}6u1SL5J>~?$Xa%Wr8djEEJfWw1+3JVL- zaxjWg@l>MMmoQlVkV-{G1$t*@V6{2}?67;tHyJ6`NB3(e7{V>9l$V!}&EOMzQ}VXL zV7akaEPVRYpN=0d<>p6yrI#d16M@y4E?7Yh5Bf&IGEA5O_iDZ9u^~SJCH?>m1VZfV z^K#M|pscJcJWHJeQ7)|`sLxN>0~#TEk)Y1;byAyi4C zw6t`)IP}hZ-h4KuRt*Lf&bWi9V#GNS^!UPUcta|eEm^|m&70$oUVgFW*X21z_V)B> zTe9ZA*m(9QQRchV8BF~C9S&6BiYu<*>8GEb0G1NEPiqv94f$~dm4sUGT)nFjR!2uugaKnla9O(D)bjtvqkYMrR#p#2UYoI3vSb!BJa_ro)%D#SY-1pzv z>)}r)1`q-+zx;9yum+=5IiL!jKQ)M3RueiFE}^Hcu5Qfs2czSPBZEF(I5iYcu?VSx zGhUg3;wfBp@iH!3vJmNLtELId&(9ANzVB}M5~1kX>If>l(dp!!ZZ~bNahe6#y)yco zTot7HB8^|n}G9Uk!WLR(_GMUo_HYARW|awV57nTvGr`Iule zG&H;_e)z>rS{~p~P+|S4A^y@jNKnI+mzS4QUtf>aYE8`VO`Wa@*0fwBu2|001O-q9 zynfad7p#%@pEIY5l`B_r&pr2O5V?cVU?~DVF|&x`(lRP5D`VGQTFL)??&ZcYwtdSj zJQ2;p%*Z#fdiE6R>gq6=OflGd6OGTmK3bQ-J!qY1-egtK=MPa>Scq%mlQ!OZHaZUV zhj{8lKL`7L6ciP){E|!Av}sdf4T>!l?2E;q!;HeNUArvHmM!zf3x#wNTskce zk0Pk8ttBTXXWWkl$S=nB$G5^H!dNuh41u?xY>6UMf)%Dk(3pW2Ll9Q8Fu6*e@Idhk= z`TJib|Hc1`axRV!`B}aBBu9t*%$hZe`|rP>wQJW(nRuw;tINg2*wO9_QNQI3f86kD z*|KHJ`XZkHkJ|(t$0DBJ*YD+!L*^4V-bhjLxOLEIhUv4AuDw;WkCB?CK@C|9Iu@5$ zC|BIk>4ov)b>rW%&X)7hHDPly&^=$vGpo)sk!RFn>S==^vvyrZ6Y6(wvgv-XAzYWE zPctC)gjA|ared;3lcNDu@Jfe+UVn(%+FF9aV9FXLesqV8_M=cS3+dn2h5M3|4_-%P zcl8nlIzek|>x009k?Tk_#WX$Fh)$;`r?&%K;p*kpRvUOD>}-~ zHRxC}H5U{YoIW1=%}yVO+Kb0>JMO_cEvCCV-$XTlJpl(Jp z=@y{3J;pL%)XapB2E}4u^EGjUpCshi-`}9|-@hMjAW0H6wx&9{b!n~by{64~45vb( z;yRD4Qdwxxq{!M_K|0()X3m_MoToQYs~%isW3VS|TAc%UA6R8;+qbhwD=;?bBnpi> z`uh5`JcZQXT~!f>-l1jVbJ}15*Jg+n$N&Du*lcuU3f5?@N)xPpe+YMI1gt^L=)c_^ zq`JDAmtTI_mPQY(4EBJkFr44B0!3J&!7@q`g$9Y<-rg*MrNF^=qOu8NV0E`&nJHK< zS!LJm-C1GpWmRAwbh4{y%SGYK6=$V-30%&&yk@R}5xZ;YGGoRw|f3r=@ z!^s{u-~8&G_jWryns`)LjC6N*Cml#9?u4N2oh>~1Ge#@F=&F-<_e(G8@TGKtK_t_${z`e>~%3XFmPYD)2r!HXB#XD zLHj$eM`+g=Sec~qhokNT13p3_1^dpXRhgvnM+SQ^pb#3gN2NOi(B+jWEG(o*ug2gi z6{b#|3h+ou6MFl`2elHg&Y;5SK^HCd!I=D@=9*PDyt6WIq#2oCo9 zP{KUe^_hZo$`xcF5F#|#3rcidox@-i>O@RpdCHV2eEj1d|3QjPe@hcAS>?>2la}7W znEaq7Sar+aP7^DNjIqEP>`8lIRS}M9y1X*g)z#$qT`Mxl5chaxHgz}%38*P8in7lB zP?)_aDk{Qa)@DKSjXH{o(n!x8-({H?ABIU^FZm`tQ_81n7Ar9uPy(8JEZz_oT!td) z(;5q>)2RiPJp-^{V~3MYZ`k`Xh5{LZ)$I$h>GTL#g;6n-Ur|TF%8Ln>el!o1lCs)F6UUSuUUA*>Qkd;GoI&0s)b@uG#yDVqZ7KopbikyWNo zpN_$xJ!2OX=hCT5ZGgm|e_&(JmZ46AnLR<>hSJ zw8>`p+!fJaDS~%<+<4-oT0%l_Y|ziEXB@a?mBot|QBy8Mw+2|D5wNs36)%{Q!&Y6& zi-mRk2F_6yNRn7NqmY#|fM5);^g8l%Duj0+M}VcfW{vIfU;NzqO6v=pXVFt)Hbi-o zg=W15SZXv_;@y{QJP{q_Z|m{!ce{tef`XXAoi`*welZtRmtwcu8)G>u{r(VJyWGfn z6FE8Nm}_63FjHPp$t82=0W=yz0jt&o@rBfI79b~Av#!|%CRQNx*JQP7|JD_3`hD7_ z+o+Ss*9m%hdgjD2>*7GN8uwS6V`5DNK><{S~1pkyPK`u zUaIuPBio@gM2|T?pM?t-vTofl*{K0mpFhObE*HAILW+tkabDZNw2En5d+oJ+_q*S< zJ^A1&s}}G+Wf-hnZ8JT)(9DX|Jkk|$xz8lPD$omthK6die*enadu=;*?3n+|Gtb;} zYDlKT>y7~HDsMfMW??z|vr~0U9a`Fy$ArWJyhI&8n*5-v9oq?fCKI5hSdZW(5_&CqMZ~e*gR5 z$K~qU+S=H$V+Y?^{n43P>_nGW#$+;c+ikbmK6iA-d~~`fuq2>b7XXa0_Mu1ip}Xz+ zO!heHbrPjHdaYefqwSmhF0L;G3QK`fBAmN6FXP)+MVK-h50);T+g_DtV!BZcZyWCK z)c%}0jQ>CHv_)uxhWR<;4x-oVQ)9rpPu)8)1Q3YPfOupc#HDmpHB2gx^tbm69Nvcg z)n~@~y#ALq9GQ^<;lS7!0hV~+qc%<*g1)n{$FIMWQFecV6Ls1%nl%`2276+FWemqS z16^_4!7iw|X#5$aBCQzfv?qwpVBn^kZc3g3S3>tqtVkw}Eb$b4ld6FK0HuiZX*%S`VgGmm{cf+AVYa%$XcKcyOF%W!O=7_Ze0!Sr~rt zp7whuniE0zG{i7hm%M1ODqdN|5e!j0J{^AkB1k2s5-NwbzQMx}KOF9J+hMXHr8x!$ z2Et*6_=C+xz@JtEWHaDa?ZC?OKDw?8S^3Ga_Obs^?j0J3_K)o<3iYGWv3{sksI4VC#w6Byc{A_#>-?BDkGQnvj$?eRS0k=fnrB{w%WVvRS9 zF2WgzPf@Xlv!qsr`l1Fb43@&8Y=9Mr21~m9CYyNb5i9LSl1|C>`D6|sJ`6W3woY`2 zQ~|qtz3hy^-c;q8sISP6;t7Ik7%X5Z1L+gvr#(UT^m!%{Th#!S_J zZ@+JB1Eq#1cx=dzHxzMzAXx_^%9bA;^b=GC)2BzV-;MH&`AK2r2r8U#1Q0?XG@PL` zo*-M!IyvH27|Jhas9;*er{7XSaKf1mMF`&O^CE;G;Pu=%F?pG+ba`c-Jvo31TzO^W z2_zk0%rry1ug^QWhg^$eJUZydmj$rG!21ZOV)U5LsCIq+d$!Pwd2#p9kH}C!p~V>p zpX<`{T-`ET&bm12QWz{KXK2Dl8!Xt{??qKrlu+ms_}uAb9K15mo*YCK+F;4#SkeY+ zm)*neUN3p!J?D*-RUbt+#)O}A26*GF3v@cnX7m3`sq%{RM>)yxI^tn>pJyabr4_F= z9xs~BDOV6B#yaeh6*iuBFc?snHEUM5o^d;t`uz&8bT|mAP+wm^(oWRJTs=ks%BrBL z)5XDl-^kwkMoKDEdR0$Ip{diwAKvfB6H>Y0f(xSFQ76s2SjL0Z6jdC(lECi-cL9f z2r+y1Y>MxE$Tl9Vfk23j9S&p>2J5Z2-m*0}H%EN_^7>mgbM@Rvu+F+TIN+n8pnyxS zztKi%YGAo#l{e42_`~r&JRy~Z3m0<#{rB6nh}_1vTn6hv-y^rvRSy&zNU;?0Qn_TsWdM#8=R#vg^@Y~=w!X<(PmoO=4pd3U z<(FShdwYA#GX1qHtiRg34T}<>(5NRzFO51nhX;L}a0DnVEge5|8=IVZYfo<d~)+i>2E7* z#6+iLAP}O}6=Zw28=*IF_2rkvZ@clv%f**!OOpQFURxp-PR$h(2!p{Oo_OMk(N1*i zdi$=gUN}=+IxSD=B}qth%|^{nF2KHoUANEDm&0ub}(&yT3%`!}o*H_s{-MZ>?ZTD2-+f8YME{}5|xri!XO zqX0xvQIXiVapNdm^713!iWoD1iR1X$^QVZ5N-e^mlLR0v7K^Z2twK8=F%GX#WsTMC zN`7Iq=!0BPVP86vUlTiJ8`?+1anoYazZSrsG_H*XJUUEb7sxARvG*FNY#vF``eg5 z??P*dzJrRwVosbm(Fk}W>YTIK+C6&EuAiZTNXJN4RdRAv7S70}s%i#JO-(V|jffO( zz4cbn)zy_6A68z@op;{(+I81mw`%-X`jYl7SRJ{1& zidH^lz^`vGWfZkFon>!Y+rk|bu# zn8Br&Udr8f-yO4EgVu~pLt0|Z?kvgpx(=jSZZe)vrcC27P_{`Jmk;GbIY;EzFN*ws z)V@m}R70~KZ(i(_)lXIEf|ThMrt3pIINRjC=-L~8{NWTzP7IUXfW6zUE1zDj1{D^s zlmgb5oF?9Pm{^b-uhPfWa7AOUA>fY9f`_h7pU35kAQ0!+mxXK zt-$YDSO3Eg46G$zZ(4t#m(?OpGhdzE%dda<87b>P#Txu%%T6|EVU7Aa@J%2`gCIHu zd~>{p=_ac$U%Tf~+ksx@iv;uGZ>RHk;9u{wB@I$4K#d0{)v~F!le$y^_he|1>}YvPrs zkN;x5EpN?cn_bCGs(h(%aNyvf|LIw-DMr-|(Adz>aC8!?pOWZ-Tz6Z^it@ZCv*`^+ zT$SCpuh8mAp;|NY$d#w(oXEO-fB-OS5~@#lj#sbvC16?BG;91Vnk(;p+1BYz4S$^y zz#Ej$Nw9+Y0)Ux-+R)H&QI@NBCVHS~V2=@ac2dCFKa`Wwzp&7wQ0hI2H*ju(B?$$e zu6VN6_LTQ(XWWUAy%6s{`LwOapW0E(Qk+=YUm3ab^qdom(vLy)0pv6_HNBT@#ZC0U z+1aor zpE1kboKUm$;oC#|Ccz9Q<>UDBX6^z$krl8?OG~%Ewejuwe>iSVzEFXnbXp&s@@c#w zl_g7-q#vXv0c4r~FqifIjQP$DRC~7(l1zl89AlbqcxSEw|cVd0_Y+4klu$zOSzfrga^-p6AoqfkDJ zBvcg1NS@MXYieq0WQ|oM(yn1Sm}RiKhD~A2SzdMO&kU7Z+}pbUZ|`LVtkXlh_Qp}y zmjronURY&{`+a72Z^ZI`55}N_A^Yjnt~^asF7AJvf>1X=8&C~AtQVn|l3jy@qz6Gh zP%%8f*^zbiZq_tAfPy${7AxNT_(xi^6=!{Mb;GOXTi@8E9fAuk=zNajJDy}9;AKE# zy-WJa(=-F-KJz?GsvEQFp4HUUl#*uV%Uu}M(UTzafowY&DS2cWgSFUd9f_HoG}yY&CFV3kL>#6ciS7!woku%yf)?>~^~?Bdtn8Gs^vkXeqcpt@0g~ z%SJYqhbF0u#}d*Ur7J=V|5KWb!8+sCR?b|-gQvfBW)p5)@|)mPupnl@MuP zd75qMGtXm$u1QBix?Binbtgj-j=#mzk-OdQc`qwq)k<1d8i-7;JUypmO0X3`nj~(p z?E{Uobdu0GI4RP)@^mt!G;o{|Gm@6&2xp5eS#>bhG|vL+f$|R&tRWGdzSpTrx>ufN zmAwEc2z8U$Kudt|W}&Z3ft!GT0Tv`%ENGg-CFS((uzN}~HiJ2m)|#cJcjf6Mh|4fN zw(Fh%>{;$+hKw@-{*)0&YnopL-UR+V6`%kVLmsNmtYl@)TBM8SHdV=x-j%24u5_gd z)YHIj;Cdjf0m=2AK@y=USpn;S8vRd1g``KPGylUQ)Rte*6uF(@^(9qp>IH7iv=2R% zH=ydw!K{GwzFMXMmX1EtoO5EpGhMS}$qcFNZd%j)8DJyXOjZuxAD9IOLpv;P&smW? z;jw?~ipc;fU+#ho(;7w*XiM6~UekOHVRpVeo9`hF->foeJ92wS{^}oT$yM9WVQXjx zjwb-QTfAP6taN{O6^IRfkgMw4~@6T0e!Lx*(xS3Lf;VUR||6t9d*PKMb^&sT>Xk%;*oubj^^ z1B<)$lB|GrETC^(V0MtoorNdO^Ee#7^0a=B%! z(w%!DfHR4F)*B?)T6TK&=NKwkT6S?onVU7u57y1QeD8wy{w+6It@keucsE6j?K(UAHcrj|y3{}I>byle*Z!wLc3tS0 zvN&!Za{P7_eeTw*fz`ftmF@amH^!-nm!9bi;%<9ufIuf(1}*b~P63eBpnBB1FU|PxWv?-)r=C9h-RNX-Sh)KPg~k!y5#c z8s0Rs065ar)HFN6;~RjTS$YLu$DIH3z3p~SW7fgi_S?_dzPPZLLf2aq_U~k>;~*u5 z6UpdY!9`V#pR7GY$r6~W-%GW32UDbOs%MmQ_0?C8*Qyce zm@F%o>M@^*GRxhJUIYQ8rlzKbBu(odfq#XlQ%*?}L%`##tN&CaoiItVe*Jo}aqm%_ zCy&tE)tT_h)ASe1IGbKlIVq`8PmOCcRo^u&{v_(e-BCr!00000NkvXXu0mjf9#(44 literal 0 HcmV?d00001 diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py index 755ec6aa..113fa5dc 100644 --- a/src/EFICASGUI/EFICASGUI.py +++ b/src/EFICASGUI/EFICASGUI.py @@ -47,6 +47,7 @@ class GUIcontext: OT_WRAPPER_ID = 945 MULTICATALOG_ID = 946 CARMEL3D_ID = 947 + CARMELCND_ID = 948 # constructor def __init__(self): @@ -81,6 +82,10 @@ class GUIcontext: "Eficas pour Openturns Wrapper", "Editer un jeu de commande Openturns Wrapper avec Eficas", "eficasotwrp.png") + self.addActionConditionally("CarmelCND/prefs.py", GUIcontext.CARMELCND_ID, + "Eficas pour CarmelCND", + "Editer un jeu de commande CarmelCND avec Eficas", + "eficasCND.png") self.addActionConditionally("Carmel3D/prefs.py", GUIcontext.CARMEL3D_ID, "Eficas pour Carmel3D", "Editer un jeu de commande Carmel3D avec Eficas", @@ -223,6 +228,10 @@ def runEficaspourCarmel3D(): import eficasSalome eficasSalome.runEficas( "CARMEL3D" ) +def runEficaspourCarmelCND(): + print "runEficas Pour CarmelCND " + import eficasSalome + eficasSalome.runEficas( "CARMELCND" ) def runEficasFichier(version=None): """ @@ -263,6 +272,7 @@ dict_command={ GUIcontext.MAP_ID : runEficaspourMap, GUIcontext.OT_STUDY_ID : runEficaspourOpenturnsStudy, GUIcontext.OT_WRAPPER_ID : runEficaspourOpenturnsWrapper, + GUIcontext.CARMELCND_ID : runEficaspourCarmelCND, GUIcontext.CARMEL3D_ID : runEficaspourCarmel3D, GUIcontext.MULTICATALOG_ID : runEficas, diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py index 0634f4e6..c5c6f8b4 100644 --- a/src/EFICASGUI/eficasSalome.py +++ b/src/EFICASGUI/eficasSalome.py @@ -65,7 +65,7 @@ class MyEficas( qtEficas.Appli ): @param fichier: chemin absolu du fichier eficas a ouvrir a das le lancement. optionnel """ - dictPathCode={'ASTER':'Aster','OPENTURNS_STUDY':'Openturns_Study','CARMEL3D':'Carmel3D', + dictPathCode={'ASTER':'Aster','OPENTURNS_STUDY':'Openturns_Study','CARMEL3D':'Carmel3D', 'CARMELCND':'CarmelCND', 'OPENTURNS_WRAPPER':'Openturns_Wrapper','MAP':'MAP','SEP':'Sep', 'ZCRACKS':'ZCracks'} if code in dictPathCode.keys(): pathCode=dictPathCode[code] @@ -207,8 +207,7 @@ class MyEficas( qtEficas.Appli ): if monObjet != None : # selection d'un groupe de SMESH meshObject=monObjet._narrow(SMESH.SMESH_Mesh) except : - # logger.debug(' pb avec ( entry = %s ) ' %entry ) - pass + logger.debug(' pb avec ( entry = %s ) ' %entry ) return meshObject #------------------------------------- @@ -564,11 +563,13 @@ class MyEficas( qtEficas.Appli ): 'OPENTURNS_STUDY': "FICHIER_EFICAS_OPENTURNS_STUDY", 'OPENTURNS_WRAPPER': "FICHIER_EFICAS_OPENTURNS_WRAPPER", 'CARMEL3D': "FICHIER_EFICAS_CARMEL3D", + 'CARMELCND': "FICHIER_EFICAS_CARMELCND", } folderName = { 'ASTER' : 'AsterFiles', 'SEP' : 'OMFiles' , 'CARMEL3D' : 'CARMEL3DFiles' , + 'CARMELCND' : 'CARMELCNDFiles' , 'MAP' : 'MapFiles' , 'OPENTURNS_STUDY': 'OpenturnsFiles', 'OPENTURNS_WRAPPER': 'OpenturnsFiles'} @@ -577,6 +578,7 @@ class MyEficas( qtEficas.Appli ): 'SEP': "SEP_FILE_FOLDER", 'MAP': "MAP_FILE_FOLDER", 'CARMEL3D': "CARMEL3D_FILE_FOLDER", + 'CARMELCND': "CARMELCND_FILE_FOLDER", 'OPENTURNS_STUDY':"OPENTURNS_FILE_FOLDER", 'OPENTURNS_WRAPPER': "OPENTURNS_FILE_FOLDER"} -- 2.39.2