From d06c225c454bad0b15b69995bd74b559199eed36 Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 12 Oct 2017 18:57:08 +0300 Subject: [PATCH] refs #1328: debug of the overview on rotated plane --- src/HYDROGUI/HYDROGUI_Overview.cxx | 32 +++++++++++++++++- .../reference_data/overview_empty.png | Bin 6701 -> 6539 bytes .../reference_data/overview_rotated_1.png | Bin 10787 -> 11359 bytes .../reference_data/overview_zoomed_1.png | Bin 8113 -> 8156 bytes src/HYDRO_tests/test_Overview.cxx | 7 ++-- 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/HYDROGUI/HYDROGUI_Overview.cxx b/src/HYDROGUI/HYDROGUI_Overview.cxx index 2077f91f..88ba1438 100644 --- a/src/HYDROGUI/HYDROGUI_Overview.cxx +++ b/src/HYDROGUI/HYDROGUI_Overview.cxx @@ -190,11 +190,41 @@ void HYDROGUI_OverviewBand::update( bool isFromMain ) QPoint c = center(); double x1, y1, z1, x2, y2, z2; main->getView()->Convert( main->width()/2, main->height()/2, x1, y1, z1 ); + + // Patch for OCCT 6.9.1, on 7.0.0 the moving of point to plane XY is not necessary + gp_Dir dm = main->getView()->Camera()->Direction(); + double t1 = -z1/dm.Z(); + x1 += dm.X()*t1; + y1 += dm.Y()*t1; + z1 += dm.Z()*t1; + overview->getView()->Convert( c.x(), c.y(), x2, y2, z2 ); + gp_Dir dov = overview->getView()->Camera()->Direction(); + double t2 = -z2/dov.Z(); + x2 += dov.X()*t2; + y2 += dov.Y()*t2; + z2 += dov.Z()*t2; gp_Trsf aTrsf; aTrsf.SetTranslation( gp_Pnt( x1, y1, z1 ), gp_Pnt( x2, y2, z2 ) ); - main->getView()->Camera()->Transform( aTrsf ); + + // Temporary patch for bug in OCCT 6.9.1 + Handle(Graphic3d_Camera) cam = main->getView()->Camera(); + gp_Dir u = cam->Up(), nu = u.Transformed (aTrsf); + gp_Pnt e = cam->Eye(), ne = e.Transformed (aTrsf); + gp_Pnt cen = cam->Center(), ncen = cen.Transformed (aTrsf); + + if (!nu.IsEqual (u, 0.0)) + cam->SetUp(nu); + + if (!ne.IsEqual (e, 0.0)) + cam->SetEye(ne); + + if (!ncen.IsEqual(cen, 0.0)) + cam->SetCenter (ncen); + + //version for new OCCT: + //main->getView()->Camera()->Transform( aTrsf ); main->repaint(); } } diff --git a/src/HYDRO_tests/reference_data/overview_empty.png b/src/HYDRO_tests/reference_data/overview_empty.png index fa9022f66b5b823322458a5a169ab2b587c1a086..49120672f71aa3bcd788ff6aad2018776b847827 100644 GIT binary patch literal 6539 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 diff --git a/src/HYDRO_tests/reference_data/overview_rotated_1.png b/src/HYDRO_tests/reference_data/overview_rotated_1.png index bc6b07abeaf839d2667eb86be4bd6ef549270475..703c3602bd5db41a78256e33f233861bdc11f907 100644 GIT binary patch literal 11359 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 literal 10787 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 TThaoclY`h=Iaoe4cfayK=7Dzd diff --git a/src/HYDRO_tests/reference_data/overview_zoomed_1.png b/src/HYDRO_tests/reference_data/overview_zoomed_1.png index e8a1339909f0b2b45adaeefbf47f4f6fc8e1584f..50051a2cd533b433c733bea8aed11f7c77927171 100644 GIT binary patch literal 8156 zcmeHsX*iT^`1i#SDNS0XM3OyANNF$?ifnC`QbRqI2-%{BnHHKsQlo5zHd=%dS;`Ei zh9ZShmL_|4W65Bc|8?I}&)akSkG{Ug`{DgC$2r$M=XGAcb3gBEsCG6xBqd}d005E} zJ5Bchfa!-HVR2#jggD-`9+J7fJDvOiSinR+Lf6$7tOP(V#=>;#zTle!Ej5v=zFudv zuIv>)+9=uby(c~0p(U*hd-uTmyH#b6sUeXevGujdAs5dHUHB(9Om9l1(BYp)$8w8A5m7!NdT( z_Gw#Eh3T6C`!5_JK*o%k^TG-y8YG?13T@4u94PTIB-fbTUGgzKMhuVx&N8)VLt6~tM(;?jdnu9q5%Od-)~(~7C}a-07(xW^?gD~215;bKBryFvi?+!c9?yJ*g^*c7dYu<-2-902M% zdTsAkFyv?>P}EzE>@P{-ad6+dIcCJlqg+gJ9D<|1w`bl#%u-&=*#-dYo+>MGLM40* z1~`1f$y?i_xA-!5Uw$P6z=^Rj!|F;MUQk`k%9<-%e8+Y}tmG-@0~yqUofrTkndnrx?0;?kz`Ne$)3j^#f@3(3@i=1besnS-*ilN^esb(2K;dMm{#`gpG zUk3Ngb{wSJJ?HB{9pZ{x&Mwtr%B>vHZ3(r?_1J6K5}g4dIutbV-vreyFd2D-Etz4g zyJBcOJp1(I#wXC2X(Fj+ykQGey(Xw$<=ywP588!*3bQw;&8KyCBLH!DCILYcdy7I( zf?MRZq_6;#Qn)(vA!Ef(<`uoHcCD8cOJHyXOpIOfeKVYFGbl5|eSf{U$!X(`7tc>` z*#&^jB91}N7UNqIgI%N8l_PeSuH?jzpNG21N|7G>`;VQ<)(sq#3c8ZrB?K07>Iz6+ zJLvd+25X4DdlUc)*JZ(p!*4MlGq$)+>()u=`!|Zl`7P!pS8;%GCV|<&h_V#| znUNI4o~Fcg2)@sEdy2Ap`fBV0iDomaH(D2wK6V*LYE>_qXn3F+=*5>?=o8R>Q~>PR{N)(+tfY8Ll6ub=r0k}fzqfEh|4&ip*z!v zO3-x+qtSyGto>##3BZ!~h_}y6AwN`6DKBgyNXwnOC4gPxTqVx5;f2W&=}HXP=l;xs zcW$QikX*vhQh8qkQF2f#832C@M5kK*JM^;z(v}6m|Ga0avv<dn}(Sq-Y=!Zuv(%Qefo~S8`+)=P!i?hxjyO<$%NN;LJ4Z zXFW?8;BouSh^hU`1lQ+ZpIg9WvI`HEV&AX#YHVM{_HLw2mTXZAwVJ#KGmxTjm?>AR zO*YAyPM{Iy0Du>_ZV0rd?Xhf$l}Ks&zV|C>^7biZ;||g2DMC^@g^*Nb&Re91q?b*Y zlCxW1-+mQphT@WSKlb`fKN~2@p>dmXr^?S)Km3$*f&K9uy|~>NYfk#9FupTZ9b~fvLb=U0#{u@KN>iSP;Vfh3=#~zBZz14F7L){@(~Wkl^c(1hvKEhmGMI^8 zjje=ljuvX?*rF$D zmD;ny<-vgLMCEc|+yN&vNX(gRrZ%j;om3=b;OZ^13P)F6niF&D({?@7ffc|-Rf$6@ zBzgI#!shnaWs%9{Fll-p_i=v5j_i80z5tMLfs$Gk#=@q)^_i&UtF(%*yH<+=#wt@{VNqPtsKMi}-i=ZdPZOtAo?xK@zx2^MkXao(51RMgLV=A1{if&0 z$$EgOS)-=`hb0YjbYfC41}pUe=wHmSVrW7yUo(Zu!X9!o2X+KT45iyX$OAS5rM7Zy zXzn!SwnC~7Y-b~;L`B4n_u>ZqQb9w{o)gAFyn?jUpDJ*=fL`Oq4$3tRq`xA0WgGc6 z-sR=O6kVoZoHFA|G|z7p0)9^y%UwG&2RQ0V)kwb?24Dr1`=A-dtxKLM(WTH38A)I# zmuni4CG9WuF?d4KgpRyfT<079_}H*@ZxME)cEu@Aq;YScVzYUjT+K2IVIZQ==9y!q zz%Gzrf6WpC2^2~;vsu=p@^$7dIASH7r)0A-WldTKj^BeiTz39);JW60_d1*4xgPAV z{>^sJNL5`&S;hTJfy*W-Lb9fHkU@gzpcwruQ6I+3O-lBM+1Rtri)#$XCOfJzV7_wO zWBnrpw-@(PIHFEhJWDcqgg}rfu`?!_Th@7RMbpfe(#qp!kQsu$%uIAjJU)4rv4Ltb z&=N>=5=OSq?HOrMj9*Mj^e^}v>%VLY;BA?EZ&UdF+8sA-BTAl$k(W*_;aJl+dgP2- z^JiwBEgu6pi%zTF&)Pe@@Ke~=d1rtl6-(o4w#^E;jb3jZc`s@N>{e{y*kxQOj*_Xu z;H^z@`v!kH42vR#*mbG-%kx^mF7sHSEpW7%;GAr9cq9y#xi7+c);r}0ktWHHP@7d!HYv09V12_p$31Cg|rM(5tuOR z7IPRLumePPE~7D=yp84pw+&P=%^nyfz}Je2K?~r0DGs9!X4MiiCg#GAV4!k|A{J50 z0e0e2Sm&)!`rKbpc&-nYLwu0J>H;|0kzbnPv?Cym{{8D!*kI(BOJSokAe|@3-{9{` zFfem)zgPCiN?QtRg=b;@jqY9=3Co8KO zI6+le3i3xVMKLtI>H&lJds87I(CR;%sw$98TYqgzh==vi%H}^J`VkS&|FcP>6mGKG z`6t`IgPbWYXJJFWFk|0;b|9l~u*+sR_PH!l_;#d9o`hq#}SII@* zpcGa+CV3td`fmQW&GVg`B*2S5D~q6D2!wUCHrfMe>%Rbwy$nUWtor2|w6F`#L?=e#tND7g2z+@Qm!N&NQJqnpOCB{%IR8JiSV zlPy<`aaOg4J-Oh2Jci!gwu#V&>81py9sk@GQk&JX>%q@=F*U;@n}?K3jtS-1GBFGH zrw(<#m_9yjqQ4ajy9E$ge0Rm^|4!_yCUV;xpt$-b9s}#p|7&_FXJx3QX@adlasfBtYytV>#B_nhj2R9uy?r& zzG_&Ph#k?!x}CW(EdnBXe;%H?R4_GuT2yWqEO^BpMv}KhlsG_xC7SthMb-8-Fy40M zY}>ooApK%L{GO{z&c5D9SOd$7X`4B%Rhp4~QGcal0!7S4bI!2mQEhCL6bG*z!P%|C z)z?k9R0vTjxraxjl;WzOr?l5$f@4-xm3Khhu3Sz!q8hB}d(<)k8o@=_{GqnU_d8P>sljQBHnuCfhDV&}A9_1YJ2&N+A=KN-{^0XZc*N9~tlRd` zs?va93*MZ8zO?Ofvz?&E@p>-(P`+OD5j2QuT9%GkdP zl3c1y6;u1C_NSt{UgpgKnL7~pEjT3FA5S}098mxnKlycYkJ=yqo-iPz0QK;61=#Lj zHl6h(QfLDW^k`y+xLS|O!#*nsHlYZPAL&+S?r9+>- zq@Hv7nspntJ;z&9hrgJWlphIFB~;7Fi@4pI<9IjehVwuTW5lZ=_Lc=M=kP}d&-vfi ztZmZoSl4!L|Gc6DYuUFK=6hDWhSGvs?LGTz@E%?bIXGG{IZh$E<8-Jz`!+t`)6uam zaMsXe8S(;SOc&3vP#u_&y?N?+kne&NtA*QW(;^QDv?3d(?n)`!<6^3*QN&AW5|g?Y z-{tFQxqm6~Duyp`4Al_6TXWZZQ)o39ljPi=d>NZ4p0(H50{yEaNND0*Lbl?KmhU=V1TTI(M$FUz_lavW&jR}W^z>kuEEb$ z9pJ+>13T4VfB-Y!hw4ZnCZGQi9D%eEw~riLCA_)7pUSN8PlUmZr@}8VvVlr`Ot&Je zoOXJ$H9A`$>-}7X8X*{yWRO{r3yTuCc)Ps^k+m}bXMrs5wx2={!)XQ{+KlkUI`ORz$>o@mzPfV z!YBdzDk6z3$S-*T#3u-?4j^9dM}Bx8Nes1u!g`OHm27}AT-FB=^$`O_{@@xS+6R8* zEcJze7`+Ac`i2M~eZPmEFyn#Cs{o=MLO%r%O%Xt!p|DK|Ajhj%WHKK<7jtDBLa8y> zQsiDI^{E2E7>a-ic~$Esw9a=uS%L<%4#UZ?#0rWc?+PHEgQo-A4;(mP0f4h+Er$aZ z(5A#_!2t`nsK^rFfCU&!1BmE=)$oz?6gqa26wQG)!5xh#tsr0^cp9 z-`FCC$x)FdZ9&*;19+Dad@Fu%4n zIrlO0G%~II5~5YyHWn7?;VP6EIYhkOGFd*N9sX1R&kZ?uQ4e<>a!hzF2R6!Ivx}W( zITtCqz^snLLg@WEju=9PesDvPUD5%(7-&TK`Lb-}6w^EHG-SC-RtuhmPG5MOy4;&6 zC~(^We-=XT95{(m;e*FedgP!hO3Mx&MCpl~M={HxtbIp}{*Yp1zabiZ>L!UkeP9hQ z!r&PX>{LB74c)G7{zgFeWC`fu8z}Xqb#6h$K3O)1qC;ajfpM)I zUDY{eqT;OF69wDuiwaOMy9DfY$$2P4)sYebLwq92fW|U#*JEj;(qAeKq4IK*1=?x2 zmZ9u9u@43E{FDSniYj`A%F`GS;1yiz&i7t{hET=P0930AcV_|hFcr}LMpRrZdq3*r zH1Tp&E4=EQpqDTn;dL~$$&!C6P&9a_lztS=>%wN#gq8uf(L>Rz_aN0ybR*`t$K2^>c~nOS)mq%S3Lh~ zD*pxR&kOB;6Hj12!S(fjUT*%s)c+SOkWdW&mD~O*Y-TD-tAxv8$xZuszi2vElcH}u zI`D$sWuyZy^Aeeh-;8$G@HtmV{UwvLGt-cDTPX&pE4EQPT3cH`J$9IxCh@1)q?tZK zw~-vY|Ie&jSQSqQo2;`nd3APTu(fr~L?Hkju8VB7*(Cl9VRj@wyJSjjf(pPtYul*Z zgM)*!v&Iun=<;8~=pAb4G#2Zvhd1eZ1KkcJi#{#V2pQQ2dM?4H{$Zf2OI40A@L}_YKT^)ysv6;N0WBHH`+gGUsssah1u5J4q_BzZ*;_As z*t5M3beRcxEEbzhpbxV7lijKGnV(G_HVc4@Q}wLZA|+J+%5De#fhRLjMz79{_d=uJ z*l~7dDzG8Yz*rpK@&$#uDW~l8*5bz1wzRZpg>j-R-oy4auTSqHhh;L$`FWl++Ev{^ zAkDm>&z!urR~S@mgI=AU7&<*fKQn%Uxt2GcO|n)E9j!K)eg}=wN(oj7o@}G@XGkO- zhjmVF_RCO|Y{>M_0jvq{1D(&C^oN&7BJk8&{pxlf(zFkh-8mFCVZy%_)=M9qX7jq7 zA5H}EPmgkH8%<_`CU?j8{u!*!iQ{{5A!=D@oF!0VWTh!pqx8G@*t_`1BJd(Oj zP0U7(jWm`U7?%r?5A;u2GIirseRRI!(&LJ}b%)#KlFf@TU|fn*DR{eOJ3_BqJ7G^f4 JS=(IB{|{h{7!Uve literal 8113 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 P@Zhk4nSQ3O-L3xtIW!9# diff --git a/src/HYDRO_tests/test_Overview.cxx b/src/HYDRO_tests/test_Overview.cxx index 3850853d..3bba27d4 100644 --- a/src/HYDRO_tests/test_Overview.cxx +++ b/src/HYDRO_tests/test_Overview.cxx @@ -37,7 +37,7 @@ HYDROGUI_Overview* test_Overview::myOverview = 0; { \ QString aMessage; \ QImage aDump = dumpViews(); \ - if( !TestViewer::AssertImages( aMessage, &aDump, theCase ) ) \ + if( !TestViewer::AssertImages( aMessage, &aDump, theCase, false ) ) \ { \ TestViewer::showColorScale( false ); \ std::string aMessageStl = aMessage.toStdString(); \ @@ -57,7 +57,7 @@ QImage test_Overview::dumpViews() QImage aMain = TestViewer::viewWindow()->getView(OCCViewer_ViewFrame::MAIN_VIEW)->dumpView(); QImage anOverview = myOverview->dump(); - aMain = aMain.rgbSwapped(); //PATCH for image came from OCCT dump + aMain = aMain.rgbSwapped(); //PATCH for image came from OCCT dump //anOverview = anOverview.rgbSwapped(); //overview dump already normalizes the image, the line is not necessary!!! int w1 = aMain.width(); @@ -96,6 +96,7 @@ void test_Overview::create() myOverview->show(); myOverview->setMainView( TestViewer::viewWindow() ); TestViewer::viewWindow()->setGeometry( 400, 100, 800, 800 ); + TestViewer::viewWindow()->onTopView(); myOverview->setGeometry( 100, 100, 200, 200 ); isPassed = true; @@ -138,6 +139,7 @@ void fitAllWithRestore( OCCViewer_ViewPort3d* vp ) void test_Overview::test_default() { create(); + //QTest::qWait( 50000 ); CPPUNIT_ASSERT_OVERVIEW( "overview_empty" ); } @@ -155,6 +157,7 @@ void test_Overview::test_actions_in_main() { create(); showShape(); + TestViewer::viewWindow()->onTopView(); OCCViewer_ViewWindow* aMain = TestViewer::viewWindow()->getView( OCCViewer_ViewFrame::MAIN_VIEW ); OCCViewer_ViewPort3d* vp = aMain->getViewPort(); -- 2.39.2