From 44f9ad210fa4ea6548b4a71ca3b62f747de0104e Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 18 Oct 2012 13:04:45 +0000 Subject: [PATCH] Mantis issue 0021565: [CEA 557] Opposite of the pipe --- doc/salome/gui/GEOM/images/pipe_path.png | Bin 0 -> 9274 bytes doc/salome/gui/GEOM/images/pipe_path_dlg.png | Bin 0 -> 24830 bytes .../gui/GEOM/input/creating_complex_obj.doc | 2 +- .../gui/GEOM/input/creating_pipe_path.doc | 44 ++ .../gui/GEOM/input/tui_complex_objs.doc | 87 +++- idl/GEOM_Gen.idl | 51 ++- src/GEOMGUI/GEOM_images.ts | 8 + src/GEOMGUI/GEOM_msg_en.ts | 32 ++ src/GEOMGUI/GeometryGUI.cxx | 266 ++++++------ src/GEOMGUI/GeometryGUI_Operations.h | 1 + src/GEOMImpl/GEOMImpl_Gen.cxx | 3 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 174 +++++++- src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx | 14 +- src/GEOMImpl/GEOMImpl_IPipePath.hxx | 61 +++ src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 29 +- src/GEOMImpl/GEOMImpl_PipePathDriver.cxx | 242 +++++++++++ src/GEOMImpl/GEOMImpl_PipePathDriver.hxx | 167 ++++++++ src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 123 +++--- src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 12 +- src/GEOMImpl/GEOMImpl_Types.hxx | 6 + src/GEOMImpl/Makefile.am | 3 + src/GEOM_I/GEOM_I3DPrimOperations_i.cc | 80 +++- src/GEOM_I/GEOM_I3DPrimOperations_i.hh | 8 +- src/GEOM_SWIG/geompyDC.py | 70 ++++ src/GenerationGUI/GenerationGUI.cxx | 5 +- .../GenerationGUI_PipePathDlg.cxx | 392 ++++++++++++++++++ src/GenerationGUI/GenerationGUI_PipePathDlg.h | 72 ++++ src/GenerationGUI/Makefile.am | 13 +- 28 files changed, 1717 insertions(+), 248 deletions(-) create mode 100644 doc/salome/gui/GEOM/images/pipe_path.png create mode 100644 doc/salome/gui/GEOM/images/pipe_path_dlg.png create mode 100644 doc/salome/gui/GEOM/input/creating_pipe_path.doc create mode 100644 src/GEOMImpl/GEOMImpl_IPipePath.hxx create mode 100644 src/GEOMImpl/GEOMImpl_PipePathDriver.cxx create mode 100644 src/GEOMImpl/GEOMImpl_PipePathDriver.hxx create mode 100644 src/GenerationGUI/GenerationGUI_PipePathDlg.cxx create mode 100644 src/GenerationGUI/GenerationGUI_PipePathDlg.h diff --git a/doc/salome/gui/GEOM/images/pipe_path.png b/doc/salome/gui/GEOM/images/pipe_path.png new file mode 100644 index 0000000000000000000000000000000000000000..92d5d626ae8c928f2e1152d04f392a910a72a99f GIT binary patch literal 9274 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/images/pipe_path_dlg.png b/doc/salome/gui/GEOM/images/pipe_path_dlg.png new file mode 100644 index 0000000000000000000000000000000000000000..e2f969d8c56f9707f73cc59ceb4cfdf57748aa65 GIT binary patch literal 24830 zcmb@t1yCH_x-L91m=H8*a0_n1o#5{7!QI^xf&@)~0Ko!;;1=8=xVw9BcZUJ~#rK_E z=j^@Du6u9QPYp%WJ<_v!_4_`yLKNi0kq~eZAP@+Wq=bkP1o9{j{MJApgFU400!hK2 z=k^ksP7nxk+r#gpSXyK}u#?tVRKr=s#L39f!rs}!&K9C>VQXyXMl5V?;N-+jtmsVd zS4!7~*FO@_Sj+B{e9Cbi+viNLAtVl{=_ab#@U!VDK@ zjf#p&QALN6ry?(6UsIt1fyp+PH}&KzhNF7?D#eP8TA%91rA5Sf}dBV(&t_{DeT7k`Z%beMVIwam$V=H#o}pmFtD z8U5PN4CSS?ad6{JUB9O)X%|%aNPzsARU8?4Ja~*!8$OONqvpsbXNWky>sPAJd?sEB z$I`)q@RF@-Hz}%OeeY39nb)9R)D-JVap}jBRBo=BTMvi*-Fx2%)Z-I_&#$HzN0O(< z$omI;?q1OYp zU*z7$uSR74r0_gR@+q6vwjDo}9MTn{)is>9dRD~JMRZXl`S};n(9rid*JB3*%@|h? zY4BX?ZSI!LQwRPe}vrdV2DTXfVT)9^c}d z%Dz%j)xB>;*?_O%j5s}u3!!bit@$Lz@$F{)9mPk-qvf@rAZ~e-3$wYeF!4bG_{i!6 z75vqM_o&xf*{P`l#oVW7lrPl3zv7s%*cLJS@Yel&x2D8MERtYtNJAesd#2?tM5fN~ zYkfZ(f|4Z4Chpcy_paRnX-9S1sd$nC9zNnNw0q6bRNWJc=QC{Uu?*gz+?|JHMDyY~`Y|HYv7F_?5N~m>@)E1O)|!VGpWL8t5PJljW>vPb0IluX&%?Xnyg-5i;K>;$u4- zd-M?o-X`Ll;3H~icsOipu9yVfROiy-{^#>MJPui+UA73FtvLGB_I;kQMFXn*rtI}I z%S|q!&7pKMOw8Dpj%(VZ3qoV)%`9_YKYc2OIwB#jc|h@Gw8@Uxvp)4{VaFqR4qI;5 z-MR$3+ly5WeGiYC`Fdsn^O4Z~nU(827o3D7+&(X-u5|S0M?4Hg2d8$=7^~q@?7bxcP29rnpj4>zRmlY*3HX$@J`sJiO|T^ zUtHD^DP=0HWwMHX`;gA{j6_5s$3~wPE#mDlmPeR67USA^hWK{|lwG(k+V7K;nZ}r3 zSg}oYdf`uRMCH5N4xL~bCbkXYfWAING@%-gXTsur ztVUNP0ZfQ7A+%b?jCW6DWTcMp`AvSAL9bL=J&_{lX3t@oYh|_9*L7|$?dBU9g(l>dK!$W)Wq^YmO<#DI_s8l(v+ecA7T>jUjPfzB%pLI5QIC zaz`_i^^6N?ekivVGal8Gokl7VJ}m zWSgPKI6?u5Yl7H&3k2G;zjN%q)UzD)($=yEZ$47msM5K zQd1)(@E+@lbtkY0sMsr0M4(Jn?Cfyad8Tmtxc(;g3;3cF$%MGXDTey=3ca`xQ|lWZ zGU2Wg^}7qR1d@PNN3K-;rLnoUaiFl+;KNb-^05|F?J4k0JHd^9l43zlsP9Q+gOad% zwm|}hMoef2lCON{s{e#x50C`>95HpowDFRNmU_*e{OIZ3a+M5&o#H*-O^+pkf!OV* zIe$wwo^4So32m+IXGn=VQkkI*w*qKtjOIg!$_k#Uqdd`^k&-{}&(lR|UPF5X;C%|c z@{wN|?A@k{eM38)ydJf~e4dOXv-BjE@A(N1R^lB8yY7^+kWZBK;{MnMD60|%i-0C@g zHrKc82UlphlT<*5h#g4pz0&X2d5NT2POd&&85|0SK|^qVfdXfB&v70*%H85yr}fj9 zu>l&G4D(DV=*mf*Nzq&+?)KBUmruD5`6ZSv(JC*vrCNa|hB|fmb^sFWd-ix~(Swb! z$kg_uj5#ap+D1=0tdcTXViqcFp5{@KuXu76{P|0vfS{t+F`{!MF_lo%?#!OQMY>*Z z9D`Q9_aIW@qpH>6ot0qt@bl>IRr#>qNPNEgjljWmhN+87Nw(fl=DskpSP2#)V?Wq% zrwVQi?CK6Tp2eiz$ljhIkKwaUB+)qRknVAQXa+WYcZ(DNwu3m7u-T z!(HzsYZ8CkVbNk)Q?~qa(N=!uVgnERIuTTH%0ctWCbgwa%I$WH*Z`TO)v~c57f>-&#HlipUpy~d}v#+`Z*xA^K0~Ykp>4l&q9lnfzCRw`j2;XQGDOBlVDMtSL>{J4RFpfCpGRih@=YW; zrlz8zqN-|QkbX>vx`)T&**D)-x2-2DE&UPW2_$E997@Z`Se%#V=`@qHs*H{vlinIs z6rt0*o^vZEPGpyQ8t%Ntg$O6CYlIy9gc=T_ke!dFrlz*OyBm($bH{^6qN1$qbllc0 zo5b$pw#|biUC~2_gcgMA=;|8u@Bw3)OR(~CR(W}OikJ{oL*@h-ikN=WVx0MU+)%I3bJWY7U##1S=ccn*V_!IU*nq0QyMuow!tW8eN8frH!Z z^760KLD|`691#^@ShUm^ql}qwR^MQ7kzgQv#^+yNT55jBq(-NYhJ_X9AV9{)m(sev zJ696Z{O)UPJV`)LPcL|2^iohzd~dSnzd6`-Sm_Y82{+7HURinghUU+D`#gkv^}lJT zEDi@^Zn#-bgheqbD=X{kFZOG*^Kf(1RAE4$3VslLb-~iru~zSAx7cP{Ld5I+&c-GJ z^<{_%;Xa|LeCUiW8RUNaL)%dLC%MhFV7URGwNY!Y|jt=tpHX)?RMVa}d?W385BP5pR)kh}Y3;wQG? z&-m=j%rBu&!G{^+A+~CTK))vvFR&sS^PZoU)`Rc;fB0{Q||2z={2|+Qju!MXcL9~V~Ia5t~l|1&v z8b!O7>}yLtLLbJvhqwvio@ve>wL4|s$i4cfcKy+1QGQ;YKkPA>ALHnf%&{4C(IL1t+T+Ybs?CjJl z`dm#?8*>aeL>C>VdmE$+q(_kYWoIITZprRY3jsd?`gj@|y5-XiUiZU4TBbE+8=NtD z(ZQ#8>W(AZt_OMzo@_tCefwHh4Cj?zYcLAsUDVgF0W&X3w*`t>V`ICE+rk#UC!MLQ z>CHUZ33(Ep%4fq`<$nFAqs(+)+peK~$)30!0m9+{6*c`nd5jwT+E` z<`+GN=;3nviYsw7VW1~sM|B&^;>!v6iaIHmWqdU9nO@XO&o>SK#_ibxU+%lkN*fP@ z!Q$eu=Fia~hmJ$C0a3y4LScp_8lVV-64&|MoEIdNjnPYIk6Ju33SyHCmkodN_(@`@ zvL*HHQ)lJbjldDp^r)EojAU`rD2divhewcNx)g#y>J4nJ&bBs@q$h9iJ2mOz5Mw6C z$A`^XX<|c3$m4rWO0g1tYEF#kDC;UKDUrrXxs0nqeoG5?qD{~gmUBgkKvju2M|h2D z-x5z%xuu2-`dQ=B%6`Y>{dN3>?A68j8>}Q%Rn^xq-Ohi%E*?$nJNv}=c$5?Q%MkXf zK-3m{9V(2(goNQO=YU^W2|Az|kQ*k5$e=#$jWe;b3R^i8d<=PORonecz_01&PxAH; z8p_Hsj=onnH&*WAN?+m@R?R1erhcy+<*k`M9UV)!m=q@C;fg*fE#l(lcI3oI4i?T- zav1?<-769w%ue7*rX=|7UgMp)M8+@;4b3G|HI9*n8U}`9_!|Al%!sv@mzT7(^pht~ z2p&dyWN6yO!1vBKJv|+oK3io+OXNoqz>4obzEGl?SFk;=8*7_PdICF+OOvw zq~Uvfyif1=u<7sjj|jgLq8dOTvCbYY{I66WJ$h8QZfQ znSYVm+3AfiXU4O_+jul^dwn+QLHP*67_4`fg}|L+YiB2)F^q_W^u$!|-gI(*q^V46 z)iEgKdGGXe$3#cl*wclur=aQdqKRcH*;re5Z4C`6IIesH%=9jV_RIG(r(c2RH>OFqURhXJeE&cR+*_R znCm}okBmBRZ($!l`lF+x%YWzPGClqFe1+23#3Tx7>i<1cxPPTkXquaqkP3qw5Z1Uc<;|8ybXd6;8GWBA;l%#mCqxdjQ zKa+~Qp>1j|MK!%3R2o`FT3SY<@(-v|GBUh=OWx;;(<>bjVKX?Q1NtT2q8b_+9k=19 zr_RVpWlo)PqBnWld0rM56NUQNCEP!@JyfMErB-LUY*OvW@N#xMX!-g1zZgPJ8R%Fx zLUMC+(PC(@#@(C^+Pg85+SU5XOG;`^XJ7O1)V(ixL@D>3Se_-7&x_sU_$zqNzb;^J z9Q_L)zOVgvZq)2yx&yR!H|2XG+SXV%&8_eg6BAI9D2dgjeZ|wCIjVRc-lAgQe031` zXnjw$5d}U?gU;32UPT7Q@zrVhCAE-*?jYO2Qvl}D-$Xnkm9()bR5LQ5(^jjq>G49)4CB+Vw`_pUxGE7a7~ba8QklK2y2?14*xCd7&>>!C%56;qtIQzO;b*a)W7 zXqMd0wHgHS_2{zRb=I6Gxwt4!he7?jy}kWZmER(s@&XQvDPnLdm(zK8N{ViN2bhDM zkwh`QYaB(38t5eyCxR40pX9P%1PVDG=9iY1+L$1=VmPrn3tw6MJ2)w{%u7<6bc!7r z9rf|?shFOGK=x{oUB}m7IM#AwO^l6+5T3E#wzjmi%+B7-$!{!pY@~FtMS+oc{NWD( zOGMs>kEY*sN57udoJK-IG7Q0KWpd2Q&faKjxXH`Ue}RC&uXUq1+w(V=kVVHkLl>%po?BW)lMSdCJ#$lSHOeDM%EWjW&0h#7U?@C+#r0t3w)L}sg!a!R z=@x(u@$m`N3N!>OpCdwbUN#1(58yGq`(3#=+m(=N3v*UJ&H4zBqNSk`5E!Ui=US+` z_Dj^D%&Z>^`gC<1Z@V@f=6n*@Kif3b=zZl#OPhazT~CCKon2aGlf9UD64&#+N=ZWl zdiCt>!N`B1r5_@VM4f-3B_CBy%~z|~ka_Ww5aZ6ElW`L9Qq0zk;>f%_nl47jwSUof ziD+t5bMu^-h0VZ@4zY)wPy+A1B$<+;$zf~&o=ypBuSy9n^Wh+;2$wy=|6J|<_Zs*= z_Kr>$+IuNFDmmJ@J%S89^dDWuV`dQ?p{|}8gjS{i68zSZ`|(*_fa`x*uH~Iz54bf9 zNWV0|Y3Vv_alr3%Kr?1#{SgrX?y`c(4QqJP2nj18Xd=%fqFn`=h#Jd>1$0u^Md3h^KNS zR8IpB?JtNok`fXCMz&q3pI%tdn=i#j&MqjB@jyraf0jvmQ_Lek(jkE#0F z+Ez!3F!J)7^D`RTW3d zM2Qgx4+*hz8IU7~kx z=?`XlzP)3+_;`A4cDIGOF|XWszq)#APvyB-&VZre4Dp!g=z&}B0Wip;NU6SOYwE*E zKU9mZ+r6Tm%Ar0DloEvg1?gsnhJIO178$e#4R4)ZoopOTm8{I#HDQLe4-XH&dGiJy zh0xm8HfwaNzrVj{{N>A+Mfy#)78W&L7yEz{l9Q9?%&va>_HC^<-pkYTM`Wt+V@Pe0 zG>3t*Sfn?f*SU4iD)nTMJ_|d$8W$D?D%Ah+N9KLAFJZhr9)M}nV1*G7;A4({)Pdup z_YFlwz`?U$UVUz6W)^^|d8IegP?;|$CskQhl|5{(f*afXZpgg+F8OX%dVPKU?(VM6 z?SLYTYHV`S%iaBJT-*=#i|3t8;hihfGc%+C0Yd4SnVAYyDmC4pxOqwU#`|EG8`B=%(UzGpyhg9^Huwr zYC}<4IxH@e6JJirQHi?ht9A$dMyykB^&Vr!LcPby`e5q)<&jaYik7Ns=B8M7@gI3P zIaenqWp6kL|8vOO!BL-pH#p&4U0pV_mDKCdKp`?RGJstf;%|m$K9@7H`Q5=PtR}HA zFeJ#MlarGV4-bo+3rb3cr>3UBT&S+r@F*V`8DXZR%tn8$9EP+uJ1^1c=YivL%?_m@8+hSjKQpIq12N_l?5ptyfGKNC0Uv zcAJscY0nCC;aojVV|))CMR&g}Ti-ayjZHfon2zF-*Zy}KPazivN?%v;n4hWw>-Y-0+jQ)>sH><3e zS4LWTR5iEp_vB<%RUHIko{CIbkdu>>m)FzM@?$6SI`Y3zY2!aoDQ0l1AhbXE4LXVQ z((*Hc(|oT>_nV()KdnZiTbJI3J{r0J3?I<)sG9B0t2ZL@A29X)xCxANrA>(OyH@>hs(ADe$Wz@+A4!M!+;#KE{f$cf+C4Mfk= z@>793*hlRS08N9D36@VTIbPc8L^LHvNB_{!c{99CEtHd2yA3LW%g&@|L1d1nUTk#Y z%Nlma*^SvQxc>#s(qPH_3s7x;#{|?RR3Vc!6YwxD19!-HzWT=cnjUP;a6(@bQPtbq z8&LYqvRYgNoFD@n*R>wZViG-T_N0DOFHa937{n%jMh(59>zEiS6czbL7GNUI`?|MX zpWSA`*y`b@&ZF0~eK|BlO&(2XXQB|4zVCcql?qg_&6UqxTXSwo@$ z(t?XgaMpR?M};+a*X|0Krm%2pW^bISiAk;wT40)rnu?mL>e<1fU*`b9H(b!59$>Sq zRzzTlwPqq-^3B#~_O9S3p@oLO>LHus;)If>!P+N-HYZxSEZblM)kEumt`c&i*LEGY$okmuwRM6Ns~a z=SIb>*zA(GOU0_=RhikK?R>2ZAe(DM41S7Vg>nlD%1cX?%1J1#ZEV8A!r+ndKcRYF zpXM&V=1yV2KmbfhCj1Fb!v#{xOnX?^zIey4u>>0$+V*R{`9i)>1JxQm>#!g4&1!TRPvIutF_T5NvBb^j6H8Xqh)E|gA zzK6~5Hh8oGY%DCj0|RP(`lZH_u4=Br!XGtAJD3V2ksg3*1_Uyno{z2iN#sZB;4REA z6_zSNuGE*zY|>L{GrQn>V^jLU@UG=o;B1u*N(zQly266TMG8qLWd~2yaN1H#w z)6>xbU|pnJm!%=)aa1`9I)L;HDU$w6Js{!!+5BbLju88T=6eu5LJ}ylZ;87e6kQA) z)M|3?=f%k!?|#3xnXRhO3Q+kQv!(``tn4fX-$=GW=p=+Z!h-HEdArUTLk!t5ACFF*nw|Z;!EF&;x=r8j_H62n z5l^`_%HN7$+UK3^5b^{=U?FQ&R+X0{zIYKML4KEUd(U&<{(}gu!?dK=V=ZxGv$8R6&t*0uvZ!Gc$+>7A zT{1)@IyN>oD#~GFfByYZSbre_GCn^WNt@mEDF;uL7@`4Z3jp#C_^og7TOF3$l_h?u zhYpa2_Z!Bb1JKb(=3QkyZD?or*^|dg&(_Dx&YW<-@A`Brfn`yBoRtUVJmGAg;)zk6 z7@DH0G|c%(N>=u4wL1or!*`O<<9Fcw%I-1zu70ERj>hHH#XcR#-6&Z&$f|M6%9Y(pSRc}k}(Ag`Tu&x8QE)Gx?8Xd z6t%%*zOpd93gfMp0Ygh4gQ-<+IW;}lw(eM>0q&z!FX|f@ph%^O9GIdz|8NT*-`2*jUK;x^m6k@UF`sllD|7ZcjLH77Y-uiw11l3TSL9HUYHhg zGJW3KOB3MnEHk%z@~-Fd)?r|8_om4tJN4DJ?W>nB=Z2<;<36dXDO8EcIN%2@J(VL4 z0E|jV;Tz&QfTQ{O`Q6z#ElSZ!az0+$V^!H;izz@6+Cvn7PsK<}iKlW%yL=Z;maWQ< z5xbN=8(idj0d#P1kpL+nBqX%auXVYZ7{AO1O_i6y8y^o(dVtsS)Lcnv1PDNxKeHrW zj}$k;q;6c=J3E_h2I^)jZM4hXqvA3F+b*#@%d3aghc)T+Ri~zZ^J7_Bzk0E8?|bTI zFL7A=dD11*&dc?nySF#2?j^R{YlaO)x!vy??b6-d-F~nmaZQf|_J$FK?AR&3l0eZw za0YF8G>esjHN+Seau2gOx^rPbRUk zv$I2SfjHcQusxB3(?tn=-02X2Du{}KAj%MbpK@Cj5rGsdl&O@HaKU0_Y55>ixGi{O z*Vb~M_)^3QAwi)M^+^(co_+u~m?Qu?#zwIy0bhdDmxj0g8Y+(f8A6P2iHXZ?~FsN7E1eIYTFT_4JFHgl+BvPJAdCrn)^<&r-|MDV#> zkNq-e?c$pGN(%kquYUx)azYL+GwMWchwbTGS5;PuLFsjCofj8;X0WYyS^{4z`d-k7 zwF^Ppy|K#dn_DV~3RQO>;b|vThUM(W25}cA3;5lwR#A5Q;GJm7NZ3o%rHs+L7#XyP zr56O6V~~cVu`|-9SCW2w8@*1EM^c#EWaMXsXT=>Mm#)Bs57Z!n27WaM%xA9*f{_VH zH%86NYfjc*Vmx5Ucn+TqXLM!s0EMpVFZzC0E`3vPD(STG@REZ4_}ZBInwy(jMubj6 zyOh%GMs78}!2t-d8jz7e_PLWRyGF-W;T@{bC)jHWKZ2+c&FI=vabzNZW+F+OSidT{ zF0Y2@^0@6ym9&oau>u#5e6?MlCqW-dLJ^Z&-C524YfiW~OHtc{1D+G2T16OCaj&Am6ber$z=o`ArRD=p|-k^ zRb?`=jF}m&7cX7}D9Fl2L`9)-36PPsc6N%>#4gmiF|x9%Q0Bum{19(CX5ywv9Naj$ zf^Ft(Ca~z&8?gQxyR)ayFVQFfy0Wj|`AtKKR|R8*^VSFq=AEk&irRAMT1339vzR5H z+UT$%M)&{ym~1M4!@Q`Y`Al^w}Vc!jp;uKepnOb05%XA zdK~_6Utd3v<#q{n_Xu`vG%IDEP_%rJVNkAe7xx0*P}yA%aFZ!hYiny4svR1txTp|=QQB_$O~QUYY96)VW0Mh6=^9ynkY zMT<3!g^?NrK$+#H#voyJnHf{fSFfo1)T3viZ#KTIs)(22|It5J#qx6Gkf-Xvd{mxb zglXT_%#6eO)2RLhBN7h2g3>ooeQ*%PntX4&-q3;MS^l8<{$dpoiAcIaL17^#yjliK z4B+6M)7(*Ly5L9nh-17!R4F+rLKas|veD9lyJ6z85d zcUr~ImReW9-meDt@>|~+{8{~Jj1?xDuJq6{(or$|h0+yrRgPsPFMn3)ePeTqTmS4) zhwR$l->Z5-^AE(gRCn?LIj1hiKfqwB@0D_)%v0G2%!kINNHb7eu)C=vkXkx|I(&m}slGNI?__hDsk|Q*^BHz(61K;>dTHf0 zmy(8hyLTNN@DzF35$Wbt&uVGbIt5(ECK;sXGGF^mIxn#gYE4H%&}nbMo=;HDkS z`mYZ->eL%2if9kyx)C?uqI|Bqxw>ginT9+E|3d0rpq?*8aE2b?j6ZI8_5k~`Hf0;; zpB;w!L!anABU4VpZXUn-kAxlWK*GNWT$BBYYoMOaYY}a-ePT*`GMXj3lhp&DqkTKv z(8I?Uk$X?~jX@5BufZDV*y0|-s`zBxs+6jzYfE(=*J43MLNt*Sj zxx<*)!wO;L$?6N~0!fYb8FT$f?7*j(>YNl0W-BW#ZE0-gud z7*HEntG3!AN3yKtN9-};;^V8{Y?r;VD@JlS%C-A4F~Q;BamF@Y52lcj^u^-xe(Z@m zTE4p5W%x_s)nC{_MmQfx0)@-f3hVQ)-QE_F0^^r+=`J$nA}{CP0vqBkuadE*&M<)V3y7ER&Qf@AO3+3~LO#wl&HPW)GAc*~C$ZE{} zP1}6G4}hJ3KP%8tVTDZ=Yu_8*-8~6a&CkzpG^-pZwNkt?x3rb2_MkOi_O84=EJZNT z6SS~Au4rQR^-Ff*xw*5O-ZBfS)eZ`H%E8M1>9t`j2z#L^;|CjXen5wkAP6e@vO;l- z+VyYF+o~udQ$97lWQ>*QzIrM*C*S0^K9&&EDQ|ioTlnpY_@w#5tWm%Nwpy4}waV;~ zZ&^raqYnQ$l7H;hm?tloe?28R83royUn!n{#f%^BxDcr~V)JeRa*-Mm<6 zO7#$+=j)F%xw+a%{d;f;_&iyuski0^H?|xCR@T~_n@K2vA`ZM<-ro~m$~1fWBvU&hGL zaOUn+)!LswZ{;|-xsTl$BYg<}*~4uY6{Fd4s+mjsO&oxFl`V8PVwG0JS)9DFx;mCu zQoB64TpX3{1uTkG+e=_(zab-A`Q7{k82BK9mXMI(Wq4serMMS2J`~isLhYL97<}d3 z*wEmU-;kFc87DyJf~^WXl`gG-!FG%rJz{odRCu_jBU{d3`eS2bvnSb@ zzxzZYb3@Cba&3PVy!ru$3#((}bJyt~_H%-pRG(n$bMMy_z*e;PT6_aj>4 zu-q=s1;#oZ*1=*`YOvE0StsdaNEMc!RatuWKbZ2J zx#_woawPIO@;P__`j+(w-9UmOK37}kgkj_@Y1Gh`Gfk|PzP|kTni!zX+vzkZYHQEV z%@yDf;eaJupwt0L&zKo>=|Kkl#<{ICf5M3uc8I}p2uRvE9czx@3Z3uGiVx^C8eWZY zWKB#?=JVna@VM@_Jx722vio#vRJ}+`a$pV^K>&kE^J^H|*fcnADYYL)^jyDa#aiYh ztYj+q`Lk_$`fBB~z{H%SOM5(nHVwvevw?5a7zkt&BIZH6wx-Q`*Liz1f4vg~$rtP$a>~~{ zNalR}IWk~oE|fKuPJBx{x61Q5JepYp*NW8g%Z(gaLcT3TAr&Q7y7L3}IaRBB!nlN_y--%uy9XPh>>AFodjP&bjouo$&~USw-k$+It~@afL= zR#@mUyhBaUEux8|rm_?I6Qk3$7=9>S!-FpSHi?BFM3NfOa=(qXE}kLiNj(U(p8VmY zWJ{>eiJyX}{0Q!xzlGiY8L)o;@GoS6`{`eZ9};f)Vd3$^dt8-CK~Bj(F%79QF+cM} z(@8=3kLk3-Nb=1*O%^j3D*H=!%l%j*k#bLc}{`D#TY z-FR#duY}fTlZ7KP;xYJfhxwVb&ZDRoRYa2(jB4__0(CVPAHPt4MA zTJ8l=1D5rf+qpH-H%a(DJ)raByJ~Jw<^RU}#b#=gF|}SqmVTs?r~$#*!H90vup6W& zPdDNBlkx{8`Yo~BSlmL`(DD6E}M0#-r@uVb$q;ioHba$)ZpdSaTv9Z z4W@U56(2AxY85-&pif7lnX(%ogCI zqR**J3yX_QzkZ>Tv~8SlS<5|ZdQ9>FH^9QI_VpNafJ={j`;%JN&6U-J@j^t7yYGFL z!D%{o4S`-qg@qB;zB5_q_r~x3QG4F_U$u zDJu@I03xJpHMmpd*mQpfuNfw@R=Pd$2?TeJ{Di{&QGX~}tbUZs7_~SZi5?L(2!pFZ z#QnqiZpl9o$sf*<{{ypmEA4LXn{(6cs=^^QwcH-IsDF5O+jnEJWl>2t3*6=8 zq4i{~>+7cqNO|05Ead&`8|8`r*a!iqh@n@09m ze5R}E5m@_S(i<1pNZ4aqR-u{PZ@5_R;xv>d2u-iAuYY#HC?O@cZGQWAbkg3{RSf!H zL7a<`eT$msJ?$WX@tH_qe|tM`?(N^8A23t#NWvPh+~Of5@aOl3iv^#-@%{?pra!X> zjlh)T2N@$^SGRjk)15bzd)?k#OqK$!3W5WaO?;C3<)Das`Ge|+>6-zQOW|j;|MNCL z!PnOpsKs3Rf1#LIP=Fs+p|}(Se(&c56GvHe%SD`}6uq)=^UGN_8~rvxuaqv*=Jw0% z^D*Aq`a1i&-w-D!Cz{w9%cCa3yYchKT|npJ;o-qe5z8L70D~?D5Wcc4aeQxVDgY>d zXMjipbaZqW^y)XawsPlw_xJC`>-)X})k-Mm#}7j=_+V{;YL)2EzP>)qGSl|<_9&iL z&R?6Fn$~w(bl~gO*VppAVmnx|K9Pe|&papAgR1=BVIZm2*Z)cs0IbVRe6jM6EWix? zf3t>qxv>q$8j!YtlGNxh#B|RP_^PQVs}DFiI$Dlv=pI=eO?Hj)`T5<;b9m28O??Bd z-=9Ap6v@OxM1Fwt<16vfie0wnoQeNWECK1JtfoejA)6H;N<<+kK2||HLGaz*hCuf~ z_rOd?A_#`yAkxH2>0zc9$<=LdZ+CH$h5gLVF4nGMU|}iC%7Ozc0l>*6{OJh|3+v{1 zS`Is_1`#9J)yZHA5B$~mPVJG1qs8S&)p~twa5fz!au#+Es3K9ed@Y4s4F+8FeMU6!cO6z1hA!Jh8z?h*?4&gGRf zH1JKAW@Z9E$*Pfl{jU}#zkBz4%~3$>Cd%** z#JEpRPBN9Kg`lnau=d2HBy0?f99j@d><5~>x39CxXkFXyM@CpsTCvtWqAd41@vD5P&L9J{u4ausdJJ!9;}$Jb#>O5Y=`? z5vZWfx2-en`<6as0qn@o#L;Z|MT~}Ae|^Q~VuePh#M-}yrsKGfu5gzVD|XGVca0fP zCONad6c)4bo`<_L2nCPdxC<3T?4(~vQ+$*pp_)P2sLKBz`LD~5DEtb2e)qQ*>IE8# zV2PTtGCCSs`cz+g7&hRypW2r}Vh&vPT-rK7^B#r@WV#j>xP4D>og*2@!o8&xk2;nk zQ+O(UE5}XJdclgMTi6}J05k;yx01>FOK%!u)1~8Lqt9yJ8f~1sk5OK&8#xGy0lmNN zPue?i@y@^WejXJ+gQ*rtbjm<_M5kAqrLfjDmaM^{diw29M%~J>&PlWN@C3l9!2+Lu zrV?joXCEGYfTsU`{~K^#S2CG@Pzm5<0rL;2eu#*OD&_hFC5io}@Xwyfeq(BO3n(_+ zmHeA-A&DD26$}UpI{rQv-K`ZaqXEs(*3?A8W$gm>0{k>LH@CF~$YlemBDU9ZK@=CC z$JH7nU;sq~hkCsJWPIj7zPLa^M09p_RZCVb)+jNYDYsxT8(?K;_q~{RTLb|S7ZZ@m zla`VKbrXZA+uGcG)0t9ma?6^NsGQmJbQ3H`s={U8S2l4XT%*(YMf{pAGt9-bKiTDI zSriHBr_$E`yjS$TI`AgGBzSM%x(S2e7Eq$XQ7zqIw4hTbEqNcyGOU#_4Rvl=auWGY z&A$eFH?A^cN{1DPf!6|Z?4HWbAg(OunR!JOE|*=b*U)1FiBOLoa6JsE^VBAPsYr#< zPSpsQpproyXDGaJa08=Bl{q zRuS+{J-yGEYQCCF1JwQb-^#s%8(0ZeT|-U`R%#NwuR<35D+L0H zH~gDN`~m%8Ymec*ItD=fG&pgO8=#T*kN&S$usM5JSUD<{*2d5Hy4i1-H)@*@{VZzL zvX#IFE8D|%=8NEpDN;ng)$+JeS=~@7YHD6-_L+gmFh~Fs@OxjDqQryQC#bHgw6C3d zYqi_!^CazH6fETG)W2Xkpl$pS52N8(3u*ocSEXye))TvLyMHvfEGr|!%*>3uD=4{~}O()qz+YGR`2{)SWTg_6e_FF=@bT*dVnoje@qwqV)l-GR6teDG6{_+Fef zo~!lQv4oA|J?9|A=8uesu&IiS+XH3opF<5bc-!m({{j_rbQHzo=Nqgz;(KK!B&t2n zwo`cAW(xo7bZb5vJ1QL)XqFM)ohj)08sMz+{;sk4#0vt?os&F8dJQxf2%Ql`*cESj zIws&qFqqi?v~{Bo3=9}2f$YGXbY1XQvB)vD!;1?LBd-Sej$aE=O3$)m6Rh63)F zzh`D}Nr30bJI5FL9V6<*ZlRXTe26$eK~HbN{{ox*HKj#SMooiZOXsZFbg4;t@&DJ^ zc>p!FZ)-e?AYG6ypoSt%!Aj_y6F{kv4oYuI3kcFBGy{krh)Pie6s1Wo0SQgP&_$Fg zReJAL>Rp`k-pqY--@Li+W|%z;WJ1{d_x^wDTiaKDx!J!hca^Pbbab>YtbO$UR3?KAwO8g6OJ8XT)^8Qu+L;IjI zqlfxy#$6vCeaL`zEqh&|qL@YAdF@xsDkO*93MH-YoyEti-vK1avg+YOGRfhosfJO4 zf2jF|zGMk+%kEYa@Qf~AyYeI~Osjv^2v&uYTvWPYB5|+nyA61rBe~s=DNfB~^f4fa z4@G&^75oSf;!dflH8&8VYeVRHlU*fV7Y!v7KE=+p65)b3^ zMxYJ#_3anSb*qEEK_62?^Gv=gX-0TopClZ$bg;V;COQCn*Cx`<=Aep z1&s^W2_trWZEY}2`^Akrt{D;?Gd1~MOIoFA3Pu<*{rOK0Unw{H_DHiBAUod&dn%!& zct-SKX(lFX-f5zzz)AoUFBq+Sm=kdAZ2Idh>rcIJgEHG#w3|e-f$jX&&KsvygB(*9 z!X;q|!Fbiw5HY&y`#YHKI1}yypV4&Ahe1IZx-&t+G$*06*gf4Af@o7Ba#joBkip)O;z36x`xIpRk+fMRzUILTK%BsStm8=2S)Z&zGC>iMM zyO#9>Uk8bT$^mY~erhw5N=*0A!?=LN#DUqjc_1?(ewbraox2CQa3P{31j7*nGv9$Z zL`<>#zd^=-;vduIQF@R<#a1)I_<-{{JP|M%V5j1)1!y`$J?~YJbq? z@YriTGw*aY(&BmZsIc?icVWRdt<#Mk}HVdQ&)OY=+MZ`sOgu_pW7(69J{=-C$oF$_i}4Fz5M0pDn}7qA>n5?FQ-AIMFuk;CW)b-IdqI}|ETX15R?D5#7bw)GccvArNvmt zj<}+rV~EAhgZhAL3&}V3l>yz*s3XA91nZT|$U1m>J3D-$JvArF%=NbLeA>T zD{HE1YVU%8a+J$I2sqI7cNSY*PtGV^6Xi03=1^jKP0{7FuQv=k`lQBh}`Ek6B(tjurE$Ivjo&#*L8Ck?K<51!!cj!N+c zh=)}1G#<)-xu|;SWSpFgj4yznKZmSWy<~)wo;}kxF~R-rYyLS|l()M|jkIowza+lr zsH&=(aTIPJd)V!ABGGT_b7*vQG{5`{W;V8Pe9E^Hzw0b#@ne&da92&4)Bg#<+L11j z*7Ba&oEW_GhK7&Zd!1&S{;5HkW@)D79v5VJE0^rwqTecGFkM}ARj(ilqqnd75+^6U zTf_l6_0`Tpl1@}^F46lzD+SItil ziKis5;Y>wQKnIF4x_KP)?)8TS14cBM8}wWfzoxd%ILjq(ZGU+fO0O+Y0+R{a(>1E~ z-876)x^*Md!`@qGLZ>e?((qDK(`3+(jZJ7SLn2hvIR9y+hyhyOI^)LZA9ZC<9zcP! zN46V`ej8athgd81o^`vRZZ2Rh`qWQG_Wb#XUV0iDHTfh=>cyAp;%-x#!l2jg+4Ek# zdKD@6HZxP@t>)O+7~eVmlW164s6AXe;KKep^C&c>`>iMFy`M~ID3fmAzMX-+l@pQs zbmP}&GP5wT!^DuAo7<9?zifR+4;>3^7fm+SmpS%Cq~siXE{=b!TDRqD_^fce6jy=; zdO&;+EAG@kH947{bH~$j6Se~=ktXO7GAL{J#N9H+0kKJkEVZ|qP+CAX))dIbhc;(+ z^)iE%AhMp5lau%fBOIfBQ)OYO`ew{xU+E&OoJgFz`ddx)B$+bjp(^TNOTdv~%i7W2 zSfB4JEi3zJ_u@JF?VAKmyJ!X;W@=~@=_Un(CsE96rw~G`C6ryjDNI&SwBz{_*hlF= zZj+EmwNz~>r#pAj3an_?ZO@CbhHswf$-s$#J^sDbi3DfhM{cq?GMCLXy|c0Q_;96jw@+kDG>iN${(`3@B{H)O<2o(*bx zZ?#G{7DwjHjd- z=giS7IGb(n&L?EPTT93lHUyc%VrzO~PqFbcx|^a|8u|H;8>5!CJ2qKURhhQE`TXM z)DA-Gf>UGCUnr3?X1ME%oz?#So68Hye%sT4d^(z=I*g74OtMG|MfmKm*RG#w*$=KC z&2)_L!s6?2nGx+B9mRLQB>}`DkDDk)%Ko{3bV{qIg0=2xHCS=+o7}(|!>koRkTXKj zffxDtN!aWJWkDW1T+5E2eQLI-c)4#}S5n#o^SRV{U}J4bci-;{Fjx>NY`Zzz;fch< zAOeu8C(&TTDWbJ-CbGz}^khHC%UiktVAq_VTyu3oY}?3=U}taNTXsMF`Ew?2@RC~q zM9j=V;(hmjPm+_9!{h>k>gw&geaT@5aS}~-F9-y8KT|n9iN$1ZFd;Z4?fELpw?**` z^77RnK+%Vi6}Ct*Q=&3u+(x7yK{D&@fTs(SdFCeUpO&52QU7 z-i$&kmdgL|2-bJvp&nVsnXwV=C48d@`@)0z)iig5X5cmmu%{^?c%)UJZXKd69Gs z;unLs4!gqs%-Zevy51>lw6fdSR5Vf{M361Nq$KI8_m2XrdS+_U80wsnk&(!O{-~(0 zoIg;@5QcVjcPEsTczC#g4)~OnR|QP2Gp_tNBJGo*z%${#Z%=Dpe1+nt^Mf7>3kzI> zo(uiAh;BkG$qisu*5Jm}cU}(+U*_hCOJibWH~Eeru3D}tYWMAJA`sVWZd2E)@F3h|eS7E; z_t>@B|C2*}uJft~*RX8|;Nmi5iQ4hmn7XB(R-miN0hRn@0l&k)9Hc6Fgz}l#%g-PX z!tvER(J8Yy3t|U3;uGt{V)XlA#ghmLS|Qqh>!99UzWS1dmAO#+1Or;8QbvzQ*4pRN zz1vaTTUX2lf*H|pAMW|^K>)BMFzPj<IS^RcRGP&r24NW`R_-zM$;AD+uS zWq!u8MGGb_Ovzj}bE*0CU#~38&ubiBYN+eub3b~TfQ%j;9TizPq{Uc74Dg|$o;Gpu zI~%kT#a!o0Y`d5GLi z^brB;$P}QP*b7FcKxYA=Mdy{q&p4$~{2OpjYz6a{1LY2hb_;qxh$3Y3J_VorLKH!Ygaj z5HX4i385G-5f&C6#BG`s7|u;iv2$>!umO-Q4;uiUiiwMh3r@MyP?ZJ=#x-?i-{NHr z2R9p3ca94sl>Uz*BmG97ptk->H(6Tp4Dj14h{n~ENM#`8iNrb*2{1%qKMxDHEVl+L(}3d@MCeM@62O=~#KBGRK~ z!96c54}ja5@vBW9Pjlwa_C>$DZu-$H@G%qGvYVv6Oek=;nJCq1S5f&62gw-dJA3zT z7gxTM-SPEUiZG9vXibuq_N&=4jjc5GS`G$~1-g(vo9moiH29#w-9g4^Mz|-XjHF`{ zQxd{W*s@$GVXOy8(2h~JVQ4mp7`Se)*$IOsBAWI5+EsDd5>Ch$oD=q1%X$YU3)^En zZhPbRl)rpaYipNbQDl48;!QTO&?@;lPOomUlrUQ3vM_^vCX?!t;WqMOZi?)+$1K-< zl~y1h2JZO#5je9XN*veQS(9}J zw-&7$ZewEuOb=WZ`;cLzLV^Z%3p_$bq1hK38{2Wk0onpl_ZayShJV`osy842fqsO3J2f@+YuSr14yf47ZH|!kX$y0nh?p9P2*$_7#U&){l%NypFiM_W8h(++(?~c3RCPo_arc|UZeYeym?bj77KPvdT3zS#V$fVtkvnjcK?ds zynAp#`--ogzqSumH~=co8&8fffvm+Ob2^0UaAGi+3DyZnj?%n7o#AJHA+FiXYnU7s zGL&>*NTlx%GS{B?Nnm@g63e!}F3%{~Iy;-KEu_E|2VsJ1D3n_24}wG22i=nl4Ef&e z6R;V=1Ini3>NIagVAjMYbTwds-MA6T@hyTnBslo61jxv+wX+iv6N?Iq)N-QRZsLzJF%QX@3@39c6}Uc3iUSm)|JaisO` z*0M!W?f&lSO=!A4dPGT#FOjIcbl^WxUtb@^Ev>)DG6ZQ^0e=3R$G6shsEL6PIQT(Q zn<*EOkBEo>oSfGC%9olNOX%jo-%KxWwe!Ho9fFO}%rs^xf;I01^E!mxMIRd%L%A(E ze4i4jlcpXP@#y_X)ybiZ7_G}M9YKX8ps;B{9rMasBJW_X2bKANF|4qFK*{zMh^n!c3>|fr$|^F!2w40jrGE{5SV{mMo;i zr^UN+#zIdHj5a}Ez}~?=F3&L6%INj#=fV>m@`@^X)17f)=WleM=vR#2`s6N2oAjhE zP~<+>aE2?@&6lY$?nM>zkZ~JWrQpQ|zZCJ_-Esk`lT`V@(3iD|fkVr;D!8R~tn=qLRX zgs%aS8W+z{qy>;A>mGT3{H7QMeaq74_Wm}jbT+c%cf45Z=wv-$<2Mgs{_oG~Zc`f_ zH2Rc$IO_iQx9VDRauA5QAIn|(U4y(-h_>~oHHd)Pf8*eWdl)@RdE?y%8R8em)QcKx z_sb#Ddq)sN8Vui&|N9kw6gF?ch)~qw{|NZ6XYS)1vfvz}{(80Dn3`AP*nz$ih=9B1 qmuA)P)J6PSfRX(HgLe`ecl~RoiI!3)F2Ia61VTj#qnL{}5BdjRk!S7z literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/input/creating_complex_obj.doc b/doc/salome/gui/GEOM/input/creating_complex_obj.doc index 0d0404336..46c4baa90 100644 --- a/doc/salome/gui/GEOM/input/creating_complex_obj.doc +++ b/doc/salome/gui/GEOM/input/creating_complex_obj.doc @@ -14,7 +14,7 @@ axis, creating a body of revolution.
  • \subpage create_filling_page "Create a surface" from a set of edges.
  • \subpage create_extrusion_alongpath_page "Extrude an object along a path", creating a more complex trajectory object.
    • - +
  • \subpage create_pipe_path_page "Restore Path" of a pipe-like shape.
    • */ diff --git a/doc/salome/gui/GEOM/input/creating_pipe_path.doc b/doc/salome/gui/GEOM/input/creating_pipe_path.doc new file mode 100644 index 000000000..abf97b5ec --- /dev/null +++ b/doc/salome/gui/GEOM/input/creating_pipe_path.doc @@ -0,0 +1,44 @@ +/*! + +\page create_pipe_path_page Restore Path + +To generate a \b Path in the Main Menu select New Entity - > Generation - > Restore Path + +\image html pipe_path_dlg.png + +\n To obtain a \b Path of a pipe-like shape, you should define the +Pipe-like shell or solid and two pipe \b Bases, each of them can +be set as a wire, a face or a list of edges.
    +\n Select unpublished edges checkbox - if checked, allows +selection of edges in the viewer, that are not published in the Object +Browser.
    +\n The \b Result of the operation will be a GEOM_Object (edge or wire).
    + +\n Advanced options: +
      +
    • \ref preview_anchor "Preview"
      • +

    + +\note It is not assumed that exact or approximate copy of the Shape + can be obtained by applying existing Pipe operation on the + resulting "Path" wire taking the first Base as the base - it is + not always possible; though in some particular cases it might + work it is not guaranteed. Thus, RestorePath function should not + be considered as an exact reverse operation of the Pipe.
    + +\n Example: + +\image html pipe_path.png "Path (red) between two faces (green)" + +\n TUI Command: geompy.RestorePath(aShape, aBase1, aBase2) +\n Arguments: Name + 1 pipe-like shape (shell or solid) + 1 +shape (edge, wire or face) for the first base + 1 shape (edge, wire or +face) for the last base. +\n TUI Command: geompy.RestorePathEdges(aShape, listEdges1, listEdges2) +\n Arguments: Name + 1 pipe-like shape (shell or solid) + 1 +list of edges for the first base + 1 list of edges for the last base. + +Our TUI Scripts provide you with useful examples of creation of +\ref tui_creation_pipe_path "Complex Geometric Objects". + +*/ diff --git a/doc/salome/gui/GEOM/input/tui_complex_objs.doc b/doc/salome/gui/GEOM/input/tui_complex_objs.doc index 7dcf151c1..2cdcf156a 100644 --- a/doc/salome/gui/GEOM/input/tui_complex_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_complex_objs.doc @@ -623,31 +623,78 @@ from math import pi spring = MakeSpring(50, 100, 2*pi, 1, 5, pi/2) \endcode -

    Creation of Tangent Plane On Face

    + +\anchor tui_creation_pipe_path +

    Creation of a Middle Path

    + \code import salome import geompy - # Create Vertexes for curve - Vertex_1 = geompy.MakeVertex(0, 0, 0) - Vertex_2 = geompy.MakeVertex(0, 90, 30) - Vertex_3 = geompy.MakeVertex(100, 90, 0) - Vertex_4 = geompy.MakeVertex(-100, 90, 0) - # Create curve - Curve_1 = geompy.MakeInterpol([Vertex_4, Vertex_2, Vertex_3, Vertex_1]) - # Create Face by Extrusion of the Curve - Extrusion_1 = geompy.MakePrismDXDYDZ(Curve_1, 0, 30, -60) - # Make Tangent on this Extrusion (Face) - Tangent_1 = geompy.MakeTangentPlaneOnFace(Extrusion_1, 0.7, 0.5, 150) - # Publish in the study - geompy.addToStudy( Vertex_1, "Vertex_1" ) - geompy.addToStudy( Vertex_2, "Vertex_2" ) - geompy.addToStudy( Vertex_3, "Vertex_3" ) - geompy.addToStudy( Vertex_4, "Vertex_4" ) - geompy.addToStudy( Curve_1, "Curve_1" ) - geompy.addToStudy( Extrusion_1, "Extrusion_1" ) - geompy.addToStudy( Tangent_1, "Tangent_1" ) +# Create a box +Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) + +# Get two opposite faces +[Face_1,Face_2] = geompy.SubShapes(Box_1, [31, 33]) + +# Get edges +Box_1_edge_12 = geompy.GetSubShape(Box_1, [12]) +Box_1_edge_22 = geompy.GetSubShape(Box_1, [22]) +Box_1_edge_25 = geompy.GetSubShape(Box_1, [25]) +Box_1_edge_29 = geompy.GetSubShape(Box_1, [29]) +Box_1_edge_8 = geompy.GetSubShape(Box_1, [8]) +Box_1_edge_18 = geompy.GetSubShape(Box_1, [18]) +Box_1_edge_26 = geompy.GetSubShape(Box_1, [26]) +Box_1_edge_30 = geompy.GetSubShape(Box_1, [30]) + +# These three calls to RestorePath return the same result +Path_1 = geompy.RestorePath(Box_1, Face_1, Face_2) +Path_2 = geompy.RestorePathEdges(Box_1, [Face_1], [Face_2]) +Path_3 = geompy.RestorePathEdges(Box_1, + [Box_1_edge_12, Box_1_edge_22, Box_1_edge_25, Box_1_edge_29], + [Box_1_edge_8, Box_1_edge_18, Box_1_edge_26, Box_1_edge_30]) + +# Publish created objects +geompy.addToStudy( Box_1, 'Box_1' ) +geompy.addToStudyInFather( Box_1, Face_1, 'Face_1' ) +geompy.addToStudyInFather( Box_1, Face_2, 'Face_2' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_25, 'Box_1:edge_25' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_22, 'Box_1:edge_22' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_12, 'Box_1:edge_12' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_29, 'Box_1:edge_29' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_18, 'Box_1:edge_18' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_26, 'Box_1:edge_26' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_8, 'Box_1:edge_8' ) +geompy.addToStudyInFather( Box_1, Box_1_edge_30, 'Box_1:edge_30' ) +geompy.addToStudy( Path_1, 'Path_1' ) +geompy.addToStudy( Path_2, 'Path_2' ) +geompy.addToStudy( Path_3, 'Path_3' ) \endcode +

    Creation of Tangent Plane On Face

    +\code +import salome +import geompy + +# Create Vertexes for curve +Vertex_1 = geompy.MakeVertex(0, 0, 0) +Vertex_2 = geompy.MakeVertex(0, 90, 30) +Vertex_3 = geompy.MakeVertex(100, 90, 0) +Vertex_4 = geompy.MakeVertex(-100, 90, 0) +# Create curve +Curve_1 = geompy.MakeInterpol([Vertex_4, Vertex_2, Vertex_3, Vertex_1]) +# Create Face by Extrusion of the Curve +Extrusion_1 = geompy.MakePrismDXDYDZ(Curve_1, 0, 30, -60) +# Make Tangent on this Extrusion (Face) +Tangent_1 = geompy.MakeTangentPlaneOnFace(Extrusion_1, 0.7, 0.5, 150) +# Publish in the study +geompy.addToStudy( Vertex_1, "Vertex_1" ) +geompy.addToStudy( Vertex_2, "Vertex_2" ) +geompy.addToStudy( Vertex_3, "Vertex_3" ) +geompy.addToStudy( Vertex_4, "Vertex_4" ) +geompy.addToStudy( Curve_1, "Curve_1" ) +geompy.addToStudy( Extrusion_1, "Extrusion_1" ) +geompy.addToStudy( Tangent_1, "Tangent_1" ) +\endcode */ diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 8f90021eb..9c6896aad 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -715,6 +715,11 @@ module GEOM in double theTrimSize); }; + /*! + * \brief Interface for shapes transforming. + * + * Translation, rotation, scaling, mirroring, offset, projection, recomputing. + */ interface GEOM_ITransformOperations : GEOM_IOperations { /*! @@ -1077,7 +1082,8 @@ module GEOM * \param thePath Wire or Edge along that the object will be translated. * \param theDistance progress of Path (0 = actual location, 1 = end of path location). * \param theCopy is a true or false parameter. true is to create a copy, false to move the object. - * \param theReverse is a true or false parameter. true is to reverse direction, false is to move normal direction. + * \param theReverse is a true or false parameter. True is to reverse + * direction, false is to move normal direction. * \return New GEOM_Object, containing the displaced shape. */ GEOM_Object PositionAlongPath (in GEOM_Object theObject, @@ -1105,7 +1111,6 @@ module GEOM GEOM_Object RecomputeObject (in GEOM_Object theObject); }; - // # GEOM_I3DPrimOperations: /*! * \brief Interface for 3D primitives creation * @@ -1485,9 +1490,49 @@ module GEOM in GEOM_Object thePath, in GEOM_Object theVec); + /*! + * \brief Build a middle path of a pipe-like shape. + * + * The path shape can be a wire or an edge. + * \param theShape It can be closed or unclosed pipe-like shell + * or a pipe-like solid. + * \param theBase1, theBase2 Two bases of the supposed pipe. This + * should be wires or faces of \a theShape. + * \note It is not assumed that exact or approximate copy of \a theShape + * can be obtained by applying existing Pipe operation on the + * resulting "Path" wire taking \a theBase1 as the base - it is not + * always possible; though in some particular cases it might work + * it is not guaranteed. Thus, RestorePath function should not be + * considered as an exact reverse operation of the Pipe. + * \return New GEOM_Object, containing an edge or wire that represent + * source pipe's "path". + */ + GEOM_Object RestorePath (in GEOM_Object theShape, + in GEOM_Object theBase1, + in GEOM_Object theBase2); + + /*! + * \brief Build a middle path of a pipe-like shape. + * + * The path shape can be a wire or an edge. + * \param theShape It can be closed or unclosed pipe-like shell + * or a pipe-like solid. + * \param theBase1, theBase2 Two bases of the supposed pipe. This + * should be lists of edges of \a theShape. + * \note It is not assumed that exact or approximate copy of \a theShape + * can be obtained by applying existing Pipe operation on the + * resulting "Path" wire taking \a theBase1 as the base - it is not + * always possible; though in some particular cases it might work + * it is not guaranteed. Thus, RestorePath function should not be + * considered as an exact reverse operation of the Pipe. + * \return New GEOM_Object, containing an edge or wire that represent + * source pipe's "path". + */ + GEOM_Object RestorePathEdges (in GEOM_Object theShape, + in ListOfGO theBase1, + in ListOfGO theBase2); }; - // # GEOM_IShapesOperations /*! * \brief Interface for Shapes creation: * diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts index 96b164f7b..9cd7e615e 100644 --- a/src/GEOMGUI/GEOM_images.ts +++ b/src/GEOMGUI/GEOM_images.ts @@ -363,6 +363,10 @@ ICON_DLG_PARTITION_PLANE partitionplane.png + + ICON_DLG_PIPE_PATH + pipe.png + ICON_DLG_PIPE pipe.png @@ -995,6 +999,10 @@ ICO_PIPE pipe.png + + ICO_PIPE_PATH + pipe.png + ICO_PLANE plane.png diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 19b71ca9e..20c80d6b6 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -1278,6 +1278,26 @@ Please, select face, shell or solid and try again GEOM_PIPE_TITLE Pipe Construction + + GEOM_PIPE_PATH + Path + + + GEOM_PIPE_PATH_TITLE + Restore Path + + + GEOM_PIPE_LIKE_SHAPE + Pipe-like shell or solid + + + GEOM_PIPE_BASE1_OBJECT + First base face/wire/edges + + + GEOM_PIPE_BASE2_OBJECT + Last base face/wire/edges + GEOM_PROFILE Profile @@ -2714,6 +2734,10 @@ Please, select face, shell or solid and try again MEN_PIPE Extrusion Along Path + + MEN_PIPE_PATH + Restore Path + MEN_PLANE Plane @@ -3494,6 +3518,10 @@ Please, select face, shell or solid and try again STB_PIPE Create a shape by extrusion along a path + + STB_PIPE_PATH + Restore path from a pipe-like shape + STB_PLANE Create a plane @@ -4114,6 +4142,10 @@ Please, select face, shell or solid and try again TOP_PIPE Extrusion along path + + TOP_PIPE_PATH + Restore path + TOP_PLANE Create a plane diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index cfb646deb..d13a0fd99 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -107,7 +107,6 @@ #include - #include "GEOMImpl_Types.hxx" extern "C" { @@ -135,7 +134,7 @@ GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen() bool GeometryGUI::InitGeomGen() { GeometryGUI aGG; - if( CORBA::is_nil( myComponentGeom ) ) return false; + if ( CORBA::is_nil( myComponentGeom ) ) return false; return true; } @@ -173,12 +172,12 @@ SALOMEDS::Study_var GeometryGUI::ClientStudyToStudy (_PTR(Study) theStudy) return aDSStudy._retn(); } -void GeometryGUI::Modified( bool theIsUpdateActions ) +void GeometryGUI::Modified (bool theIsUpdateActions) { - if( SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ) ) { - if( SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ) ) { + if ( SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ) ) { + if ( SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ) ) { appStudy->Modified(); - if( theIsUpdateActions ) + if ( theIsUpdateActions ) app->updateActions(); } } @@ -281,17 +280,17 @@ void GeometryGUI::ActiveWorkingPlane() bool ViewOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() ); bool ViewVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() ); - if( ViewOCC ) { + if ( ViewOCC ) { OCCViewer_ViewWindow* vw = dynamic_cast( window ); if ( vw ) { Handle(V3d_View) view3d = vw->getViewPort()->getView(); view3d->SetProj(DZ.X(), DZ.Y(), DZ.Z()); view3d->SetUp(DY.X(), DY.Y(), DY.Z()); - vw->onViewFitAll(); + vw->onViewFitAll(); } } - else if( ViewVTK ) { + else if ( ViewVTK ) { SVTK_ViewWindow* vw = dynamic_cast( window ); if ( vw ) { vtkCamera* camera = vw->getRenderer()->GetActiveCamera(); @@ -473,6 +472,7 @@ void GeometryGUI::OnGUIEvent( int id ) case GEOMOp::OpRevolution: // MENU GENERATION - REVOLUTION case GEOMOp::OpFilling: // MENU GENERATION - FILLING case GEOMOp::OpPipe: // MENU GENERATION - PIPE + case GEOMOp::OpPipePath: // MENU GENERATION - RESTORE PATH libName = "GenerationGUI"; break; case GEOMOp::Op2dSketcher: // MENU ENTITY - SKETCHER @@ -596,15 +596,15 @@ void GeometryGUI::OnGUIEvent( int id ) // call method of corresponding GUI library if ( library ) { library->OnGUIEvent( id, desk ); - + // Update a list of materials for "Preferences" dialog if ( id == GEOMOp::OpMaterialProperties ) { LightApp_Preferences* pref = preferences(); if ( pref ) { - Material_ResourceMgr aMatResMgr; - setPreferenceProperty( pref->rootItem()->findItem( tr( "PREF_MATERIAL" ), true )->id(), - "strings", - aMatResMgr.materials() ); + Material_ResourceMgr aMatResMgr; + setPreferenceProperty( pref->rootItem()->findItem( tr( "PREF_MATERIAL" ), true )->id(), + "strings", + aMatResMgr.materials() ); } } } @@ -689,11 +689,11 @@ void GeometryGUI::createGeomAction( const int id, const QString& label, const QS void GeometryGUI::createOriginAndBaseVectors() { SalomeApp_Study* appStudy = dynamic_cast( application()->activeStudy() ); - if( appStudy ) { + if ( appStudy ) { _PTR(Study) studyDS = appStudy->studyDS(); - if( studyDS && !CORBA::is_nil( GetGeomGen() ) ) { + if ( studyDS && !CORBA::is_nil( GetGeomGen() ) ) { GEOM::GEOM_IBasicOperations_var aBasicOperations = GetGeomGen()->GetIBasicOperations( studyDS->StudyId() ); - if( !aBasicOperations->_is_nil() ) { + if ( !aBasicOperations->_is_nil() ) { SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr(); double aLength = aResourceMgr->doubleValue( "Geometry", "base_vectors_length", 1.0 ); GEOM::GEOM_Object_var anOrigin = aBasicOperations->MakePointXYZ( 0.0, 0.0, 0.0 ); @@ -751,6 +751,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createGeomAction( GEOMOp::OpRevolution, "REVOLUTION" ); createGeomAction( GEOMOp::OpFilling, "FILLING" ); createGeomAction( GEOMOp::OpPipe, "PIPE" ); + createGeomAction( GEOMOp::OpPipePath, "PIPE_PATH" ); createGeomAction( GEOMOp::OpGroupCreate, "GROUP_CREATE" ); createGeomAction( GEOMOp::OpGroupEdit, "GROUP_EDIT" ); @@ -950,6 +951,9 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpRevolution, genId, -1 ); createMenu( GEOMOp::OpFilling, genId, -1 ); createMenu( GEOMOp::OpPipe, genId, -1 ); +#if OCC_VERSION_LARGE > 0x06050300 + createMenu( GEOMOp::OpPipePath, genId, -1 ); +#endif // int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 ); @@ -983,9 +987,9 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpShell, buildId, -1 ); createMenu( GEOMOp::OpSolid, buildId, -1 ); createMenu( GEOMOp::OpCompound, buildId, -1 ); - + createMenu( separator(), newEntId, -1 ); - + createMenu( GEOMOp::OpPictureImport, newEntId, -1 ); #ifdef WITH_OPENCV createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 ); @@ -1110,7 +1114,7 @@ void GeometryGUI::initialize( CAM_Application* app ) */ // ---- create toolbars -------------------------- - + int basicTbId = createTool( tr( "TOOL_BASIC" ) ); createTool( GEOMOp::OpPoint, basicTbId ); createTool( GEOMOp::OpLine, basicTbId ); @@ -1124,11 +1128,11 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpPlane, basicTbId ); createTool( GEOMOp::OpLCS, basicTbId ); createTool( GEOMOp::OpOriginAndVectors, basicTbId ); - + // int sketchTbId = createTool( tr( "TOOL_SKETCH" ) ); // createTool( GEOMOp::Op2dSketcher, sketchTbId ); // createTool( GEOMOp::Op3dSketcher, sketchTbId ); - + int primTbId = createTool( tr( "TOOL_PRIMITIVES" ) ); createTool( GEOMOp::OpBox, primTbId ); createTool( GEOMOp::OpCylinder, primTbId ); @@ -1138,26 +1142,29 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpRectangle, primTbId ); createTool( GEOMOp::OpDisk, primTbId ); createTool( GEOMOp::OpPipeTShape, primTbId ); //rnc - + int blocksTbId = createTool( tr( "TOOL_BLOCKS" ) ); createTool( GEOMOp::OpDividedDisk, blocksTbId ); createTool( GEOMOp::OpDividedCylinder, blocksTbId ); - + // int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); //rnc // createTool( GEOMOp::OpPipeTShape, advancedTbId ); - + int boolTbId = createTool( tr( "TOOL_BOOLEAN" ) ); createTool( GEOMOp::OpFuse, boolTbId ); createTool( GEOMOp::OpCommon, boolTbId ); createTool( GEOMOp::OpCut, boolTbId ); createTool( GEOMOp::OpSection, boolTbId ); - - int genTbId = createTool( tr( "TOOL_GENERATION" ) ); + + int genTbId = createTool( tr( "TOOL_GENERATION" ) ); createTool( GEOMOp::OpPrism, genTbId ); createTool( GEOMOp::OpRevolution, genTbId ); createTool( GEOMOp::OpFilling, genTbId ); createTool( GEOMOp::OpPipe, genTbId ); - +#if OCC_VERSION_LARGE > 0x06050300 + createTool( GEOMOp::OpPipePath, genTbId ); +#endif + int transTbId = createTool( tr( "TOOL_TRANSFORMATION" ) ); createTool( GEOMOp::OpTranslate, transTbId ); createTool( GEOMOp::OpRotate, transTbId ); @@ -1169,14 +1176,14 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( separator(), transTbId ); createTool( GEOMOp::OpMultiTranslate, transTbId ); createTool( GEOMOp::OpMultiRotate, transTbId ); - + int operTbId = createTool( tr( "TOOL_OPERATIONS" ) ); createTool( GEOMOp::OpExplode, operTbId ); createTool( GEOMOp::OpPartition, operTbId ); createTool( GEOMOp::OpArchimede, operTbId ); createTool( GEOMOp::OpShapesOnShape, operTbId ); createTool( GEOMOp::OpSharedShapes, operTbId ); - + int featTbId = createTool( tr( "TOOL_FEATURES" ) ); createTool( GEOMOp::OpFillet1d, featTbId ); createTool( GEOMOp::OpFillet2d, featTbId ); @@ -1184,7 +1191,7 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpChamfer, featTbId ); createTool( GEOMOp::OpExtrudedBoss, featTbId ); createTool( GEOMOp::OpExtrudedCut, featTbId ); - + int buildTbId = createTool( tr( "TOOL_BUILD" ) ); createTool( GEOMOp::OpEdge, buildTbId ); createTool( GEOMOp::OpWire, buildTbId ); @@ -1219,7 +1226,7 @@ void GeometryGUI::initialize( CAM_Application* app ) #ifdef WITH_OPENCV createTool( GEOMOp::OpFeatureDetect, picturesTbId ); #endif - + // int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// @@ -1261,7 +1268,7 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->setRule(action(GEOMOp::OpBringToFront), bringRule, QtxPopupMgr::VisibleRule ); mgr->setRule(action(GEOMOp::OpBringToFront), "topLevel=true", QtxPopupMgr::ToggleRule ); mgr->insert( action(GEOMOp::OpClsBringToFront ), -1, -1 ); // clear bring to front - mgr->setRule( action(GEOMOp::OpClsBringToFront ), clientOCC, QtxPopupMgr::VisibleRule ); + mgr->setRule( action(GEOMOp::OpClsBringToFront ), clientOCC, QtxPopupMgr::VisibleRule ); #endif mgr->insert( separator(), -1, -1 ); // ----------- dispmodeId = mgr->insert( tr( "MEN_DISPLAY_MODE" ), -1, -1 ); // display mode menu @@ -1293,7 +1300,7 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->insert( action( GEOMOp::OpPointMarker ), -1, -1 ); // point marker //mgr->setRule( action( GEOMOp::OpPointMarker ), QString( "selcount>0 and $typeid in {%1}" ).arg(GEOM_POINT ), QtxPopupMgr::VisibleRule ); mgr->setRule( action( GEOMOp::OpPointMarker ), QString( "selcount>0 and ( $typeid in {%1} or compoundOfVertices=true ) " ).arg(GEOM::VERTEX).arg(GEOM::COMPOUND), QtxPopupMgr::VisibleRule ); - mgr->insert( action( GEOMOp::OpMaterialProperties ), -1, -1 ); // material properties + mgr->insert( action( GEOMOp::OpMaterialProperties ), -1, -1 ); // material properties mgr->setRule( action( GEOMOp::OpMaterialProperties ), clientOCCorVTK_AndSomeVisible + " and ($component={'GEOM'}) and selcount>0 and isVisible", QtxPopupMgr::VisibleRule ); mgr->insert( action( GEOMOp::OpSetTexture ), -1, -1 ); // texture mgr->setRule( action( GEOMOp::OpSetTexture ), clientOCCorOB_AndSomeVisible + " and ($component={'GEOM'})", QtxPopupMgr::VisibleRule ); @@ -1304,7 +1311,7 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->insert( action( GEOMOp::OpIsosWidth ), lineW, -1 ); // isos width mgr->setRule( action( GEOMOp::OpIsosWidth ), clientOCCorVTK_AndSomeVisible, QtxPopupMgr::VisibleRule ); - + mgr->insert( separator(), -1, -1 ); // ----------- mgr->insert( action( GEOMOp::OpAutoColor ), -1, -1 ); // auto color mgr->setRule( action( GEOMOp::OpAutoColor ), autoColorPrefix + " and isAutoColor=false", QtxPopupMgr::VisibleRule ); @@ -1363,7 +1370,6 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->insert( action( GEOMOp::OpUnpublishObject ), -1, -1 ); // Unpublish object mgr->setRule( action( GEOMOp::OpUnpublishObject ), QString("client='ObjectBrowser' and $type in {'Shape' 'Group'} and selcount>0"), QtxPopupMgr::VisibleRule ); - mgr->insert( action( GEOMOp::OpPublishObject ), -1, -1 ); // Publish object mgr->setRule( action( GEOMOp::OpPublishObject ), QString("client='ObjectBrowser' and isComponent=true"), QtxPopupMgr::VisibleRule ); @@ -1372,9 +1378,8 @@ void GeometryGUI::initialize( CAM_Application* app ) mgr->hide( mgr->actionId( action( myEraseAll ) ) ); - SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); - if(resMgr) { + if (resMgr) { GEOM_AISShape::setTopLevelDisplayMode((GEOM_AISShape::TopLevelDispMode)resMgr->integerValue("Geometry", "toplevel_dm", 0)); QColor c = resMgr->colorValue( "Geometry", "toplevel_color", QColor( 170, 85, 0 ) ); GEOM_AISShape::setTopLevelColor(SalomeApp_Tools::color(c)); @@ -1399,16 +1404,18 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) // import Python module that manages GEOM plugins (need to be here because SalomePyQt API uses active module) PyGILState_STATE gstate = PyGILState_Ensure(); - PyObject* pluginsmanager=PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager"); - if(pluginsmanager==NULL) + PyObject* pluginsmanager = PyImport_ImportModuleNoBlock((char*)"salome_pluginsmanager"); + if (pluginsmanager == NULL) PyErr_Print(); - else - { - PyObject* result=PyObject_CallMethod( pluginsmanager, (char*)"initialize", (char*)"isss",1,"geom",tr("MEN_NEW_ENTITY").toStdString().c_str(),tr("GEOM_PLUGINS_OTHER").toStdString().c_str()); - if(result==NULL) - PyErr_Print(); - Py_XDECREF(result); - } + else { + PyObject* result = + PyObject_CallMethod(pluginsmanager, (char*)"initialize", (char*)"isss", 1, "geom", + tr("MEN_NEW_ENTITY").toStdString().c_str(), + tr("GEOM_PLUGINS_OTHER").toStdString().c_str()); + if (result == NULL) + PyErr_Print(); + Py_XDECREF(result); + } PyGILState_Release(gstate); // end of GEOM plugins loading @@ -1466,13 +1473,13 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) // 0020836 (Basic vectors and origin) SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr(); - if( aResourceMgr->booleanValue( "Geometry", "auto_create_base_objects", false ) ) { + if ( aResourceMgr->booleanValue( "Geometry", "auto_create_base_objects", false ) ) { SalomeApp_Study* appStudy = dynamic_cast( application()->activeStudy() ); - if( appStudy ) { + if ( appStudy ) { _PTR(Study) studyDS = appStudy->studyDS(); - if( studyDS ) { + if ( studyDS ) { _PTR(SComponent) aSComponent = studyDS->FindComponent("GEOM"); - if( !aSComponent ) // create objects automatically only if there is no GEOM component + if ( !aSComponent ) // create objects automatically only if there is no GEOM component createOriginAndBaseVectors(); } } @@ -1481,7 +1488,6 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) return true; } - //======================================================================= // function : GeometryGUI::deactivateModule() // purpose : Called when GEOM module is deactivated @@ -1571,7 +1577,7 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm ) this, SLOT( OnMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) ); connect( vm, SIGNAL( mouseRelease ( SUIT_ViewWindow*, QMouseEvent* ) ), this, SLOT( OnMouseRelease( SUIT_ViewWindow*, QMouseEvent* ) ) ); - + LightApp_SelectionMgr* sm = getApp()->selectionMgr(); myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) ); @@ -1741,31 +1747,30 @@ void GeometryGUI::createPreferences() LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" ); int material = addPreference( tr( "PREF_MATERIAL" ), genGroup, - LightApp_Preferences::Selector, - "Geometry", "material" ); - + LightApp_Preferences::Selector, + "Geometry", "material" ); + const int nb = 4; int wd[nb]; int iter=0; wd[iter++] = addPreference( tr( "PREF_EDGE_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "edge_width" ); + LightApp_Preferences::IntSpin, "Geometry", "edge_width" ); wd[iter++] = addPreference( tr( "PREF_ISOLINES_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "isolines_width" ); + LightApp_Preferences::IntSpin, "Geometry", "isolines_width" ); wd[iter++] = addPreference( tr( "PREF_PREVIEW_EDGE_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "preview_edge_width" ); - + LightApp_Preferences::IntSpin, "Geometry", "preview_edge_width" ); + wd[iter++] = addPreference( tr( "PREF_MEASURES_LINE_WIDTH" ), genGroup, - LightApp_Preferences::IntSpin, "Geometry", "measures_line_width" ); + LightApp_Preferences::IntSpin, "Geometry", "measures_line_width" ); - for(int i = 0; i < nb; i++) { - setPreferenceProperty( wd[i], "min", 1 ); + for (int i = 0; i < nb; i++) { + setPreferenceProperty( wd[i], "min", 1 ); setPreferenceProperty( wd[i], "max", 5 ); } - // Quantities with individual precision settings int precGroup = addPreference( tr( "GEOM_PREF_GROUP_PRECISION" ), tabId ); setPreferenceProperty( precGroup, "columns", 2 ); @@ -1819,7 +1824,6 @@ void GeometryGUI::createPreferences() setPreferenceProperty( dispmode, "strings", aModesList ); setPreferenceProperty( dispmode, "indexes", anIndexesList ); - // Set property for top level display mode QStringList aTopModesList; aTopModesList.append( tr("MEN_SHOW_ADD_WACTOR") ); @@ -1891,7 +1895,6 @@ void GeometryGUI::createPreferences() addPreference( tr( "PREF_AUTO_CREATE" ), originGroup, LightApp_Preferences::Bool, "Geometry", "auto_create_base_objects" ); - int operationsGroup = addPreference( tr( "PREF_GROUP_OPERATIONS" ), tabId ); setPreferenceProperty( operationsGroup, "columns", 2 ); @@ -1906,18 +1909,20 @@ void GeometryGUI::preferencesChanged( const QString& section, const QString& par if (param == QString("SettingsGeomStep")) { double spin_step = aResourceMgr->doubleValue(section, param, 100.); EmitSignalDefaultStepValueChanged(spin_step); - } else if(param == QString("toplevel_color")) { + } + else if (param == QString("toplevel_color")) { QColor c = aResourceMgr->colorValue( "Geometry", "toplevel_color", QColor( 170, 85, 0 ) ); GEOM_AISShape::setTopLevelColor(SalomeApp_Tools::color(c)); - } else if(param == QString("toplevel_dm")) { + } + else if (param == QString("toplevel_dm")) { GEOM_AISShape::setTopLevelDisplayMode((GEOM_AISShape::TopLevelDispMode)aResourceMgr->integerValue("Geometry", "toplevel_dm", 0)); } - } + } } LightApp_Displayer* GeometryGUI::displayer() { - if( !myDisplayer ) + if ( !myDisplayer ) myDisplayer = new GEOM_Displayer( dynamic_cast( getApp()->activeStudy() ) ); return myDisplayer; } @@ -1926,6 +1931,7 @@ void GeometryGUI::setLocalSelectionMode(const int mode) { myLocalSelectionMode = mode; } + int GeometryGUI::getLocalSelectionMode() const { return myLocalSelectionMode; @@ -1986,7 +1992,7 @@ void GeometryGUI::storeVisualParameters (int savePoint) std::string entry = ip->encodeEntry(o_it.key().toLatin1().data(), componentName); _PTR(GenericAttribute) anAttr; - if( !obj->FindAttribute(anAttr, "AttributeIOR")) + if (!obj->FindAttribute(anAttr, "AttributeIOR")) continue; std::string param,occParam = vType.toLatin1().data(); @@ -1994,17 +2000,17 @@ void GeometryGUI::storeVisualParameters (int savePoint) occParam += QString::number(aMgrId).toLatin1().data(); occParam += NAME_SEPARATOR; - if(aProps.contains(VISIBILITY_PROP)) { + if (aProps.contains(VISIBILITY_PROP)) { param = occParam + VISIBILITY_PROP; ip->setParameter(entry, param, aProps.value(VISIBILITY_PROP).toInt() == 1 ? "On" : "Off"); } - if(aProps.contains(DISPLAY_MODE_PROP)) { + if (aProps.contains(DISPLAY_MODE_PROP)) { param = occParam + DISPLAY_MODE_PROP; ip->setParameter(entry, param, QString::number(aProps.value(DISPLAY_MODE_PROP).toInt()).toLatin1().data()); } - if(aProps.contains(COLOR_PROP)) { + if (aProps.contains(COLOR_PROP)) { QColor c = aProps.value(COLOR_PROP).value(); QString colorStr = QString::number(c.red()/255.); colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.green()/255.); @@ -2013,59 +2019,59 @@ void GeometryGUI::storeVisualParameters (int savePoint) ip->setParameter(entry, param, colorStr.toLatin1().data()); } - if(vType == SVTK_Viewer::Type()) { - if(aProps.contains(OPACITY_PROP)) { + if (vType == SVTK_Viewer::Type()) { + if (aProps.contains(OPACITY_PROP)) { param = occParam + OPACITY_PROP; ip->setParameter(entry, param, QString::number(1. - aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data()); } } else if (vType == SOCC_Viewer::Type()) { - if(aProps.contains(TRANSPARENCY_PROP)) { + if (aProps.contains(TRANSPARENCY_PROP)) { param = occParam + TRANSPARENCY_PROP; ip->setParameter(entry, param, QString::number(aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data()); } - if(aProps.contains(TOP_LEVEL_PROP)) { + if (aProps.contains(TOP_LEVEL_PROP)) { param = occParam + TOP_LEVEL_PROP; - Standard_Boolean val = aProps.value(TOP_LEVEL_PROP).value(); - if (val == Standard_True) - ip->setParameter(entry, param, "1"); - } + Standard_Boolean val = aProps.value(TOP_LEVEL_PROP).value(); + if (val == Standard_True) + ip->setParameter(entry, param, "1"); + } } - if(aProps.contains(ISOS_PROP)) { + if (aProps.contains(ISOS_PROP)) { param = occParam + ISOS_PROP; ip->setParameter(entry, param, aProps.value(ISOS_PROP).toString().toLatin1().data()); } - if(aProps.contains(VECTOR_MODE_PROP)) { + if (aProps.contains(VECTOR_MODE_PROP)) { param = occParam + VECTOR_MODE_PROP; ip->setParameter(entry, param, QString::number(aProps.value(VECTOR_MODE_PROP).toInt()).toLatin1().data()); } - if(aProps.contains(DEFLECTION_COEFF_PROP)) { + if (aProps.contains(DEFLECTION_COEFF_PROP)) { param = occParam + DEFLECTION_COEFF_PROP; ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data()); } //Marker type of the vertex - ONLY for the "Vertex" and "Compound of the Vertex" - if(aProps.contains(MARKER_TYPE_PROP)) { + if (aProps.contains(MARKER_TYPE_PROP)) { param = occParam + MARKER_TYPE_PROP; ip->setParameter(entry, param, aProps.value(MARKER_TYPE_PROP).toString().toLatin1().data()); } - if(aProps.contains(MATERIAL_PROP)) { + if (aProps.contains(MATERIAL_PROP)) { param = occParam + MATERIAL_PROP; ip->setParameter(entry, param, aProps.value(MATERIAL_PROP).toString().toLatin1().data()); } - if(aProps.contains( EDGE_WIDTH_PROP )) { + if (aProps.contains(EDGE_WIDTH_PROP)) { param = occParam + EDGE_WIDTH_PROP; - ip->setParameter(entry, param, aProps.value(EDGE_WIDTH_PROP).toString().toLatin1().data()); + ip->setParameter(entry, param, aProps.value(EDGE_WIDTH_PROP).toString().toLatin1().data()); } - - if(aProps.contains( ISOS_WIDTH_PROP )) { - param = occParam + ISOS_WIDTH_PROP; - ip->setParameter(entry, param, aProps.value(ISOS_WIDTH_PROP).toString().toLatin1().data()); + + if (aProps.contains(ISOS_WIDTH_PROP)) { + param = occParam + ISOS_WIDTH_PROP; + ip->setParameter(entry, param, aProps.value(ISOS_WIDTH_PROP).toString().toLatin1().data()); } } // object iterator } // for (views) @@ -2141,52 +2147,42 @@ void GeometryGUI::restoreVisualParameters (int savePoint) if (!ok) // bad conversion of view index to integer continue; - if((viewIndex + 1) > aListOfMap.count()) { + if ((viewIndex + 1) > aListOfMap.count()) { aListOfMap.resize(viewIndex + 1); } QString val((*valuesIt).c_str()); - if(paramNameStr == VISIBILITY_PROP){ + if (paramNameStr == VISIBILITY_PROP) { aListOfMap[viewIndex].insert(VISIBILITY_PROP, val == "On" ? 1 : 0); - - } else if(paramNameStr == OPACITY_PROP) { + } else if (paramNameStr == OPACITY_PROP) { aListOfMap[viewIndex].insert(TRANSPARENCY_PROP, 1. - val.toDouble()); - - } else if(paramNameStr == TRANSPARENCY_PROP) { + } else if (paramNameStr == TRANSPARENCY_PROP) { aListOfMap[viewIndex].insert( TRANSPARENCY_PROP, val.toDouble() ); - - } else if(paramNameStr == TOP_LEVEL_PROP) { - aListOfMap[viewIndex].insert( TRANSPARENCY_PROP, val == "1" ? Standard_True : Standard_False ); - - } else if(paramNameStr == DISPLAY_MODE_PROP) { + } else if (paramNameStr == TOP_LEVEL_PROP) { + aListOfMap[viewIndex].insert( TRANSPARENCY_PROP, val == "1" ? Standard_True : Standard_False ); + } else if (paramNameStr == DISPLAY_MODE_PROP) { aListOfMap[viewIndex].insert( DISPLAY_MODE_PROP, val.toInt()); - - } else if(paramNameStr == ISOS_PROP) { + } else if (paramNameStr == ISOS_PROP) { aListOfMap[viewIndex].insert( ISOS_PROP, val); - - } else if(paramNameStr == COLOR_PROP) { + } else if (paramNameStr == COLOR_PROP) { QStringList rgb = val.split(DIGIT_SEPARATOR); - if(rgb.count() == 3) { + if (rgb.count() == 3) { QColor c(int(rgb[0].toDouble()*255), int(rgb[1].toDouble()*255), int(rgb[2].toDouble()*255)); aListOfMap[viewIndex].insert( COLOR_PROP, c); } - } else if(paramNameStr == VECTOR_MODE_PROP) { + } else if (paramNameStr == VECTOR_MODE_PROP) { aListOfMap[viewIndex].insert( VECTOR_MODE_PROP, val.toInt()); - - } else if(paramNameStr == DEFLECTION_COEFF_PROP) { + } else if (paramNameStr == DEFLECTION_COEFF_PROP) { aListOfMap[viewIndex].insert( DEFLECTION_COEFF_PROP, val.toDouble()); - } else if(paramNameStr == MARKER_TYPE_PROP) { + } else if (paramNameStr == MARKER_TYPE_PROP) { aListOfMap[viewIndex].insert( MARKER_TYPE_PROP, val); - } else if(paramNameStr == MATERIAL_PROP) { + } else if (paramNameStr == MATERIAL_PROP) { aListOfMap[viewIndex].insert( MATERIAL_PROP, val); - } else if(paramNameStr == EDGE_WIDTH_PROP) { - aListOfMap[viewIndex].insert( EDGE_WIDTH_PROP , val); - } else if(paramNameStr == ISOS_WIDTH_PROP) { - aListOfMap[viewIndex].insert( ISOS_WIDTH_PROP , val); + } else if (paramNameStr == EDGE_WIDTH_PROP) { + aListOfMap[viewIndex].insert( EDGE_WIDTH_PROP, val); + } else if (paramNameStr == ISOS_WIDTH_PROP) { + aListOfMap[viewIndex].insert( ISOS_WIDTH_PROP, val); } - - - } // for names/parameters iterator QList lst = getApp()->viewManagers(); @@ -2202,7 +2198,6 @@ void GeometryGUI::restoreVisualParameters (int savePoint) displayer()->Display(entry, true, dynamic_cast(vmodel)); } } - } // for entries iterator // update all VTK and OCC views @@ -2243,7 +2238,7 @@ void GeometryGUI::onViewAboutToShow() /*! \brief Return action by id \param id identifier of the action - \return action + \return action */ QAction* GeometryGUI::getAction(const int id) { return action(id); @@ -2261,32 +2256,32 @@ QAction* GeometryGUI::getAction(const int id) { bool GeometryGUI::renameAllowed( const QString& entry) const { SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); - SalomeApp_Study* appStudy = app ? dynamic_cast( app->activeStudy() ) : 0; + SalomeApp_Study* appStudy = app ? dynamic_cast( app->activeStudy() ) : 0; SalomeApp_DataObject* obj = appStudy ? dynamic_cast(appStudy->findObjectByEntry(entry)) : 0; - + return (app && appStudy && obj && !appStudy->isComponent(entry) && !obj->isReference()); } - /*! Rename object by entry. \param entry entry of the object \param name new name of the object \brief Return \c true if rename operation finished successfully, \c false otherwise. */ -bool GeometryGUI::renameObject( const QString& entry, const QString& name) { - +bool GeometryGUI::renameObject( const QString& entry, const QString& name) +{ bool result = false; - - SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication()); + + SalomeApp_Application* app = + dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication()); SalomeApp_Study* appStudy = app ? dynamic_cast( app->activeStudy() ) : 0; - - if(!appStudy) + + if (!appStudy) return result; - + _PTR(Study) aStudy = appStudy->studyDS(); - - if(!aStudy) + + if (!aStudy) return result; bool aLocked = (_PTR(AttributeStudyProperties)(appStudy->studyDS()->GetProperties()))->IsLocked(); @@ -2311,4 +2306,3 @@ bool GeometryGUI::renameObject( const QString& entry, const QString& name) { } return result; } - diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h index 75e45e43f..e17172e49 100644 --- a/src/GEOMGUI/GeometryGUI_Operations.h +++ b/src/GEOMGUI/GeometryGUI_Operations.h @@ -98,6 +98,7 @@ namespace GEOMOp { OpRevolution = 3201, // MENU NEW ENTITY - GENERATION - REVOLUTION OpFilling = 3202, // MENU NEW ENTITY - GENERATION - FILLING OpPipe = 3203, // MENU NEW ENTITY - GENERATION - EXTRUSION ALONG PATH + OpPipePath = 3204, // MENU NEW ENTITY - GENERATION - RESTORE PATH // EntityGUI -------------------//-------------------------------- Op2dSketcher = 3300, // MENU NEW ENTITY - SKETCHER Op3dSketcher = 3301, // MENU NEW ENTITY - 3D SKETCHER diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx index 884da5cb1..f8f02247d 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.cxx +++ b/src/GEOMImpl/GEOMImpl_Gen.cxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifdef WNT #pragma warning( disable:4786 ) @@ -54,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -122,6 +122,7 @@ GEOMImpl_Gen::GEOMImpl_Gen() TFunction_DriverTable::Get()->AddDriver(GEOMImpl_CylinderDriver::GetID(), new GEOMImpl_CylinderDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PrismDriver::GetID(), new GEOMImpl_PrismDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PipeDriver::GetID(), new GEOMImpl_PipeDriver()); + TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PipePathDriver::GetID(), new GEOMImpl_PipePathDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_ThruSectionsDriver::GetID(), new GEOMImpl_ThruSectionsDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_RevolutionDriver::GetID(), new GEOMImpl_RevolutionDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_SphereDriver::GetID(), new GEOMImpl_SphereDriver()); diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index dc2ab3599..b4103f9fa 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #include @@ -49,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -69,6 +69,7 @@ #include #include #include +#include #include @@ -2176,7 +2177,6 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeShellsWithoutPath( } - //============================================================================= /*! * MakePipeBiNormalAlongVector @@ -2236,3 +2236,173 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeBiNormalAlongVector (Han SetErrorCode(OK); return aPipe; } + +//============================================================================= +/*! + * RestorePath + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath (Handle(GEOM_Object) theShape, + Handle(GEOM_Object) theBase1, + Handle(GEOM_Object) theBase2) +{ + SetErrorCode(KO); + + if (theShape.IsNull() || theBase1.IsNull() || theBase2.IsNull()) return NULL; + + // Add a new Path object + Handle(GEOM_Object) aPath = GetEngine()->AddObject(GetDocID(), GEOM_PIPE_PATH); + + // Add a new Path function + Handle(GEOM_Function) aFunction = + aPath->AddFunction(GEOMImpl_PipePathDriver::GetID(), PIPE_PATH_TWO_BASES); + if (aFunction.IsNull()) return NULL; + + // Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_PipePathDriver::GetID()) return NULL; + + GEOMImpl_IPipePath aCI (aFunction); + + Handle(GEOM_Function) aRefShape = theShape->GetLastFunction(); + Handle(GEOM_Function) aRefBase1 = theBase1->GetLastFunction(); + Handle(GEOM_Function) aRefBase2 = theBase2->GetLastFunction(); + + if (aRefShape.IsNull() || aRefBase1.IsNull() || aRefBase2.IsNull()) return NULL; + + aCI.SetShape(aRefShape); + aCI.SetBase1(aRefBase1); + aCI.SetBase2(aRefBase2); + + // Compute the Path value + try { +#if OCC_VERSION_LARGE > 0x06010000 + OCC_CATCH_SIGNALS; +#endif + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("PipePath driver failed"); + return NULL; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode(aFail->GetMessageString()); + return NULL; + } + + // Make a Python command + GEOM::TPythonDump(aFunction) << aPath << " = geompy.RestorePath(" + << theShape << ", " << theBase1 << ", " << theBase2 << ")"; + + SetErrorCode(OK); + return aPath; +} + +//============================================================================= +/*! + * RestorePath + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath + (Handle(GEOM_Object) theShape, + const Handle(TColStd_HSequenceOfTransient)& theBase1, + const Handle(TColStd_HSequenceOfTransient)& theBase2) +{ + SetErrorCode(KO); + + if (theShape.IsNull() || theBase1.IsNull() || theBase2.IsNull()) return NULL; + + Standard_Integer nbBases1 = theBase1->Length(); + Standard_Integer nbBases2 = theBase2->Length(); + + if (!nbBases1 || !nbBases2) + return NULL; + + // Add a new Path object + Handle(GEOM_Object) aPath = GetEngine()->AddObject(GetDocID(), GEOM_PIPE_PATH); + + // Add a new Path function + Handle(GEOM_Function) aFunction = + aPath->AddFunction(GEOMImpl_PipePathDriver::GetID(), PIPE_PATH_TWO_SEQS); + if (aFunction.IsNull()) return NULL; + + // Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_PipePathDriver::GetID()) return NULL; + + GEOMImpl_IPipePath aCI (aFunction); + + Handle(GEOM_Function) aRefShape = theShape->GetLastFunction(); + if (aRefShape.IsNull()) return NULL; + + Handle(TColStd_HSequenceOfTransient) aSeqBases1 = new TColStd_HSequenceOfTransient; + Handle(TColStd_HSequenceOfTransient) aSeqBases2 = new TColStd_HSequenceOfTransient; + + Standard_Integer i; + for (i = 1; i <= nbBases1; i++) { + Handle(Standard_Transient) anItem = theBase1->Value(i); + if (!anItem.IsNull()) { + Handle(GEOM_Object) aBase = Handle(GEOM_Object)::DownCast(anItem); + if (!aBase.IsNull()) { + Handle(GEOM_Function) aRefBase = aBase->GetLastFunction(); + if (!aRefBase.IsNull()) + aSeqBases1->Append(aRefBase); + } + } + } + for (i = 1; i <= nbBases2; i++) { + Handle(Standard_Transient) anItem = theBase2->Value(i); + if (!anItem.IsNull()) { + Handle(GEOM_Object) aBase = Handle(GEOM_Object)::DownCast(anItem); + if (!aBase.IsNull()) { + Handle(GEOM_Function) aRefBase = aBase->GetLastFunction(); + if (!aRefBase.IsNull()) + aSeqBases2->Append(aRefBase); + } + } + } + if (!aSeqBases1->Length() || !aSeqBases2->Length()) return NULL; + + aCI.SetShape(aRefShape); + aCI.SetBaseSeq1(aSeqBases1); + aCI.SetBaseSeq2(aSeqBases2); + + // Compute the Path value + try { +#if OCC_VERSION_LARGE > 0x06010000 + OCC_CATCH_SIGNALS; +#endif + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("PipePath driver failed"); + return NULL; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode(aFail->GetMessageString()); + return NULL; + } + + // Make a Python command + GEOM::TPythonDump pyDump (aFunction); + pyDump << aPath << " = geompy.RestorePathEdges(" << theShape << ", ["; + for (i = 1; i <= nbBases1; i++) { + Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(theBase1->Value(i)); + if (!anObj.IsNull()) { + pyDump << anObj; + if (i < nbBases1) + pyDump << ", "; + } + } + pyDump<< "], ["; + for (i = 1; i <= nbBases2; i++) { + Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(theBase2->Value(i)); + if (!anObj.IsNull()) { + pyDump << anObj; + if (i < nbBases2) + pyDump << ", "; + } + } + pyDump << "])"; + + SetErrorCode(OK); + return aPath; +} diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx index c567d0333..6cd2dd25d 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifndef _GEOMImpl_I3DPrimOperations_HXX_ #define _GEOMImpl_I3DPrimOperations_HXX_ @@ -131,14 +130,21 @@ class GEOMImpl_I3DPrimOperations : public GEOM_IOperations { bool theWithContact, bool theWithCorrections); - Standard_EXPORT Handle(GEOM_Object) MakePipeShellsWithoutPath( - const Handle(TColStd_HSequenceOfTransient)& theBases, - const Handle(TColStd_HSequenceOfTransient)& theLocations); + Standard_EXPORT Handle(GEOM_Object) MakePipeShellsWithoutPath + (const Handle(TColStd_HSequenceOfTransient)& theBases, + const Handle(TColStd_HSequenceOfTransient)& theLocations); Standard_EXPORT Handle(GEOM_Object) MakePipeBiNormalAlongVector (Handle(GEOM_Object) theBase, Handle(GEOM_Object) thePath, Handle(GEOM_Object) theVec); + Standard_EXPORT Handle(GEOM_Object) RestorePath (Handle(GEOM_Object) theShape, + Handle(GEOM_Object) theBase1, + Handle(GEOM_Object) theBase2); + + Standard_EXPORT Handle(GEOM_Object) RestorePath (Handle(GEOM_Object) theShape, + const Handle(TColStd_HSequenceOfTransient)& theBase1, + const Handle(TColStd_HSequenceOfTransient)& theBase2); }; #endif diff --git a/src/GEOMImpl/GEOMImpl_IPipePath.hxx b/src/GEOMImpl/GEOMImpl_IPipePath.hxx new file mode 100644 index 000000000..028ab2f53 --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_IPipePath.hxx @@ -0,0 +1,61 @@ +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// NOTE: This is an interface to the function RestorePath. + +#ifndef _GEOMImpl_IPIPEPATH_HXX_ +#define _GEOMImpl_IPIPEPATH_HXX_ + +#include "GEOM_Function.hxx" + +class GEOMImpl_IPipePath +{ + public: + + enum { + PIPE_PATH_SHAPE = 1, + PIPE_PATH_BASE1 = 2, + PIPE_PATH_BASE2 = 3, + PIPE_PATH_SEQ1 = 4, + PIPE_PATH_SEQ2 = 5 + }; + + GEOMImpl_IPipePath (Handle(GEOM_Function)& theFunction): _func(theFunction) {} + + void SetShape (Handle(GEOM_Function) theShape) { _func->SetReference(PIPE_PATH_SHAPE, theShape); } + void SetBase1 (Handle(GEOM_Function) theBase1) { _func->SetReference(PIPE_PATH_BASE1, theBase1); } + void SetBase2 (Handle(GEOM_Function) theBase2) { _func->SetReference(PIPE_PATH_BASE2, theBase2); } + void SetBaseSeq1 (const Handle(TColStd_HSequenceOfTransient)& theBase1) + { _func->SetReferenceList(PIPE_PATH_SEQ1, theBase1); } + void SetBaseSeq2 (const Handle(TColStd_HSequenceOfTransient)& theBase2) + { _func->SetReferenceList(PIPE_PATH_SEQ2, theBase2); } + + Handle(GEOM_Function) GetShape() { return _func->GetReference(PIPE_PATH_SHAPE); } + Handle(GEOM_Function) GetBase1() { return _func->GetReference(PIPE_PATH_BASE1); } + Handle(GEOM_Function) GetBase2() { return _func->GetReference(PIPE_PATH_BASE2); } + Handle(TColStd_HSequenceOfTransient) GetBaseSeq1 () + { return _func->GetReferenceList(PIPE_PATH_SEQ1); } + Handle(TColStd_HSequenceOfTransient) GetBaseSeq2 () + { return _func->GetReferenceList(PIPE_PATH_SEQ2); } + + protected: + + Handle(GEOM_Function) _func; +}; + +#endif diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index 21475ee42..400c2a03c 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -41,15 +42,14 @@ #include #include +#include +#include #include #include #include +#include #include #include -#include -#include -#include -#include #include #include @@ -68,6 +68,8 @@ #include #include +#include + #include #include #include @@ -88,6 +90,7 @@ #include #include + #include #include #include @@ -100,7 +103,7 @@ //======================================================================= const Standard_GUID& GEOMImpl_PipeDriver::GetID() { - static Standard_GUID aPipeDriver("FF1BBB19-5D14-4df2-980B-3A668264EA16"); + static Standard_GUID aPipeDriver ("FF1BBB19-5D14-4df2-980B-3A668264EA16"); return aPipeDriver; } @@ -2277,23 +2280,23 @@ static TopoDS_Shape CreatePipeBiNormalAlongVector(const TopoDS_Wire& aWirePath, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const { - //cout<<"PipeDriver::Execute"<GetType(); + + GEOMImpl_IPipe* aCI = 0; if (aType == PIPE_BASE_PATH) - aCI = new GEOMImpl_IPipe(aFunction); + aCI = new GEOMImpl_IPipe (aFunction); else if (aType == PIPE_DIFFERENT_SECTIONS) - aCI = new GEOMImpl_IPipeDiffSect(aFunction); + aCI = new GEOMImpl_IPipeDiffSect (aFunction); else if (aType == PIPE_SHELL_SECTIONS) - aCI = new GEOMImpl_IPipeShellSect(aFunction); + aCI = new GEOMImpl_IPipeShellSect (aFunction); else if (aType == PIPE_SHELLS_WITHOUT_PATH) - aCI = new GEOMImpl_IPipeShellSect(aFunction); + aCI = new GEOMImpl_IPipeShellSect (aFunction); else if (aType == PIPE_BI_NORMAL_ALONG_VECTOR) - aCI = new GEOMImpl_IPipeBiNormal(aFunction); + aCI = new GEOMImpl_IPipeBiNormal (aFunction); else return 0; diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx new file mode 100644 index 000000000..5acf28f12 --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx @@ -0,0 +1,242 @@ +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +#include + +#include + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if OCC_VERSION_LARGE > 0x06050300 +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include "utilities.h" + +//======================================================================= +//function : GetID +//purpose : +//======================================================================= +const Standard_GUID& GEOMImpl_PipePathDriver::GetID() +{ + static Standard_GUID aPipePathDriver ("FF1BBB19-5D14-4df2-980B-3A668264EA17"); + return aPipePathDriver; +} + +//======================================================================= +//function : GEOMImpl_PipePathDriver +//purpose : +//======================================================================= +GEOMImpl_PipePathDriver::GEOMImpl_PipePathDriver() +{ +} + +//======================================================================= +//function : Execute +//purpose : +//======================================================================= +Standard_Integer GEOMImpl_PipePathDriver::Execute (TFunction_Logbook& log) const +{ + if (Label().IsNull()) return 0; + Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); + Standard_Integer aType = aFunction->GetType(); + + TopoDS_Shape aRes; + + // RestorePath + if (aType == PIPE_PATH_TWO_BASES) { + GEOMImpl_IPipePath aPI (aFunction); + + Handle(GEOM_Function) aRefShape = aPI.GetShape(); + Handle(GEOM_Function) aRefBase1 = aPI.GetBase1(); + Handle(GEOM_Function) aRefBase2 = aPI.GetBase2(); + + TopoDS_Shape aShape = aRefShape->GetValue(); + TopoDS_Shape aBase1 = aRefBase1->GetValue(); + TopoDS_Shape aBase2 = aRefBase2->GetValue(); + + if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) + Standard_NullObject::Raise("RestorePath aborted : null argument"); + +#if OCC_VERSION_LARGE > 0x06050300 + BRepOffsetAPI_MiddlePath aMPB (aShape, aBase1, aBase2); + aMPB.Build(); + if (aMPB.IsDone()) { + aRes = aMPB.Shape(); + } +#else + Standard_NullObject::Raise("RestorePath is not implemented in used OCCT version"); +#endif + } + else if (aType == PIPE_PATH_TWO_SEQS) { + GEOMImpl_IPipePath aPI (aFunction); + + Handle(GEOM_Function) aRefShape = aPI.GetShape(); + TopoDS_Shape aShape = aRefShape->GetValue(); + + Handle(TColStd_HSequenceOfTransient) aBaseSeq1 = aPI.GetBaseSeq1(); + Handle(TColStd_HSequenceOfTransient) aBaseSeq2 = aPI.GetBaseSeq2(); + + TopoDS_Shape aBase1; + TopoDS_Shape aBase2; + + if (aBaseSeq1->Length() == 1 && aBaseSeq2->Length() == 1) { + Handle(GEOM_Function) aRefShape1 = Handle(GEOM_Function)::DownCast(aBaseSeq1->Value(1)); + Handle(GEOM_Function) aRefShape2 = Handle(GEOM_Function)::DownCast(aBaseSeq2->Value(1)); + aBase1 = aRefShape1->GetValue(); + aBase2 = aRefShape2->GetValue(); + } + else { + aBase1 = GEOMImpl_ShapeDriver::MakeWireFromEdges(aBaseSeq1, Precision::Confusion()); + aBase2 = GEOMImpl_ShapeDriver::MakeWireFromEdges(aBaseSeq2, Precision::Confusion()); + } + + if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) + Standard_NullObject::Raise("RestorePath aborted : null argument"); + +#if OCC_VERSION_LARGE > 0x06050300 + BRepOffsetAPI_MiddlePath aMPB (aShape, aBase1, aBase2); + aMPB.Build(); + if (aMPB.IsDone()) { + aRes = aMPB.Shape(); + } +#else + Standard_NullObject::Raise("RestorePath is not implemented in used OCCT version"); +#endif + } + else { + } + + if (aRes.IsNull()) return 0; + + aFunction->SetValue(aRes); + log.SetTouched(Label()); + + return 1; +} + +//======================================================================= +//function : GEOMImpl_PipePathDriver_Type_ +//purpose : +//======================================================================= +Standard_EXPORT Handle_Standard_Type& GEOMImpl_PipePathDriver_Type_() +{ + static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver); + if (aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver); + static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared); + if (aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); + static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient); + if (aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient); + + static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; + static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_PipePathDriver", + sizeof(GEOMImpl_PipePathDriver), + 1, + (Standard_Address)_Ancestors, + (Standard_Address)NULL); + + return _aType; +} + +//======================================================================= +//function : DownCast +//purpose : +//======================================================================= +const Handle(GEOMImpl_PipePathDriver) Handle(GEOMImpl_PipePathDriver)::DownCast(const Handle(Standard_Transient)& AnObject) +{ + Handle(GEOMImpl_PipePathDriver) _anOtherObject; + + if (!AnObject.IsNull()) { + if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_PipePathDriver))) { + _anOtherObject = Handle(GEOMImpl_PipePathDriver)((Handle(GEOMImpl_PipePathDriver)&)AnObject); + } + } + + return _anOtherObject; +} diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx new file mode 100644 index 000000000..36bf36314 --- /dev/null +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx @@ -0,0 +1,167 @@ +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// File : GEOMImpl_PipePathDriver.ixx +// Module : GEOMImpl + +#ifndef _GEOMImpl_PipePathDriver_HeaderFile +#define _GEOMImpl_PipePathDriver_HeaderFile + +#ifndef _TColStd_SequenceOfExtendedString_HeaderFile +#include +#endif +#ifndef _Standard_TypeMismatch_HeaderFile +#include +#endif + +#ifndef _Standard_HeaderFile +#include +#endif + +#ifndef _Standard_Macro_HeaderFile +#include +#endif +#ifndef _Standard_HeaderFile +#include +#endif +#ifndef _Standard_GUID_HeaderFile +#include +#endif + +#ifndef _Handle_TFunction_Driver_HeaderFile +#include +#endif + + +class Standard_Transient; +class Handle_Standard_Type; +class Handle(TFunction_Driver); +class GEOMImpl_PipePathDriver; + +Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_PipePathDriver); + +class Handle(GEOMImpl_PipePathDriver) : public Handle(TFunction_Driver) { + public: + inline void* operator new(size_t,void* anAddress) + { + return anAddress; + } + inline void* operator new(size_t size) + { + return Standard::Allocate(size); + } + inline void operator delete(void *anAddress) + { + if (anAddress) Standard::Free((Standard_Address&)anAddress); + } + + Handle(GEOMImpl_PipePathDriver)():Handle(TFunction_Driver)() {} + Handle(GEOMImpl_PipePathDriver)(const Handle(GEOMImpl_PipePathDriver)& aHandle) : Handle(TFunction_Driver)(aHandle) + { + } + + Handle(GEOMImpl_PipePathDriver)(const GEOMImpl_PipePathDriver* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) + { + } + + Handle(GEOMImpl_PipePathDriver)& operator=(const Handle(GEOMImpl_PipePathDriver)& aHandle) + { + Assign(aHandle.Access()); + return *this; + } + + Handle(GEOMImpl_PipePathDriver)& operator=(const GEOMImpl_PipePathDriver* anItem) + { + Assign((Standard_Transient *)anItem); + return *this; + } + + GEOMImpl_PipePathDriver* operator->() + { + return (GEOMImpl_PipePathDriver *)ControlAccess(); + } + + GEOMImpl_PipePathDriver* operator->() const + { + return (GEOMImpl_PipePathDriver *)ControlAccess(); + } + + Standard_EXPORT ~Handle(GEOMImpl_PipePathDriver)() {}; + + Standard_EXPORT static const Handle(GEOMImpl_PipePathDriver) DownCast(const Handle(Standard_Transient)& AnObject); +}; + +#ifndef _TFunction_Driver_HeaderFile +#include +#endif +#ifndef _TFunction_Logbook_HeaderFile +#include +#endif +#ifndef _Standard_CString_HeaderFile +#include +#endif + +#include +#include +#include + +class TColStd_SequenceOfExtendedString; + + +class GEOMImpl_PipePathDriver : public TFunction_Driver { + +public: + + inline void* operator new(size_t,void* anAddress) + { + return anAddress; + } + inline void* operator new(size_t size) + { + return Standard::Allocate(size); + } + inline void operator delete(void *anAddress) + { + if (anAddress) Standard::Free((Standard_Address&)anAddress); + } + + // Methods PUBLIC + // + Standard_EXPORT GEOMImpl_PipePathDriver(); + Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; + Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const + { return Standard_True; } + Standard_EXPORT static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_PipePathDriver() {}; + + // Type management + // + Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_PipePathDriver_Type_(); + Standard_EXPORT const Handle(Standard_Type)& DynamicType() const + { return STANDARD_TYPE(GEOMImpl_PipePathDriver) ; } + Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const + { return (STANDARD_TYPE(GEOMImpl_PipePathDriver) == AType || + TFunction_Driver::IsKind(AType)); } + +}; + +#endif diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index c83f91417..12962ffc7 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -133,66 +133,12 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const if (aType == WIRE_EDGES) { Handle(TColStd_HSequenceOfTransient) aShapes = aCI.GetShapes(); - TopoDS_Wire aWire; - B.MakeWire(aWire); - // add edges - for (unsigned int ind = 1; ind <= aShapes->Length(); ind++) { - Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(ind)); - TopoDS_Shape aShape_i = aRefShape->GetValue(); - if (aShape_i.IsNull()) { - Standard_NullObject::Raise("Shape for wire construction is null"); - } - if (aShape_i.ShapeType() == TopAbs_EDGE || aShape_i.ShapeType() == TopAbs_WIRE) { - TopExp_Explorer exp (aShape_i, TopAbs_EDGE); - for (; exp.More(); exp.Next()) - B.Add(aWire, TopoDS::Edge(exp.Current())); - } else { - Standard_TypeMismatch::Raise - ("Shape for wire construction is neither an edge nor a wire"); - } - } - - // fix edges order - Handle(ShapeFix_Wire) aFW = new ShapeFix_Wire; - aFW->Load(aWire); - aFW->FixReorder(); - - if (aFW->StatusReorder(ShapeExtend_FAIL1)) { - Standard_ConstructionError::Raise("Wire construction failed: several loops detected"); - } else if (aFW->StatusReorder(ShapeExtend_FAIL)) { - Standard_ConstructionError::Raise("Wire construction failed"); - } else { - } - - // IMP 0019766: Building a Wire from unconnected edges by introducing a tolerance Standard_Real aTolerance = aCI.GetTolerance(); if (aTolerance < Precision::Confusion()) aTolerance = Precision::Confusion(); - aFW->ClosedWireMode() = Standard_False; - aFW->FixConnected(aTolerance); - if (aFW->StatusConnected(ShapeExtend_FAIL)) { - Standard_ConstructionError::Raise("Wire construction failed: cannot build connected wire"); - } - // IMP 0019766 - if (aFW->StatusConnected(ShapeExtend_DONE3)) { - // Confused with but not Analyzer.Precision(), set the same - aFW->FixGapsByRangesMode() = Standard_True; - if (aFW->FixGaps3d()) { - Handle(ShapeExtend_WireData) sbwd = aFW->WireData(); - Handle(ShapeFix_Edge) aFe = new ShapeFix_Edge; - for (Standard_Integer iedge = 1; iedge <= sbwd->NbEdges(); iedge++) { - TopoDS_Edge aEdge = TopoDS::Edge(sbwd->Edge(iedge)); - aFe->FixVertexTolerance(aEdge); - aFe->FixSameParameter(aEdge); - } - } - else if (aFW->StatusGaps3d(ShapeExtend_FAIL)) { - Standard_ConstructionError::Raise("Wire construction failed: cannot fix 3d gaps"); - } - } - aShape = aFW->WireAPIMake(); + aShape = MakeWireFromEdges(aShapes, aTolerance); } else if (aType == FACE_WIRE) { Handle(GEOM_Function) aRefBase = aCI.GetBase(); @@ -610,6 +556,73 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_Logbook& log) const return 1; } +TopoDS_Wire GEOMImpl_ShapeDriver::MakeWireFromEdges(const Handle(TColStd_HSequenceOfTransient)& theEdgesFuncs, + const Standard_Real theTolerance) +{ + BRep_Builder B; + + TopoDS_Wire aWire; + B.MakeWire(aWire); + + // add edges + for (unsigned int ind = 1; ind <= theEdgesFuncs->Length(); ind++) { + Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(theEdgesFuncs->Value(ind)); + TopoDS_Shape aShape_i = aRefShape->GetValue(); + if (aShape_i.IsNull()) { + Standard_NullObject::Raise("Shape for wire construction is null"); + } + if (aShape_i.ShapeType() == TopAbs_EDGE || aShape_i.ShapeType() == TopAbs_WIRE) { + TopExp_Explorer exp (aShape_i, TopAbs_EDGE); + for (; exp.More(); exp.Next()) + B.Add(aWire, TopoDS::Edge(exp.Current())); + } else { + Standard_TypeMismatch::Raise + ("Shape for wire construction is neither an edge nor a wire"); + } + } + + // fix edges order + Handle(ShapeFix_Wire) aFW = new ShapeFix_Wire; + aFW->Load(aWire); + aFW->FixReorder(); + + if (aFW->StatusReorder(ShapeExtend_FAIL1)) { + Standard_ConstructionError::Raise("Wire construction failed: several loops detected"); + } + else if (aFW->StatusReorder(ShapeExtend_FAIL)) { + Standard_ConstructionError::Raise("Wire construction failed"); + } + else { + } + + // IMP 0019766: Building a Wire from unconnected edges by introducing a tolerance + aFW->ClosedWireMode() = Standard_False; + aFW->FixConnected(theTolerance); + if (aFW->StatusConnected(ShapeExtend_FAIL)) { + Standard_ConstructionError::Raise("Wire construction failed: cannot build connected wire"); + } + // IMP 0019766 + if (aFW->StatusConnected(ShapeExtend_DONE3)) { + // Confused with but not Analyzer.Precision(), set the same + aFW->FixGapsByRangesMode() = Standard_True; + if (aFW->FixGaps3d()) { + Handle(ShapeExtend_WireData) sbwd = aFW->WireData(); + Handle(ShapeFix_Edge) aFe = new ShapeFix_Edge; + for (Standard_Integer iedge = 1; iedge <= sbwd->NbEdges(); iedge++) { + TopoDS_Edge aEdge = TopoDS::Edge(sbwd->Edge(iedge)); + aFe->FixVertexTolerance(aEdge); + aFe->FixSameParameter(aEdge); + } + } + else if (aFW->StatusGaps3d(ShapeExtend_FAIL)) { + Standard_ConstructionError::Raise("Wire construction failed: cannot fix 3d gaps"); + } + } + aWire = aFW->WireAPIMake(); + + return aWire; +} + TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire, const Standard_Real LinTol, const Standard_Real AngTol) diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index 653ad7e13..87c55c501 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -120,6 +120,8 @@ class Handle(GEOMImpl_ShapeDriver) : public Handle(TFunction_Driver) { #include #include +#include +#include class TColStd_SequenceOfExtendedString; @@ -151,9 +153,13 @@ public: Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT static TopoDS_Edge MakeEdgeFromWire(const TopoDS_Shape& aWire, - const Standard_Real LinTol, - const Standard_Real AngTol); + Standard_EXPORT static TopoDS_Edge MakeEdgeFromWire (const TopoDS_Shape& aWire, + const Standard_Real LinTol, + const Standard_Real AngTol); + + Standard_EXPORT static TopoDS_Wire MakeWireFromEdges + (const Handle(TColStd_HSequenceOfTransient)& theEdgesFuncs, + const Standard_Real theTolerance); // Type management // diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx index 5182f8cdc..4aeed6398 100755 --- a/src/GEOMImpl/GEOMImpl_Types.hxx +++ b/src/GEOMImpl/GEOMImpl_Types.hxx @@ -100,6 +100,8 @@ #define GEOM_EXTRUDED_BOSS 47 +#define GEOM_PIPE_PATH 48 + //GEOM_Function types #define COPY_WITH_REF 1 @@ -214,6 +216,10 @@ #define PIPE_SHELLS_WITHOUT_PATH 4 #define PIPE_BI_NORMAL_ALONG_VECTOR 5 +// RestorePath +#define PIPE_PATH_TWO_BASES 1 +#define PIPE_PATH_TWO_SEQS 2 + #define THRUSECTIONS_RULED 1 #define THRUSECTIONS_SMOOTHED 2 diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am index 69cda82da..8ce12ca2e 100644 --- a/src/GEOMImpl/Makefile.am +++ b/src/GEOMImpl/Makefile.am @@ -83,6 +83,7 @@ salomeinclude_HEADERS = \ GEOMImpl_ITorus.hxx \ GEOMImpl_IPrism.hxx \ GEOMImpl_IPipe.hxx \ + GEOMImpl_IPipePath.hxx \ GEOMImpl_IRevolution.hxx \ GEOMImpl_IMeasure.hxx \ GEOMImpl_IShapes.hxx \ @@ -111,6 +112,7 @@ salomeinclude_HEADERS = \ GEOMImpl_TorusDriver.hxx \ GEOMImpl_PrismDriver.hxx \ GEOMImpl_PipeDriver.hxx \ + GEOMImpl_PipePathDriver.hxx \ GEOMImpl_ThruSectionsDriver.hxx \ GEOMImpl_RevolutionDriver.hxx \ GEOMImpl_ShapeDriver.hxx \ @@ -185,6 +187,7 @@ dist_libGEOMimpl_la_SOURCES = \ GEOMImpl_TorusDriver.cxx \ GEOMImpl_PrismDriver.cxx \ GEOMImpl_PipeDriver.cxx \ + GEOMImpl_PipePathDriver.cxx \ GEOMImpl_ThruSectionsDriver.cxx \ GEOMImpl_RevolutionDriver.cxx \ GEOMImpl_ShapeDriver.cxx \ diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc index 76febf836..95948ed24 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #include @@ -1096,7 +1095,6 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePipeShellsWithoutPath return GetObject(anObject); } - //============================================================================= /*! * MakePipeBiNormalAlongVector @@ -1127,3 +1125,81 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePipeBiNormalAlongVector return GetObject(anObject); } + +//============================================================================= +/*! + * RestorePath + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePath + (GEOM::GEOM_Object_ptr theShape, + GEOM::GEOM_Object_ptr theBase1, + GEOM::GEOM_Object_ptr theBase2) +{ + GEOM::GEOM_Object_var aGEOMObject; + + // Set a not done flag + GetOperations()->SetNotDone(); + + // Get the reference objects + Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(GEOM_Object) aBase1 = GetObjectImpl(theBase1); + Handle(GEOM_Object) aBase2 = GetObjectImpl(theBase2); + + if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) return aGEOMObject._retn(); + + // Create the Path + Handle(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} + +//============================================================================= +/*! + * RestorePathEdges + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges + (GEOM::GEOM_Object_ptr theShape, + const GEOM::ListOfGO& theBase1, + const GEOM::ListOfGO& theBase2) +{ + GEOM::GEOM_Object_var aGEOMObject; + + // Set a not done flag + GetOperations()->SetNotDone(); + + // Get the reference objects + Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + if (aShape.IsNull()) return aGEOMObject._retn(); + + Handle(TColStd_HSequenceOfTransient) aSeqBases1 = new TColStd_HSequenceOfTransient; + Handle(TColStd_HSequenceOfTransient) aSeqBases2 = new TColStd_HSequenceOfTransient; + + int ind; + int aNbBases1 = theBase1.length(); + int aNbBases2 = theBase2.length(); + + for (ind = 0; ind < aNbBases1; ind++) { + Handle(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); + if (!aBase.IsNull()) + aSeqBases1->Append(aBase); + } + for (ind = 0; ind < aNbBases2; ind++) { + Handle(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]); + if (!aBase.IsNull()) + aSeqBases2->Append(aBase); + } + + if (!aSeqBases1->Length() || !aSeqBases2->Length()) + return aGEOMObject._retn(); + + // Create the Path + Handle(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh index 05a748932..5b274671b 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifndef _GEOM_I3DPrimOperations_i_HeaderFile #define _GEOM_I3DPrimOperations_i_HeaderFile @@ -188,6 +187,13 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i : GEOM::GEOM_Object_ptr thePath, GEOM::GEOM_Object_ptr theVec); + GEOM::GEOM_Object_ptr RestorePath (GEOM::GEOM_Object_ptr theShape, + GEOM::GEOM_Object_ptr theBase1, + GEOM::GEOM_Object_ptr theBase2); + GEOM::GEOM_Object_ptr RestorePathEdges (GEOM::GEOM_Object_ptr theShape, + const GEOM::ListOfGO& theBase1, + const GEOM::ListOfGO& theBase2); + ::GEOMImpl_I3DPrimOperations* GetOperations() { return (::GEOMImpl_I3DPrimOperations*)GetImpl(); } }; diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index 0dd628e5a..8833a4de9 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -2867,6 +2867,76 @@ class geompyDC(GEOM._objref_GEOM_Gen): RaiseIfFailed("MakePipeBiNormalAlongVector", self.PrimOp) return anObj + ## Build a middle path of a pipe-like shape. + # The path shape can be a wire or an edge. + # @param theShape It can be closed or unclosed pipe-like shell + # or a pipe-like solid. + # @param theBase1, theBase2 Two bases of the supposed pipe. This + # should be wires or faces of theShape. + # @note It is not assumed that exact or approximate copy of theShape + # can be obtained by applying existing Pipe operation on the + # resulting "Path" wire taking theBase1 as the base - it is not + # always possible; though in some particular cases it might work + # it is not guaranteed. Thus, RestorePath function should not be + # considered as an exact reverse operation of the Pipe. + # @return New GEOM.GEOM_Object, containing an edge or wire that represent + # source pipe's "path". + # + # @ref tui_creation_pipe_path "Example" + def RestorePath (self, theShape, theBase1, theBase2): + """ + Build a middle path of a pipe-like shape. + The path shape can be a wire or an edge. + + Parameters: + theShape It can be closed or unclosed pipe-like shell + or a pipe-like solid. + theBase1, theBase2 Two bases of the supposed pipe. This + should be wires or faces of theShape. + + Returns: + New GEOM_Object, containing an edge or wire that represent + source pipe's path. + """ + anObj = self.PrimOp.RestorePath(theShape, theBase1, theBase2) + RaiseIfFailed("RestorePath", self.PrimOp) + return anObj + + ## Build a middle path of a pipe-like shape. + # The path shape can be a wire or an edge. + # @param theShape It can be closed or unclosed pipe-like shell + # or a pipe-like solid. + # @param listEdges1, listEdges2 Two bases of the supposed pipe. This + # should be lists of edges of theShape. + # @note It is not assumed that exact or approximate copy of theShape + # can be obtained by applying existing Pipe operation on the + # resulting "Path" wire taking theBase1 as the base - it is not + # always possible; though in some particular cases it might work + # it is not guaranteed. Thus, RestorePath function should not be + # considered as an exact reverse operation of the Pipe. + # @return New GEOM.GEOM_Object, containing an edge or wire that represent + # source pipe's "path". + # + # @ref tui_creation_pipe_path "Example" + def RestorePathEdges (self, theShape, listEdges1, listEdges2): + """ + Build a middle path of a pipe-like shape. + The path shape can be a wire or an edge. + + Parameters: + theShape It can be closed or unclosed pipe-like shell + or a pipe-like solid. + listEdges1, listEdges2 Two bases of the supposed pipe. This + should be lists of edges of theShape. + + Returns: + New GEOM_Object, containing an edge or wire that represent + source pipe's path. + """ + anObj = self.PrimOp.RestorePathEdges(theShape, listEdges1, listEdges2) + RaiseIfFailed("RestorePath", self.PrimOp) + return anObj + # end of l3_complex ## @} diff --git a/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx index b341a92b0..3f94071ec 100644 --- a/src/GenerationGUI/GenerationGUI.cxx +++ b/src/GenerationGUI/GenerationGUI.cxx @@ -18,12 +18,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// // GEOM GEOMGUI : GUI for Geometry component // File : GenerationGUI.cxx // Author : Damien COQUERET, Open CASCADE S.A.S. -// + #include "GenerationGUI.h" #include @@ -36,6 +35,7 @@ #include "GenerationGUI_RevolDlg.h" // Method REVOL #include "GenerationGUI_FillingDlg.h" // Method FILLING #include "GenerationGUI_PipeDlg.h" // Method PIPE +#include "GenerationGUI_PipePathDlg.h" // Method RESTORE PATH //======================================================================= // function : GenerationGUI() @@ -73,6 +73,7 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) case GEOMOp::OpRevolution: aDlg = new GenerationGUI_RevolDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpFilling: aDlg = new GenerationGUI_FillingDlg ( getGeometryGUI(), parent ); break; case GEOMOp::OpPipe: aDlg = new GenerationGUI_PipeDlg ( getGeometryGUI(), parent ); break; + case GEOMOp::OpPipePath: aDlg = new GenerationGUI_PipePathDlg( getGeometryGUI(), parent ); break; default: app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break; } diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx new file mode 100644 index 000000000..b2d2d8d6b --- /dev/null +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.cxx @@ -0,0 +1,392 @@ +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// GEOM GEOMGUI : GUI for Geometry component +// File : GenerationGUI_PipePathDlg.cxx + +#include "GenerationGUI_PipePathDlg.h" + +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +//================================================================================= +// class : GenerationGUI_PipePathDlg() +// purpose : Constructs a GenerationGUI_PipePathDlg which is a child of 'parent', with the +// name 'name' and widget flags set to 'f'. +// The dialog will by default be modeless, unless you set 'modal' to +// TRUE to construct a modal dialog. +//================================================================================= +GenerationGUI_PipePathDlg::GenerationGUI_PipePathDlg (GeometryGUI* theGeometryGUI, QWidget* parent, + bool modal, Qt::WindowFlags fl) + : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl) +{ + QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_PIPE_PATH"))); + QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); + + setWindowTitle(tr("GEOM_PIPE_PATH_TITLE")); + + /***************************************************************/ + mainFrame()->GroupConstructors->setTitle(tr("GEOM_PIPE_PATH")); + mainFrame()->RadioButton1->setIcon(image0); + mainFrame()->RadioButton2->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose); + mainFrame()->RadioButton2->close(); + mainFrame()->RadioButton3->close(); + + GroupPoints = new DlgRef_3Sel1Check(centralWidget()); + + GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS")); + GroupPoints->TextLabel1->setText(tr("GEOM_PIPE_LIKE_SHAPE")); + GroupPoints->TextLabel2->setText(tr("GEOM_PIPE_BASE1_OBJECT")); + GroupPoints->TextLabel3->setText(tr("GEOM_PIPE_BASE2_OBJECT")); + GroupPoints->PushButton1->setIcon(image1); + GroupPoints->PushButton2->setIcon(image1); + GroupPoints->PushButton3->setIcon(image1); + GroupPoints->CheckButton1->setText(tr("GEOM_SELECT_UNPUBLISHED_EDGES")); + + QVBoxLayout* layout = new QVBoxLayout (centralWidget()); + layout->setMargin(0); + layout->setSpacing(6); + layout->addWidget(GroupPoints); + /***************************************************************/ + + setHelpFileName("create_pipe_path_page.html"); + + // Initialisation + Init(); +} + +//================================================================================= +// function : ~GenerationGUI_PipePathDlg() +// purpose : Destroys the object and frees any allocated resources +//================================================================================= +GenerationGUI_PipePathDlg::~GenerationGUI_PipePathDlg() +{ + // no need to delete child widgets, Qt does it all for us +} + +//================================================================================= +// function : Init() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::Init() +{ + // init variables + GroupPoints->LineEdit1->setReadOnly(true); + GroupPoints->LineEdit2->setReadOnly(true); + GroupPoints->LineEdit3->setReadOnly(true); + + GroupPoints->LineEdit1->setText(""); + GroupPoints->LineEdit2->setText(""); + GroupPoints->LineEdit3->setText(""); + + myShape.nullify(); + + GroupPoints->CheckButton1->setEnabled(false); + + showOnlyPreviewControl(); + + // signals and slots connections + connect(buttonOk(), SIGNAL(clicked()), this, SLOT(ClickOnOk())); + connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply())); + + connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); + connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); + connect(GroupPoints->PushButton3, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); + + connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(SelectionTypeButtonClicked())); + + initName(tr("GEOM_PIPE_PATH")); + + updateGeometry(); + resize(100,100); + + GroupPoints->PushButton1->click(); + SelectionIntoArgument(); +} + +//================================================================================= +// function : SelectionBittonClicked() +// purpose : Selection type Radio button management +//================================================================================= +void GenerationGUI_PipePathDlg::SelectionTypeButtonClicked() +{ + globalSelection(); + if (GroupPoints->CheckButton1->isChecked()) { + localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); + } + else { + TColStd_MapOfInteger aMap; + aMap.Add(GEOM_FACE); + aMap.Add(GEOM_WIRE); + aMap.Add(GEOM_EDGE); + globalSelection(aMap); + } + processPreview(); +} + +//================================================================================= +// function : ClickOnOk() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::ClickOnOk() +{ + setIsApplyAndClose(true); + if (ClickOnApply()) + ClickOnCancel(); +} + +//================================================================================= +// function : ClickOnApply() +// purpose : +//================================================================================= +bool GenerationGUI_PipePathDlg::ClickOnApply() +{ + if (!onAccept()) + return false; + + initName(); + // activate selection and connect selection manager + GroupPoints->PushButton1->click(); + return true; +} + +//================================================================================= +// function : SelectionIntoArgument() +// purpose : Called when selection is changed or on dialog initialization or activation +//================================================================================= +void GenerationGUI_PipePathDlg::SelectionIntoArgument() +{ + erasePreview(); + myEditCurrentArgument->setText(""); + + if (myEditCurrentArgument == GroupPoints->LineEdit1) { + QList types; + types << TopAbs_SOLID << TopAbs_SHELL << TopAbs_FACE; + myShape = getSelected(types); + if (myShape) { + QString aName = GEOMBase::GetName(myShape.get()); + myEditCurrentArgument->setText(aName); + if (myBase1Objects.isEmpty()) + GroupPoints->PushButton2->click(); + else if (myBase2Objects.isEmpty()) + GroupPoints->PushButton3->click(); + } + } + else if (myEditCurrentArgument == GroupPoints->LineEdit2) { + myBase1Objects.clear(); + QList objects = getSelected(TopAbs_SHAPE, -1); + for (int i = 0; i < objects.count(); i++) { + GEOM::shape_type stype = objects[i]->GetMaxShapeType(); + if (GEOM::FACE <= stype && stype <= GEOM::EDGE) + myBase1Objects << objects[i]; + } + int nbObj = myBase1Objects.count(); + if (nbObj) { + QString aName = + nbObj > 1 ? QString("%1_objects").arg(nbObj) : GEOMBase::GetName(myBase1Objects[0].get()); + myEditCurrentArgument->setText(aName); + } + } + else if (myEditCurrentArgument == GroupPoints->LineEdit3) { + myBase2Objects.clear(); + QList objects = getSelected(TopAbs_SHAPE, -1); + for (int i = 0; i < objects.count(); i++) { + GEOM::shape_type stype = objects[i]->GetMaxShapeType(); + if (GEOM::FACE <= stype && stype <= GEOM::EDGE) + myBase2Objects << objects[i]; + } + int nbObj = myBase2Objects.count(); + if (nbObj) { + QString aName = + nbObj > 1 ? QString("%1_objects").arg(nbObj) : GEOMBase::GetName(myBase2Objects[0].get()); + myEditCurrentArgument->setText(aName); + } + } + + processPreview(); +} + +//================================================================================= +// function : SetEditCurrentArgument() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::SetEditCurrentArgument() +{ + QPushButton* send = (QPushButton*)sender(); + + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); + + globalSelection(GEOM_ALLSHAPES); + + GroupPoints->PushButton1->setDown(false); + GroupPoints->PushButton2->setDown(false); + GroupPoints->PushButton3->setDown(false); + GroupPoints->LineEdit1->setEnabled(false); + GroupPoints->LineEdit2->setEnabled(false); + GroupPoints->LineEdit3->setEnabled(false); + + if (send == GroupPoints->PushButton1) { + myEditCurrentArgument = GroupPoints->LineEdit1; + GroupPoints->CheckButton1->setEnabled(false); + } + else if (send == GroupPoints->PushButton2) { + myEditCurrentArgument = GroupPoints->LineEdit2; + + if (GroupPoints->CheckButton1->isChecked()) { + localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); + } + else { + TColStd_MapOfInteger aMap; + aMap.Add(GEOM_FACE); + aMap.Add(GEOM_WIRE); + aMap.Add(GEOM_EDGE); + globalSelection(aMap); + } + GroupPoints->CheckButton1->setEnabled(true); + } + else if (send == GroupPoints->PushButton3) { + myEditCurrentArgument = GroupPoints->LineEdit3; + + if (GroupPoints->CheckButton1->isChecked()) { + localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE); + } + else { + TColStd_MapOfInteger aMap; + aMap.Add(GEOM_FACE); + aMap.Add(GEOM_WIRE); + aMap.Add(GEOM_EDGE); + globalSelection(aMap); + } + GroupPoints->CheckButton1->setEnabled(true); + } + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); + + // enable line edit + myEditCurrentArgument->setEnabled(true); + myEditCurrentArgument->setFocus(); + // after setFocus(), because it will be setDown(false) when loses focus + send->setDown(true); + + // seems we need it only to avoid preview disappearing, caused by selection mode change + processPreview(); +} + +//================================================================================= +// function : ActivateThisDialog() +// purpose : +//================================================================================= +void GenerationGUI_PipePathDlg::ActivateThisDialog() +{ + GEOMBase_Skeleton::ActivateThisDialog(); + + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); + + GroupPoints->PushButton1->click(); + SelectionIntoArgument(); +} + +//================================================================================= +// function : enterEvent() +// purpose : when mouse enter onto the QWidget +//================================================================================= +void GenerationGUI_PipePathDlg::enterEvent (QEvent*) +{ + if (!mainFrame()->GroupConstructors->isEnabled()) + ActivateThisDialog(); +} + +//================================================================================= +// function : createOperation +// purpose : +//================================================================================= +GEOM::GEOM_IOperations_ptr GenerationGUI_PipePathDlg::createOperation() +{ + return getGeomEngine()->GetI3DPrimOperations(getStudyId()); +} + +//================================================================================= +// function : isValid +// purpose : +//================================================================================= +bool GenerationGUI_PipePathDlg::isValid (QString&) +{ + bool ok = myShape && !myBase1Objects.isEmpty() && !myBase2Objects.isEmpty(); + return ok; +} + +//================================================================================= +// function : execute +// purpose : +//================================================================================= +bool GenerationGUI_PipePathDlg::execute (ObjectList& objects) +{ + GEOM::ListOfGO_var aBase1 = new GEOM::ListOfGO(); + GEOM::ListOfGO_var aBase2 = new GEOM::ListOfGO(); + + aBase1->length(myBase1Objects.count()); + aBase2->length(myBase2Objects.count()); + + int i; + for (i = 0; i < myBase1Objects.count(); i++) + aBase1[i] = myBase1Objects[i].copy(); + for (i = 0; i < myBase2Objects.count(); i++) + aBase2[i] = myBase2Objects[i].copy(); + + GEOM::GEOM_I3DPrimOperations_var anOper = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation()); + GEOM::GEOM_Object_var anObj = anOper->RestorePathEdges(myShape.get(), aBase1.in(), aBase2.in()); + + if (!anObj->_is_nil()) + objects.push_back(anObj._retn()); + + return true; +} + +//================================================================================= +// function : addSubshapeToStudy +// purpose : virtual method to add new SubObjects if local selection +//================================================================================= +void GenerationGUI_PipePathDlg::addSubshapesToStudy() +{ + int i; + for (i = 0; i < myBase1Objects.count(); i++) + GEOMBase::PublishSubObject(myBase1Objects[i].get()); + for (i = 0; i < myBase2Objects.count(); i++) + GEOMBase::PublishSubObject(myBase2Objects[i].get()); +} diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.h b/src/GenerationGUI/GenerationGUI_PipePathDlg.h new file mode 100644 index 000000000..2c900bbc3 --- /dev/null +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.h @@ -0,0 +1,72 @@ +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// GEOM GEOMGUI : GUI for Geometry component +// File : GenerationGUI_PipePathDlg.h + +#ifndef GENERATIONGUI_PIPEPATHDLG_H +#define GENERATIONGUI_PIPEPATHDLG_H + +#include "GEOMBase_Skeleton.h" +#include "GEOM_GenericObjPtr.h" + +class DlgRef_3Sel1Check; + +//================================================================================= +// class : GenerationGUI_PipePathDlg +// purpose : +//================================================================================= +class GenerationGUI_PipePathDlg : public GEOMBase_Skeleton +{ + Q_OBJECT + +public: + GenerationGUI_PipePathDlg (GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0); + ~GenerationGUI_PipePathDlg(); + +protected: + // redefined from GEOMBase_Helper + virtual GEOM::GEOM_IOperations_ptr createOperation(); + virtual bool isValid (QString&); + virtual bool execute (ObjectList&); + virtual void addSubshapesToStudy(); + +private: + void Init(); + void enterEvent (QEvent*); + +private: + GEOM::GeomObjPtr myShape; /* Pipe-like shape */ + QList myBase1Objects; /* Base 1 edges / wire / face */ + QList myBase2Objects; /* Base 2 edges / wire / face */ + + DlgRef_3Sel1Check* GroupPoints; + +private slots: + void ClickOnOk(); + bool ClickOnApply(); + void ActivateThisDialog(); + void SelectionIntoArgument(); + void SetEditCurrentArgument(); + void SelectionTypeButtonClicked(); +}; + +#endif // GENERATIONGUI_PIPEPATHDLG_H diff --git a/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am index 35afde04d..cda0fad02 100644 --- a/src/GenerationGUI/Makefile.am +++ b/src/GenerationGUI/Makefile.am @@ -15,13 +15,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# # GEOM GENERATIONGUI : # File : Makefile.am # Author : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com) # Package : GenerationGUI -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets @@ -33,7 +32,8 @@ salomeinclude_HEADERS = \ GenerationGUI_PrismDlg.h \ GenerationGUI_RevolDlg.h \ GenerationGUI_FillingDlg.h \ - GenerationGUI_PipeDlg.h + GenerationGUI_PipeDlg.h \ + GenerationGUI_PipePathDlg.h dist_libGenerationGUI_la_SOURCES = \ GenerationGUI.h \ @@ -41,18 +41,21 @@ dist_libGenerationGUI_la_SOURCES = \ GenerationGUI_RevolDlg.h \ GenerationGUI_FillingDlg.h \ GenerationGUI_PipeDlg.h \ + GenerationGUI_PipePathDlg.h \ \ GenerationGUI.cxx \ GenerationGUI_PrismDlg.cxx \ GenerationGUI_RevolDlg.cxx \ GenerationGUI_FillingDlg.cxx \ - GenerationGUI_PipeDlg.cxx + GenerationGUI_PipeDlg.cxx \ + GenerationGUI_PipePathDlg.cxx MOC_FILES = \ GenerationGUI_PrismDlg_moc.cxx \ GenerationGUI_RevolDlg_moc.cxx \ GenerationGUI_FillingDlg_moc.cxx \ - GenerationGUI_PipeDlg_moc.cxx + GenerationGUI_PipeDlg_moc.cxx \ + GenerationGUI_PipePathDlg_moc.cxx nodist_libGenerationGUI_la_SOURCES = \ $(MOC_FILES) -- 2.39.2