From 1d954dcdc96d30d30d446395408ac7d22192c2cc Mon Sep 17 00:00:00 2001 From: ouv Date: Fri, 12 Feb 2010 11:50:56 +0000 Subject: [PATCH] Issue 0020629: EDF 1178 GUI : Keyboard free style in the OCC viewer --- doc/salome/gui/images/image110.png | Bin 0 -> 782 bytes doc/salome/gui/images/occviewer_toolbar.png | Bin 8726 -> 8517 bytes doc/salome/gui/input/occ_3d_viewer.doc | 9 ++ doc/salome/gui/input/vtk_3d_viewer.doc | 9 ++ src/LightApp/LightApp_Application.cxx | 40 ++++++-- src/LightApp/resources/LightApp.xml | 1 + src/OCCViewer/OCCViewer_ViewModel.cxx | 58 ++++++++++- src/OCCViewer/OCCViewer_ViewModel.h | 7 ++ src/OCCViewer/OCCViewer_ViewWindow.cxx | 96 +++++++++++++++--- src/OCCViewer/OCCViewer_ViewWindow.h | 10 +- src/OCCViewer/resources/OCCViewer_images.ts | 4 + src/OCCViewer/resources/OCCViewer_msg_en.ts | 8 ++ .../resources/occ_view_style_switch.png | Bin 0 -> 782 bytes src/SUIT/SUIT_ViewModel.cxx | 48 ++++++--- src/SUIT/SUIT_ViewModel.h | 20 ++-- src/SVTK/resources/SVTK_msg_en.ts | 2 +- src/SalomeApp/resources/SalomeApp.xml | 1 + 17 files changed, 263 insertions(+), 50 deletions(-) create mode 100755 doc/salome/gui/images/image110.png create mode 100755 src/OCCViewer/resources/occ_view_style_switch.png diff --git a/doc/salome/gui/images/image110.png b/doc/salome/gui/images/image110.png new file mode 100755 index 0000000000000000000000000000000000000000..b0a9c807e016446374173db06507c4d237312483 GIT binary patch literal 782 zcmV+p1M&QcP)_#cKcn03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00MGJL_t&-)76tdOB_KM z#(#6Spd0VpfEGCmvA8QN6zl}WN))tA<0mj5z%P}`P7WeSG(`kO1uZN@(GX77^KLJ< zx3jZ5JCnlPq48hRC2uwJ!26p&&-226S+}>hc5Q9Vo}8T6zwH&>g|&CRQc8PpaKPc= zAtNIr3=a>Zl%iIvQ7)I6nVAuP3_LwOwU?Kd%+Ai@x-P9&3&+WkWrj4>?CtFVu(Y)F z2r9&#l)En;9UZZ_xQOezB#Gkco6qO3mwd0?5Hy=qDiw?|?Ck73`xOs>j^h9jh9N4J z1nrcMpDfic4UCDoxw&C_dYU+nIX^$QuL8T*w${?=L=3*kh?5o$DI8 z&-3s+k9VaJ0E~e+mObFu*cjW}+bE@MUtgbi^2uqMJ{bh9Goq-2Qi@zIhcO1NHRI#s z?C$QqZp!b6NGXw0qP0eAO&EsM>vde$LoB+2u@iHQl0kB2qAD?m;U~Klu|@dL=Xf7K|mOWWLbvRnnI!Q@+`O8ZM(j{&fMG_tyT+T3|W?; zltM~Lnx;68gAjuK{e4zfR~Z@_65R|x0s>rIT-a*0N~KaEpUkBK-5GMUiR4ozHO^O%qk^i}(zp3sO8Mp@Aqkm8ESxG5Q zBLB%C^U*784}<>UX3X}#)?^{?zdg3|+@7Oi!Ox1e6aV)NS(KlUK&Ahl)0fg!j*gBl zD=T{iOxM?&FB2!2XwIRv+*4Zg7E*}1u~EdKNJ?E$iR=HkjLUKCW+<#tcj3{_1{ z5wEkn+S=N}LaO2vgG|I_0?V?}&r3^R2APHvid#jMy#iPR#n3_)wQCGJ{hr$%uMg*W z9f`QOxXy~BqoZXKKK^O2notpa4*hJN4;MX!idDaVDcBQe%OCJ`7r`;7vYCGv!8kN3 z8`uQ~5zLva1(!L~w8lU3f;h9tp zW-2Kt=yg8iO0?tacX&B}6HtsRZt3suN5&+1kB>jFE97yM*52O!3c6cC=pIBxOXirgET3R!8Z(j*MCYgeRYh-1`x8`o`H1N*w zvwH8+5+TE9!U9xe`|Io5p}|2_99+Gs$~9Se(<;yhyym7Bif73AFbBkOZ`!xD=p*AVa$ z(C%@ZA^b?D#6q__{yaK37%5xg_$8Jfxs&^srPITeH5;fm^qEDk*_ad+71d!KO3FZ| zl7ncnS)i$*l}Khz|D7jXhvW`YXzf5vBRjm5QIg=Nqh;(|QWF&wm6NlU#qXN)Q}lHI zh`e4xQu0#I&NY)oKXa6n*dc2U)yrHBDV8!O>-pt73<}c{4yjo->~!FB-9>MEa52vF zG|p?@vvBuxTp00W3xh$SL?B5M^?VJI)`>S<|H$^ON`rO@`x+)AxL}2qm6bn#E=+X& zOe}Ahe|dpGs7a=vP$&utN@8Ln)<+>(W#!$~4PQnE1_nk(0mrqDSo9X~G|o}<7ea`M zv$pBQjQOulJr>X`+be43uo4Bcw(`V z4E;v?IM5O{WMpJq?x|p+u3bJ<{bmLAP4CIf zS7lyPpQF^Xjk8$XOWsIR>&f#FTtl6Wv%(_h05qcQ4O;<5Anh%?-HdJ{De#Q1?1=W6K5p!@b{Dku8 z|J=Q6yth%Yt5stQDJq(pTYGuQfkKB*a-yqq#@E*3b3XpQuc{h3`d9UTaXUScelNg; zlC#wxOM3lDWhJAapzuzKk8MzOd3ibD>3m>R z@%FEI`-X837!3ZBPE~v73op%@o@TMYV?M`YK08~YF(+JA+3B-zfor(7wq_Wvp)IeX zqN1TOx78QJaB?yM0;#<|JC0VAm07E+gQgP&%UkwO2l{vS9tR4-w%@-qLk;&X6x0xQ za(8td86KvzcKSD6q@f{HS10u0gV0QgN-n!uf2B^t?nLhTLc~IDG=tczXk$lhE!+JX z4uOTT8bVQ)R$s2Je`B6})$d71FX(=fh9-a?}xsWB#Z)VhP;QE~`HSggsu5PVm z6v0~bOiWZCUnQs4dkvpGk+f0EMQuGN?AvqaY+^8D$wUne4Fe!~0T+LVL}Rqm2m7{P z9;xQ78gtj3w(3@teNl8hmtEVSp_TK;F!@E^G+~sVYuUO9*h1^kib0|9+?Kh;g z&CLN_sD!Y2MrP(LHWP`kva-FG=Z_UyW@?*L8&W^wSEo7R#y}hSrW=t?v zlR4yQl9i`3c^&)v`Vx5seQ)eYNe>1z)YQ~CIPin&kL-qjhoJ>N<2~9SsG>3Er?Dvw zX3|_P(UTUsfs2ca>l@MO&Zl>p5G7Gs)V0mAe|O@u8j|B55*7onh=72wXt47B2gq>m zc%{YG*0!*)kktqpTZ&1CTOa@jntF?Byb#n3gTekTQ2$r?B;|(ZONz3%t$ZX0ua+Ge zn0!YYrA9USOifKUn#i-2)e6!=QfnKaKVtr2;w!-a^nEHSDq>#8p1WNBXx_4H)u;{O zTKm0SXEsp!v0y&CS67L|j<+JES~F+WbMP3&j+;xlp^2{JT8r?i?y@q@^LMJ< zj35gT6NOD)jGqwC&(j=dw-sA5OfX5zObh>}6r)&VW>NZg;sCj?WKF-m&pw9!L{Cvx zOHV2pFV9-wW&7oRnA#aq7$|0Ju4w0@Y$$HQk`2-RG{!PUmF{EY@8@?$^ykkXgY4sT zxe3g&os7kzWY8W(+rV#x3r0r9K|NwQ?9PDuou7FgvV$1jNZy{Fw+9&qQ<+7F(C5c$ z9o-U*h41+c8cjp2HaW>!QurxhyFwv)jO66qsZBX+IY2H^VM_2ti3Kd41IYO>xkoWA zB_;KxxS}0xXX%*j=H~9)48ae2WdHn7KYo?6t{kM&X*0*j1~Qyh1s~|oqM%`!joc+O zd=+_pa-}Ma;O7S!a|vgI(`0q(%~2!*^ijg=S4>o0f;fJ*Vp5fD>GUPff>KjGPuHIL z#NH9iwcc%ay>R2HrwCH=oXDl78oM5${eysnQ&v7M(0@jR^V0D=(@VbZJ=Qzap_FE1}9`iPCWny^M| z5GEDsxVRQVmVp?qsXmaLjBK@YFQRlAuhQl>U^-K*^jFFK){TjYDObQ9HSaT@ki#n9 zQMba+Po#nYiu(E_3#ZV>lkV?tBCyD$)$9H4FQW1B#>U18MODq7PJ`uG zqjiIgjqPIn5Q-cgUT(1v4W}nGpj}L@_ip5;3Yln5OMSV^H~6&rrUp_QR0isHQUcIB zRZ9A@^74z@+kxawazvyJW-|>cOerpM1{!buT|RlRQPO|(7K4UCFE`a?e%0T9^HD1_ z`%{#FH83B!3$Vt|1yg+o0Q{UAo|IX zOaf_N(?znO`HtMzuV0U&dk%IUTOzd`K^!s3Ts;fQ5+5VEy)2)I6&TWN7j)X>q1 z>W=7uB_g5;u(O{JCAH_NSz7My0}VHJ2MLjSFO2D*RM}>Q1;+WAF9MwIU`Zw7(qNB` zOfr6#Q1A~i3l%ZAzA+5kC@E_Phj>~yH#et0wI)4!q}eS82kAdqyRdO3zdt?sbthM0 zno;DW=kX&SuH+I(FC9b9paN=){j%1p~kcr*FSbj=IJ5)uo zRA(KW2i}xP7wdCRiSs85z@S z&kBl;_R>|rtKv5|<8!rS2)1`qxTBy$O)Tuq%|n?*MIZO~2j=D`zJzHy{}rJUGB4;6 z!9tQICMMow+j{W_BWR;WqXMDTFfuY4KK-k;&)W60ys#ki1GIH?6uUdPVqW_6^faVi zH`fWtOiX8&x9w@HhMqJGC6R^7AX%D=D$069MMCl4+Z_@c9~^Ob4<}n8O~@|a->f)_ zXZIg2Lx;7wx!ulv0K!QUQd^nuK#6(R!>~Z9z(g+osxM(f{>6kv41n4Gwb96fv&@BH~-nPf&w} zAHXoh#h>B6X%o!hNzHEVO4l_V8#LSLC}UzheG3R^<+K{FwMcpcHYKGMRkF0^=VEpn zNo5tEzQ3fy$HT)I2_q$7=jL>GckRQ-S7)7@=iy)kD^74Wa9}$U5fg``@%5cQz{A78 zO8`W{&B-4$SrcXU*)-EiN^qh0e{@(9%qSFzESKI53gfr^q;o7*U;g>RJIdT5s$`E^ zZJbo`ORAWd-P+|MEh=4-Q9I$q~ zWN2VuproXf6$~Vwp#KBcbYE|8XlQ7psd>Mu!r||_uerCXAKW`$>N=DO@YXxLlhzmQ zw)Uw5#b^3^&>~21-n=<}gYfb1ZZTKO?Cq6D-9D$OBrU4QJO;Km6ekeh1e6+SHWzlT4tOqJlz9LIRy*Qoh4VGX{y0oO3q`#0oMq17wY`{D>-+ zNG#iPoRe*9BE} zS-a`(azb=rW?^Q2Ub;|QZt=3!yERTJ&MrNh-?g~H_GbcC-%QfhfxNR50T*vgrwh#+ zY9+`2fy#7^jYcY2}nup9UT+&D{;}eho;B@xVELv1+iJ2 zB)QD%L+k%?T9jGsK~PH>bs&^wE{1(GBT35B!{x(1?SHPv1rLRh4#`mFAJJy-(GH0B z8~kJ*c$E(h4kZ1jahx?sWD_p>K+|C=1IN1U$I&+wtdLxgkBr_sg>9uVrCg;4Ncr~V z;;hcktDly54nr(p5yS=()vp11DF*1^wxY=K4fu<01s#Uc-GVyvGjYrID zpT&7vu~X5NdpW1Y7C)KB@)aozX$`A0LMl;rSrN5~DyK`bYKOMJTx&f5?c^f=0+!|5UZ zh<$Rn7sK?8!*%Pkz6mZvq)DP|zn7~5XFuV2B?R*K=6D6W(Ig>@&sjoF4&{Y`M1zH; z3V=7=gCFXC5<>q!)-mXE>z>MA(i(PAC*;Iql8d6%A<-H%3f$CnM0H;K)b=(uHcmJ; zPU}l&s{m@qO{839)z#x8g#ihU_V!9^yN?&ox9iAn-x_uW2=mO3jvRtZN=^!8v?L`Rd;8Kw zyRPU1YHuY2y79z{r8k(&fEPI z-3cg}?E%j|SNR!I>$-uHk@1HPF6ETY4kVs2YY$_ENH7Z(>rMa7NGh=_=u zSy++6B@NBM<%N%r4-XfYak3MQS!+WBE>)D0IY0;uc(+l&yjhznv?N$f*9S6D8Ko~ViJaPxt(Kd-C(O(_ zKYgJb5b)6HYYBtJyY7yPN3aNYjN2S8`lyj+l+xcmJwckA+g4h}5=JhfPxktT1}Z1A zL*3XX^Qq$^ql%K;_IZ`v!X-S8R-Jba@WP7;7=6Vh12*V@5z{JEv!GQmCd%PY|Ck^Lv&I{{IPEL**B6M|iO*R>U7NyX9 zpBg)yhX-Qql(y9?`E;_q{e~|`OSq;$;+T$%jI3{^UH8k><6bU%yYjelBv+ZR))#TY zx-rY%)B@g5`*MHWS8Y438c3U=Lk(`5I4y&_6FzX^0Y)YQRC$@^N8h53;S8>cO( zr=|7>a;C>}qfU$Cy5$0g9C$h~SEW+&q6eIlI6fk1*%Pkw>p!Ow$-OMFq_n1_ytvKv z<;hS-C%V8it@aG!y#4g_ym%~n9>SyE*wE0>To-PkipLq#6lc)s@GQWkuB|RRP4u7A zMwb(a%|!QC8_z(~#6#1>$C!GLF$cn&!43~3#m1gmoc*6jvai`HbWBV*i|A2y-b<{u zY+2|)smk|S+W$84TQ)5hw`jkw{49l~f~8+1^InHvCzeHFn{SS~$h%8NgqB6PsG_~7 zq-E2>$U@RgKnPDDqo;?opip>Z#P!QY;}L^djB^kxZH!JX3i5mL)kpasAh;r?Y>3+u z*XIpgDr2i}Hq`!iXB5BW{G9pO*x(ws8(A3{eIBkD$k7~`=;`0#_M|FFV9Nnm%q+OV z#PjLH3EgDKC8}0-jDRE_gA62rd}MSrw!>LZaOG69nwrgLVe1p}A77)oh{J=!`uc`$ zH!WT*W}^Kz_e1)dn~AV67U=z3Tsu>nt-pT(OC4RlK*%Q1F<6_v``b&yQ{xp^$F(vn zu$xW_lHioHJsy&O^|-e)VPRnbSRM^l3G>wkM47y~-QVM=?580N0LYOL(5a{~N_!rO zF#+iQHv&obro--`B=;hoFk}OiP#R+q0-Bqv$URv>j+IcrB)h=@f$k2NKEFMJN+{SW zxGQnTSA(a)s~!3PKgIr%7#xgn2U+A6hl!J8*5lyf>SRy?aEzu1VS4YqI2d=|a^nUD z)Kx>UReXFrkmMe1g2@`mEX*uF{*%%F`m%(03*h2yK+<@rr?Nk|T8^RB)hA(S__WGd zd}jTz-j};9+O@_MN=~Agv}ZI{<5~O`!=PkBPD{n#Nr=UD)X$ZYAhF-cL^3yHjmr!_RpneImkssZ>#gGdjCNr5rVzMK{y zWE;=@`!4#@jqU8R(o=?3H`v1T4gj|8#6d?#2Pj@)VbT~Bbg7MyOAOxd@Ng&frFyyj zP!!zK^-kIq7%||Z8{1ggn3;vpWP&p|)Dwf5=^X~sj!VvhK;8QE<_x$V-mBFL53v(GAG z1fqw2^fD}F+Ya!%G2f;~5fKuy7(xAplhZjZM_E4Y>a@Dh?DwZLfT?NN%8RQ% z5PgU?F{y~kSSGs5^zie0%@OvU+5%*l{BFzWIcj7t{MTSeJ(K3qpZ0}?3D0DzkjqLy zL*JhK0o>)u$w_TMbSF~DOxhE?0+ua1>nL5a81W_TJ1|0F5Cb6)QIZ1sEg`6REvX6N zEgZyY#n9q$(*v(R0o$W7Rzm!qe4myO@n-42F=AJ}}yYeK%7* z>w8xk2VCXF8>?>m{W96#lDXHQ(w^(P^*Vm_2{qlL;i`mrskFA;W zn+-f-Y&E>YtAqH{C=t6=gU(`pypzI5%570 z{==qc58jSm*GChCA;wt^DP_Rt+=TS7*VNQZjE@(;Tu4gotPQ8gd|RJ2YyH*UPDR>E z9|ERVndTVoL0|)_1{1Ma@FcX&ZtAI~KRhBLsj(;Z@7~@(UmyI3LUxIZ8mTCE0wSVe z7-eYhz(5a*)VtTGLG10^00iENYW;r=u6ue&NXCsPcjpY-16rDz@w-y{!7yGnwr;!M z{GERH9P|9~-h8&Hsj1rcPE={L{t-OIzfV{%WtK=R2{);#d$$8+1tj28gAWK0)4IC42o%UmaWyD2^y@TDWiOWt+f=+s7h(2sjzT`f&f- zzazW-lWOt4+1c3%+HOv8BPKv2U-(EWvS~F zv7zd=h5d0qeH{_$z2%lV+0Z+MWlLZ4jq75p;>b0$6+v~fKo-fx3qCI=Vy(U}OJ1>9UcSDNjKUpu@LDJetArN)QzZc;<&u&$% z!t@s&EiEIhn+|lXtwiPNMATY!b!7TC^)+6-wgRE0i^w_cWFBiYx_^XEg7ZWmS&eUZnvap>$nlj`f;gA%Om11>sP6SSgKf5 zgG)|rfy$~ZtHG@y4)bK|!}z#4-b>eun~|9Q-IPk_t^p*-C_ua1JNsErPtV9`ePyM+ zvC-|yGUDZR?5_gO>jH%y2K8D}?-|CV}f+ z(1|p39<4UyhRuy#tK>4L3J(w!*0dyEJ-ZK{q~S)JffEw2KGN@_Ot{Tt@o#&3*XVa% zh_6`;fob@bFE1`O;!It)WM_Wm!FL$8dtg+k%gD$8M4ds=M>#Lfn@LiXjiyjhG11x~ zZCY;loId}d$D9;ycJ{gv8h5qR9#O4J3LE2YFI+fEFlZ6A^g87;NDTPboE+Z@X)Z&| z4JZ*+8eEHptx-}RkF2mF#vey^F4k;yjrkMLiPVa@_Z zjhW|Wv@e95wDk&19oIuOI5u(}c!af%oQIP=3j82&_}{+(^3Sk94-c=;cex@;fj?Z> zb|srS3P?gE{et52A5}Y-0Z0GeObIRy&ikpJU(dpiLES-%zqElNP)X8LL5@@Y@6E5v zY%Z&--voyKBC9ZmjWuWJt>neUDQUENGYAOS6g+wtL2g(L+RWFU*ee$NIBahSbaa-2 ze-MNhiMqJT7hQqn(K+l6~GzbsP09y YdQX#tg5!!5cx^a2Ddo@A62`&*4>+Q+=Kufz literal 8726 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
+\image html image110.png +\n
Interaction style switch - allows to switch between standard and +"keyboard free" interaction styles. "Keyboard free" style allow to process all +view transformations without using keyboard (only by mouse) and perform selection +in view by pressing "S" key. By default, rotation in this mode is performed by +left mouse button, panning - by middle mouse button, zooming - by left and middle +mouse buttons pressed simultaneously.
+
+ \image html image88.png \n
Show/Hide Trihedron - shows or hides coordinate axes.
diff --git a/doc/salome/gui/input/vtk_3d_viewer.doc b/doc/salome/gui/input/vtk_3d_viewer.doc index fbbd88850..8c4361de8 100644 --- a/doc/salome/gui/input/vtk_3d_viewer.doc +++ b/doc/salome/gui/input/vtk_3d_viewer.doc @@ -15,6 +15,15 @@ button. or jpeg image format.
+\image html image110.png +\n
Interaction style switch - allows to switch between standard and +"keyboard free" interaction styles. "Keyboard free" style allow to process all +view transformations without using keyboard (only by mouse) and perform selection +in view by pressing "S" key. By default, rotation in this mode is performed by +left mouse button, panning - by middle mouse button, zooming - by left and middle +mouse buttons pressed simultaneously.
+
+ \image html image88.png \n
Show/Hide Trihedron - shows or hides coordinate axes.
diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 8257b5f33..02a85782a 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -1349,6 +1349,7 @@ SUIT_ViewManager* LightApp_Application::createViewManager( const QString& vmType u = resMgr->integerValue( "OCCViewer", "iso_number_u", u ); v = resMgr->integerValue( "OCCViewer", "iso_number_v", v ); vm->setIsos( u, v ); + vm->setInteractionStyle( resMgr->integerValue( "OCCViewer", "navigation_mode", vm->interactionStyle() ) ); viewMgr->setViewModel( vm );// custom view model, which extends SALOME_View interface new LightApp_OCCSelector( (OCCViewer_Viewer*)viewMgr->getViewModel(), mySelMgr ); } @@ -1914,6 +1915,19 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) pref->setItemProperty( "min", 0, isoV ); pref->setItemProperty( "max", 100000, isoV ); + int occStyleMode = pref->addPreference( tr( "PREF_NAVIGATION" ), occGroup, + LightApp_Preferences::Selector, "OCCViewer", "navigation_mode" ); + QStringList aStyleModeList; + aStyleModeList.append( tr("PREF_STANDARD_STYLE") ); + aStyleModeList.append( tr("PREF_KEYFREE_STYLE") ); + + QList aModeIndexesList; + aModeIndexesList.append(0); + aModeIndexesList.append(1); + + pref->setItemProperty( "strings", aStyleModeList, occStyleMode ); + pref->setItemProperty( "indexes", aModeIndexesList, occStyleMode ); + // VTK Viewer int vtkGen = pref->addPreference( "", vtkGroup, LightApp_Preferences::Frame ); pref->setItemProperty( "columns", 2, vtkGen ); @@ -1924,10 +1938,6 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) aProjModeList.append( tr("PREF_ORTHOGRAPHIC") ); aProjModeList.append( tr("PREF_PERSPECTIVE") ); - QList aModeIndexesList; - aModeIndexesList.append(0); - aModeIndexesList.append(1); - pref->setItemProperty( "strings", aProjModeList, vtkProjMode ); pref->setItemProperty( "indexes", aModeIndexesList, vtkProjMode ); @@ -1944,9 +1954,6 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) int vtkStyleMode = pref->addPreference( tr( "PREF_NAVIGATION" ), vtkGen, LightApp_Preferences::Selector, "VTKViewer", "navigation_mode" ); - QStringList aStyleModeList; - aStyleModeList.append( tr("PREF_STANDARD_STYLE") ); - aStyleModeList.append( tr("PREF_KEYFREE_STYLE") ); pref->setItemProperty( "strings", aStyleModeList, vtkStyleMode ); pref->setItemProperty( "indexes", aModeIndexesList, vtkStyleMode ); @@ -2180,6 +2187,25 @@ void LightApp_Application::preferencesChanged( const QString& sec, const QString } #endif +#ifndef DISABLE_OCCVIEWER + if ( sec == QString( "OCCViewer" ) && param == QString( "navigation_mode" ) ) + { + int mode = resMgr->integerValue( "OCCViewer", "navigation_mode", 0 ); + QList lst; + viewManagers( OCCViewer_Viewer::Type(), lst ); + QListIterator it( lst ); + while ( it.hasNext() ) + { + SUIT_ViewModel* vm = it.next()->getViewModel(); + if ( !vm || !vm->inherits( "OCCViewer_Viewer" ) ) + continue; + + OCCViewer_Viewer* occVM = (OCCViewer_Viewer*)vm; + occVM->setInteractionStyle( mode ); + } + } +#endif + #ifndef DISABLE_VTKVIEWER if ( sec == QString( "VTKViewer" ) && (param == QString( "trihedron_size" ) || param == QString( "relative_size" )) ) { diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml index 42ea7105b..706db084f 100644 --- a/src/LightApp/resources/LightApp.xml +++ b/src/LightApp/resources/LightApp.xml @@ -118,6 +118,7 @@ +
diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx index 9e9753410..f931e0cdf 100755 --- a/src/OCCViewer/OCCViewer_ViewModel.cxx +++ b/src/OCCViewer/OCCViewer_ViewModel.cxx @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -114,6 +115,9 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron, bool DisplayStaticTri myAISContext->Deactivate(myTrihedron); } + // set interaction style to standard + myInteractionStyle = 0; + // selection mySelectionEnabled = true; myMultiSelectionEnabled = true; @@ -153,6 +157,7 @@ void OCCViewer_Viewer::initView( OCCViewer_ViewWindow* view ) if ( view ) { view->initLayout(); view->initSketchers(); + view->setInteractionStyle( interactionStyle() ); OCCViewer_ViewPort3d* vp3d = view->getViewPort(); if ( vp3d ) @@ -187,6 +192,9 @@ void OCCViewer_Viewer::setViewManager(SUIT_ViewManager* theViewManager) connect(theViewManager, SIGNAL(mouseRelease(SUIT_ViewWindow*, QMouseEvent*)), this, SLOT(onMouseRelease(SUIT_ViewWindow*, QMouseEvent*))); + + connect(theViewManager, SIGNAL(keyPress(SUIT_ViewWindow*, QKeyEvent*)), + this, SLOT(onKeyPress(SUIT_ViewWindow*, QKeyEvent*))); } } @@ -228,9 +236,11 @@ void OCCViewer_Viewer::onMouseRelease(SUIT_ViewWindow* theWindow, QMouseEvent* t if (theEvent->button() != Qt::LeftButton) return; if (!theWindow->inherits("OCCViewer_ViewWindow")) return; + OCCViewer_ViewWindow* aView = (OCCViewer_ViewWindow*) theWindow; + if (!aView || aView->interactionStyle() != SUIT_ViewModel::STANDARD) + return; myEndPnt.setX(theEvent->x()); myEndPnt.setY(theEvent->y()); - OCCViewer_ViewWindow* aView = (OCCViewer_ViewWindow*) theWindow; bool aHasShift = (theEvent->modifiers() & Qt::ShiftModifier); if (!aHasShift) emit deselection(); @@ -270,6 +280,52 @@ void OCCViewer_Viewer::onMouseRelease(SUIT_ViewWindow* theWindow, QMouseEvent* t emit selectionChanged(); } +/*! + SLOT: called on key press, processes selection in "key free" interaction style +*/ +void OCCViewer_Viewer::onKeyPress(SUIT_ViewWindow* theWindow, QKeyEvent* theEvent) +{ + if (!mySelectionEnabled) return; + if (theEvent->key() != Qt::Key_S) return; + if (!theWindow->inherits("OCCViewer_ViewWindow")) return; + + OCCViewer_ViewWindow* aView = (OCCViewer_ViewWindow*) theWindow; + if (!aView || aView->interactionStyle() != SUIT_ViewModel::KEY_FREE) + return; + + emit deselection(); + myAISContext->Select(); + + emit selectionChanged(); +} + +/*! + \return interaction style +*/ +int OCCViewer_Viewer::interactionStyle() const +{ + return myInteractionStyle; +} + +/*! + Sets interaction style: 0 - standard, 1 - keyboard free interaction + \param theStyle - new interaction style +*/ +void OCCViewer_Viewer::setInteractionStyle( const int theStyle ) +{ + myInteractionStyle = theStyle; + //!! To be done for view windows + if ( !myViewManager ) + return; + + QVector wins = myViewManager->getViews(); + for ( int i = 0; i < (int)wins.count(); i++ ) + { + OCCViewer_ViewWindow* win = ::qobject_cast( wins.at( i ) ); + if ( win ) + win->setInteractionStyle( theStyle ); + } +} /*! Sets selection enabled status diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h index 9bf960ef9..40c4e495f 100755 --- a/src/OCCViewer/OCCViewer_ViewModel.h +++ b/src/OCCViewer/OCCViewer_ViewModel.h @@ -33,6 +33,7 @@ #include #include +class QKeyEvent; class QMouseEvent; class SUIT_ViewWindow; @@ -124,6 +125,9 @@ public: Handle(AIS_InteractiveContext) getAISContext() const { return myAISContext; } Handle(AIS_Trihedron) getTrihedron() const { return myTrihedron; } + int interactionStyle() const; + void setInteractionStyle( const int ); + void enableSelection(bool isEnabled); bool isSelectionEnabled() const { return mySelectionEnabled; } @@ -156,6 +160,7 @@ protected slots: void onMousePress(SUIT_ViewWindow*, QMouseEvent*); void onMouseMove(SUIT_ViewWindow*, QMouseEvent*); void onMouseRelease(SUIT_ViewWindow*, QMouseEvent*); + void onKeyPress(SUIT_ViewWindow*, QKeyEvent*); void onDumpView(); void onChangeBgColor(); @@ -169,6 +174,8 @@ private: viewAspectList myViewAspects; + int myInteractionStyle; + bool mySelectionEnabled; bool myMultiSelectionEnabled; diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx index 7bef0551e..65f1bc061 100755 --- a/src/OCCViewer/OCCViewer_ViewWindow.cxx +++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -214,6 +215,8 @@ OCCViewer_ViewWindow::OCCViewer_ViewWindow( SUIT_Desktop* theDesktop, mypSketcher = 0; myCurSketch = -1; + + myInteractionStyle = SUIT_ViewModel::STANDARD; } /*! @@ -255,17 +258,18 @@ void OCCViewer_ViewWindow::initLayout() \return type of the operation */ OCCViewer_ViewWindow::OperationType -OCCViewer_ViewWindow::getButtonState( QMouseEvent* theEvent ) +OCCViewer_ViewWindow::getButtonState( QMouseEvent* theEvent, int theInteractionStyle ) { OperationType aOp = NOTHING; - if( (theEvent->modifiers() == SUIT_ViewModel::myStateMap[SUIT_ViewModel::ZOOM]) && - (theEvent->button() == SUIT_ViewModel::myButtonMap[SUIT_ViewModel::ZOOM]) ) + SUIT_ViewModel::InteractionStyle aStyle = (SUIT_ViewModel::InteractionStyle)theInteractionStyle; + if( (theEvent->modifiers() == SUIT_ViewModel::myStateMap[aStyle][SUIT_ViewModel::ZOOM]) && + (theEvent->buttons() == SUIT_ViewModel::myButtonMap[aStyle][SUIT_ViewModel::ZOOM]) ) aOp = ZOOMVIEW; - else if( (theEvent->modifiers() == SUIT_ViewModel::myStateMap[SUIT_ViewModel::PAN]) && - (theEvent->button() == SUIT_ViewModel::myButtonMap[SUIT_ViewModel::PAN]) ) + else if( (theEvent->modifiers() == SUIT_ViewModel::myStateMap[aStyle][SUIT_ViewModel::PAN]) && + (theEvent->buttons() == SUIT_ViewModel::myButtonMap[aStyle][SUIT_ViewModel::PAN]) ) aOp = PANVIEW; - else if( (theEvent->modifiers() == SUIT_ViewModel::myStateMap[SUIT_ViewModel::ROTATE]) && - (theEvent->button() == SUIT_ViewModel::myButtonMap[SUIT_ViewModel::ROTATE]) ) + else if( (theEvent->modifiers() == SUIT_ViewModel::myStateMap[aStyle][SUIT_ViewModel::ROTATE]) && + (theEvent->buttons() == SUIT_ViewModel::myButtonMap[aStyle][SUIT_ViewModel::ROTATE]) ) aOp = ROTATE; return aOp; @@ -315,6 +319,10 @@ bool OCCViewer_ViewWindow::eventFilter( QObject* watched, QEvent* e ) } return true; + case QEvent::KeyPress: + emit keyPressed(this, (QKeyEvent*) e); + return true; + default: break; } @@ -339,6 +347,17 @@ void OCCViewer_ViewWindow::vpMousePressEvent( QMouseEvent* theEvent ) { myStartX = theEvent->x(); myStartY = theEvent->y(); + int anInteractionStyle = interactionStyle(); + + // in "key free" interaction style zoom operation is activated by two buttons (simultaneously pressed), + // which are assigned for pan and rotate - these operations are activated immediately after pressing + // of the first button, so it is necessary to switch to zoom when the second button is pressed + bool aSwitchToZoom = false; + if ( anInteractionStyle == SUIT_ViewModel::KEY_FREE && + ( myOperation == PANVIEW || myOperation == ROTATE ) ) { + aSwitchToZoom = getButtonState( theEvent, anInteractionStyle ) == ZOOMVIEW; + } + switch ( myOperation ) { case WINDOWFIT: if ( theEvent->button() == Qt::LeftButton ) @@ -356,20 +375,24 @@ void OCCViewer_ViewWindow::vpMousePressEvent( QMouseEvent* theEvent ) break; case PANVIEW: - if ( theEvent->button() == Qt::LeftButton ) + if ( aSwitchToZoom ) + activateZoom(); + else if ( theEvent->button() == Qt::LeftButton ) emit vpTransformationStarted ( PANVIEW ); break; case ROTATE: - if ( theEvent->button() == Qt::LeftButton ) { - myViewPort->startRotation(myStartX, myStartY, myCurrPointType, mySelectedPoint); - emit vpTransformationStarted ( ROTATE ); - } + if ( aSwitchToZoom ) + activateZoom(); + else if ( theEvent->button() == Qt::LeftButton ) { + myViewPort->startRotation(myStartX, myStartY, myCurrPointType, mySelectedPoint); + emit vpTransformationStarted ( ROTATE ); + } break; default: /* Try to activate a transformation */ - switch ( getButtonState(theEvent) ) { + switch ( getButtonState(theEvent, anInteractionStyle) ) { case ZOOMVIEW: activateZoom(); break; @@ -743,7 +766,9 @@ void OCCViewer_ViewWindow::vpMouseMoveEvent( QMouseEvent* theEvent ) { int aState = theEvent->modifiers(); int aButton = theEvent->buttons(); - if ( aButton == Qt::LeftButton && ( aState == Qt::NoModifier || Qt::ShiftModifier ) ) { + int anInteractionStyle = interactionStyle(); + if ( anInteractionStyle == SUIT_ViewModel::STANDARD && + aButton == Qt::LeftButton && ( aState == Qt::NoModifier || Qt::ShiftModifier ) ) { myDrawRect = myEnableDrawMode; if ( myDrawRect ) { drawRect(); @@ -755,7 +780,8 @@ void OCCViewer_ViewWindow::vpMouseMoveEvent( QMouseEvent* theEvent ) } } } - else if ( aButton == Qt::RightButton && ( aState == Qt::NoModifier || Qt::ShiftModifier ) ) { + else if ( anInteractionStyle == SUIT_ViewModel::STANDARD && + aButton == Qt::RightButton && ( aState == Qt::NoModifier || Qt::ShiftModifier ) ) { OCCViewer_ViewSketcher* sketcher = 0; QList::Iterator it; for ( it = mySketchers.begin(); it != mySketchers.end() && !sketcher; ++it ) @@ -1099,6 +1125,14 @@ void OCCViewer_ViewWindow::createActions() aAction->setStatusTip(tr("DSC_AMBIENT")); connect(aAction, SIGNAL(triggered()), this, SLOT(onAmbientToogle())); toolMgr()->registerAction( aAction, AmbientId ); + + // Switch between interaction styles + aAction = new QtxAction(tr("MNU_STYLE_SWITCH"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_SVTK_STYLE_SWITCH" ) ), + tr( "MNU_STYLE_SWITCH" ), 0, this); + aAction->setStatusTip(tr("DSC_STYLE_SWITCH")); + aAction->setCheckable(true); + connect(aAction, SIGNAL(toggled(bool)), this, SLOT(onSwitchInteractionStyle(bool))); + toolMgr()->registerAction( aAction, SwitchInteractionStyleId ); } /*! @@ -1109,6 +1143,7 @@ void OCCViewer_ViewWindow::createToolBar() int tid = toolMgr()->createToolBar( tr( "LBL_TOOLBAR_LABEL" ), false ); toolMgr()->append( DumpId, tid ); + toolMgr()->append( SwitchInteractionStyleId, tid ); if( myModel->trihedronActivated() ) toolMgr()->append( TrihedronShowId, tid ); @@ -1425,6 +1460,37 @@ void OCCViewer_ViewWindow::onTrihedronShow() myModel->toggleTrihedron(); } +/*! + \brief Switches "keyboard free" interaction style on/off +*/ +void OCCViewer_ViewWindow::onSwitchInteractionStyle( bool on ) +{ + myInteractionStyle = on ? (int)SUIT_ViewModel::KEY_FREE : (int)SUIT_ViewModel::STANDARD; + + // update action state if method is called outside + QtxAction* a = dynamic_cast( toolMgr()->action( SwitchInteractionStyleId ) ); + if ( a->isChecked() != on ) + a->setChecked( on ); +} + +/*! + \brief Get current interaction style + \return interaction style +*/ +int OCCViewer_ViewWindow::interactionStyle() const +{ + return myInteractionStyle; +} + +/*! + \brief Set current interaction style + \param theStyle interaction style +*/ +void OCCViewer_ViewWindow::setInteractionStyle( const int theStyle ) +{ + onSwitchInteractionStyle( theStyle == (int)SUIT_ViewModel::KEY_FREE ); +} + /*! \brief Dump view window contents to the pixmap. \return pixmap containing all scene rendered in the window diff --git a/src/OCCViewer/OCCViewer_ViewWindow.h b/src/OCCViewer/OCCViewer_ViewWindow.h index b9c736756..15fd3b61a 100755 --- a/src/OCCViewer/OCCViewer_ViewWindow.h +++ b/src/OCCViewer/OCCViewer_ViewWindow.h @@ -49,7 +49,7 @@ public: enum { DumpId, FitAllId, FitRectId, ZoomId, PanId, GlobalPanId, ChangeRotationPointId, RotationId, FrontId, BackId, TopId, BottomId, LeftId, RightId, ResetId, CloneId, ClippingId, MemId, RestoreId, - TrihedronShowId, AxialScaleId, AmbientId }; + TrihedronShowId, AxialScaleId, AmbientId, SwitchInteractionStyleId }; enum OperationType{ NOTHING, PANVIEW, ZOOMVIEW, ROTATE, PANGLOBAL, WINDOWFIT, FITALLVIEW, RESETVIEW, @@ -84,6 +84,9 @@ public: OCCViewer_ViewSketcher* getSketcher( const int ); void activateSketching( int ); + + int interactionStyle() const; + void setInteractionStyle( const int ); public slots: void onFrontView(); @@ -109,6 +112,7 @@ public slots: void onRestoreView(); void onTrihedronShow(); void setRestoreFlag(); + void onSwitchInteractionStyle( bool on ); void activateSetRotationGravity(); void activateSetRotationSelected( double theX, double theY, double theZ ); @@ -151,7 +155,7 @@ protected: void createActions(); void createToolBar(); - virtual OperationType getButtonState(QMouseEvent* theEvent); + virtual OperationType getButtonState(QMouseEvent* theEvent, int theInteractionStyle); viewAspect getViewParams() const; @@ -203,6 +207,8 @@ private: QtxAction* mySetRotationPointAction; QtxRectRubberBand* myRectBand; //!< selection rectangle rubber band + + int myInteractionStyle; }; #ifdef WIN32 diff --git a/src/OCCViewer/resources/OCCViewer_images.ts b/src/OCCViewer/resources/OCCViewer_images.ts index 895d4198a..843e89684 100644 --- a/src/OCCViewer/resources/OCCViewer_images.ts +++ b/src/OCCViewer/resources/OCCViewer_images.ts @@ -116,5 +116,9 @@ ICON_OCCVIEWER_AMBIENT occ_view_ambient.png + + ICON_OCCVIEWER_STYLE_SWITCH + occ_view_style_switch.png + diff --git a/src/OCCViewer/resources/OCCViewer_msg_en.ts b/src/OCCViewer/resources/OCCViewer_msg_en.ts index c2fecf77b..6e88f1909 100644 --- a/src/OCCViewer/resources/OCCViewer_msg_en.ts +++ b/src/OCCViewer/resources/OCCViewer_msg_en.ts @@ -236,6 +236,14 @@ MNU_AMBIENT Toogle keep only ambient light + + DSC_STYLE_SWITCH + Interaction style switch + + + MNU_STYLE_SWITCH + Interaction style switch + OCC_IMAGE_FILES Images Files (*.bmp *.png *.jpg *.jpeg) diff --git a/src/OCCViewer/resources/occ_view_style_switch.png b/src/OCCViewer/resources/occ_view_style_switch.png new file mode 100755 index 0000000000000000000000000000000000000000..b0a9c807e016446374173db06507c4d237312483 GIT binary patch literal 782 zcmV+p1M&QcP)_#cKcn03CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00MGJL_t&-)76tdOB_KM z#(#6Spd0VpfEGCmvA8QN6zl}WN))tA<0mj5z%P}`P7WeSG(`kO1uZN@(GX77^KLJ< zx3jZ5JCnlPq48hRC2uwJ!26p&&-226S+}>hc5Q9Vo}8T6zwH&>g|&CRQc8PpaKPc= zAtNIr3=a>Zl%iIvQ7)I6nVAuP3_LwOwU?Kd%+Ai@x-P9&3&+WkWrj4>?CtFVu(Y)F z2r9&#l)En;9UZZ_xQOezB#Gkco6qO3mwd0?5Hy=qDiw?|?Ck73`xOs>j^h9jh9N4J z1nrcMpDfic4UCDoxw&C_dYU+nIX^$QuL8T*w${?=L=3*kh?5o$DI8 z&-3s+k9VaJ0E~e+mObFu*cjW}+bE@MUtgbi^2uqMJ{bh9Goq-2Qi@zIhcO1NHRI#s z?C$QqZp!b6NGXw0qP0eAO&EsM>vde$LoB+2u@iHQl0kB2qAD?m;U~Klu|@dL=Xf7K|mOWWLbvRnnI!Q@+`O8ZM(j{&fMG_tyT+T3|W?; zltM~Lnx;68gAjuK{e4zfR~Z@_65R|x0s>rIT-a*0N~KaEpU StatesMap; - typedef QMap ButtonsMap; + typedef QMap StatesMap; + typedef QMap ButtonsMap; + + typedef QMap InteractionStyle2StatesMap; + typedef QMap InteractionStyle2ButtonsMap; SUIT_ViewModel(); virtual ~SUIT_ViewModel(); @@ -63,17 +67,17 @@ public: virtual void contextMenuPopup( QMenu* ) {} - static void setHotButton( HotOperation theOper, Qt::KeyboardModifier theState, - Qt::MouseButton theButton ); - static void getHotButton( HotOperation theOper, Qt::KeyboardModifier& theState, - Qt::MouseButton& theButton ); + static void setHotButton( InteractionStyle theInteractionStyle, HotOperation theOper, + Qt::KeyboardModifiers theState, Qt::MouseButtons theButton ); + static void getHotButton( InteractionStyle theInteractionStyle, HotOperation theOper, + Qt::KeyboardModifiers& theState, Qt::MouseButtons& theButton ); protected: SUIT_ViewManager* myViewManager; public: - static StatesMap myStateMap; - static ButtonsMap myButtonMap; + static InteractionStyle2StatesMap myStateMap; + static InteractionStyle2ButtonsMap myButtonMap; }; #ifdef WIN32 diff --git a/src/SVTK/resources/SVTK_msg_en.ts b/src/SVTK/resources/SVTK_msg_en.ts index a747d7b2b..ea331dcb4 100644 --- a/src/SVTK/resources/SVTK_msg_en.ts +++ b/src/SVTK/resources/SVTK_msg_en.ts @@ -202,7 +202,7 @@ DSC_SVTK_STYLE_SWITCH - Interactiion style switch + Interaction style switch MNU_SVTK_STYLE_SWITCH diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml index 38ab2e1a1..75dd79a4a 100644 --- a/src/SalomeApp/resources/SalomeApp.xml +++ b/src/SalomeApp/resources/SalomeApp.xml @@ -125,6 +125,7 @@ +
-- 2.39.2