From 9befc66f671bd8035cd0127f54e1b3e631d1c1d2 Mon Sep 17 00:00:00 2001 From: asl Date: Tue, 17 Nov 2015 10:32:16 +0300 Subject: [PATCH] patch on the shape to support correctly the border color --- src/HYDROGUI/CMakeLists.txt | 2 + src/HYDROGUI/HYDROGUI_AISShape.cxx | 74 ++++++++++++++++++ src/HYDROGUI/HYDROGUI_AISShape.h | 46 +++++++++++ src/HYDROGUI/HYDROGUI_Shape.cxx | 31 ++------ src/HYDROGUI/HYDROGUI_Tool.h | 4 + src/HYDRO_tests/CMakeLists.txt | 2 + src/HYDRO_tests/ExternalFiles.cmake | 2 + src/HYDRO_tests/TestViewer.cxx | 4 +- src/HYDRO_tests/TestViewer.h | 2 + .../reference_data/Shape_preview_im_zone.png | Bin 0 -> 7232 bytes src/HYDRO_tests/test_HYDROGUI_Shape.cxx | 46 +++++++++++ src/HYDRO_tests/test_HYDROGUI_Shape.h | 32 ++++++++ 12 files changed, 218 insertions(+), 27 deletions(-) create mode 100644 src/HYDROGUI/HYDROGUI_AISShape.cxx create mode 100644 src/HYDROGUI/HYDROGUI_AISShape.h create mode 100644 src/HYDRO_tests/reference_data/Shape_preview_im_zone.png create mode 100644 src/HYDRO_tests/test_HYDROGUI_Shape.cxx create mode 100644 src/HYDRO_tests/test_HYDROGUI_Shape.h diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt index 40a5fe2f..08c7da1f 100644 --- a/src/HYDROGUI/CMakeLists.txt +++ b/src/HYDROGUI/CMakeLists.txt @@ -4,6 +4,7 @@ include(../../CMake/UseQT4EXT.cmake) set(PROJECT_HEADERS HYDROGUI.h HYDROGUI_AbstractDisplayer.h + HYDROGUI_AISShape.h HYDROGUI_AISTrihedron.h HYDROGUI_BathymetryPrs.h HYDROGUI_CalculationDlg.h @@ -146,6 +147,7 @@ QT4_WRAP_CPP(PROJECT_HEADERS_MOC ${PROJECT_HEADERS}) set(PROJECT_SOURCES HYDROGUI_AbstractDisplayer.cxx + HYDROGUI_AISShape.cxx HYDROGUI_AISTrihedron.cxx HYDROGUI_BathymetryPrs.cxx HYDROGUI_CalculationDlg.cxx diff --git a/src/HYDROGUI/HYDROGUI_AISShape.cxx b/src/HYDROGUI/HYDROGUI_AISShape.cxx new file mode 100644 index 00000000..162e44cd --- /dev/null +++ b/src/HYDROGUI/HYDROGUI_AISShape.cxx @@ -0,0 +1,74 @@ +// Copyright (C) 2014-2015 EDF-R&D +// 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, or (at your option) any later version. +// +// 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 + +IMPLEMENT_STANDARD_HANDLE(HYDROGUI_AISShape, AIS_Shape) +IMPLEMENT_STANDARD_RTTIEXT(HYDROGUI_AISShape, AIS_Shape) + +HYDROGUI_AISShape::HYDROGUI_AISShape( const TopoDS_Shape& theShape ) + : AIS_Shape( theShape ), + myBorderColor( Quantity_NOC_BLACK ) +{ +} + +HYDROGUI_AISShape::~HYDROGUI_AISShape() +{ +} + +Quantity_Color HYDROGUI_AISShape::GetBorderColor() const +{ + return myBorderColor; +} + +void HYDROGUI_AISShape::SetBorderColor( const Quantity_Color& theBorderColor ) +{ + myBorderColor = theBorderColor; + Redisplay( Standard_True ); +} + +void HYDROGUI_AISShape::Compute( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode ) +{ + thePresentation->Clear(); + + myDrawer->FaceBoundaryAspect()->SetColor( myBorderColor ); + myDrawer->FreeBoundaryAspect()->SetColor( myBorderColor ); + myDrawer->UnFreeBoundaryAspect()->SetColor( myBorderColor ); + myDrawer->LineAspect()->SetColor( myBorderColor ); + myDrawer->SeenLineAspect()->SetColor( myBorderColor ); + myDrawer->WireAspect()->SetColor( myBorderColor ); + myDrawer->UIsoAspect()->SetColor( myBorderColor ); + myDrawer->VIsoAspect()->SetColor( myBorderColor ); + + switch( theMode ) + { + case AIS_WireFrame: + case AIS_Shaded: + AIS_Shape::Compute( thePresentationManager, thePresentation, theMode ); + break; + } + + if( theMode==AIS_Shaded ) + StdPrs_WFDeflectionShape::Add( thePresentation, Shape(), myDrawer ); +} diff --git a/src/HYDROGUI/HYDROGUI_AISShape.h b/src/HYDROGUI/HYDROGUI_AISShape.h new file mode 100644 index 00000000..7353dcb5 --- /dev/null +++ b/src/HYDROGUI/HYDROGUI_AISShape.h @@ -0,0 +1,46 @@ +// Copyright (C) 2014-2015 EDF-R&D +// 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, or (at your option) any later version. +// +// 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 +// + + +#ifndef HYDROGUI_AISSHAPE_H +#define HYDROGUI_AISSHAPE_H + +#include + +DEFINE_STANDARD_HANDLE(HYDROGUI_AISShape, AIS_Shape) + +class HYDROGUI_AISShape : public AIS_Shape +{ +public: + DEFINE_STANDARD_RTTI(HYDROGUI_AISShape); + + HYDROGUI_AISShape( const TopoDS_Shape& ); + virtual ~HYDROGUI_AISShape(); + + Quantity_Color GetBorderColor() const; + void SetBorderColor( const Quantity_Color& theBorderColor ); + + virtual void Compute( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode ); + +private: + Quantity_Color myBorderColor; +}; + +#endif diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx index 1feb96ab..133873a9 100644 --- a/src/HYDROGUI/HYDROGUI_Shape.cxx +++ b/src/HYDROGUI/HYDROGUI_Shape.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -33,10 +34,8 @@ #include #include -#include #include #include -#include #include #include #include @@ -500,7 +499,7 @@ Handle_AIS_InteractiveObject HYDROGUI_Shape::createShape() const if ( aShapeType==TopAbs_EDGE || aShapeType==TopAbs_WIRE || IsWireEdgeCompound) { return new HYDROGUI_Polyline( myTopoShape ); } else { - return new AIS_Shape( myTopoShape ); + return new HYDROGUI_AISShape( myTopoShape ); } } @@ -577,7 +576,7 @@ void HYDROGUI_Shape::updateShape( const bool theToDisplay, } // Coloring borders - colorShapeBorder( getActiveColor() ); + colorShapeBorder( myBorderColor ); } if ( !theToDisplay || !isVisible() || myContext.IsNull() ) @@ -658,27 +657,9 @@ void HYDROGUI_Shape::colorShapeBorder( const QColor& theColor ) } else if ( myDisplayMode == AIS_Shaded ) { - if ( theColor.alpha() == 0 ) - { - anAttributes->SetFaceBoundaryDraw( false ); - } - else - { - anAttributes->SetFaceBoundaryDraw( true ); - - Handle(Prs3d_LineAspect) aBoundaryAspect = anAttributes->FaceBoundaryAspect(); - if ( !aBoundaryAspect.IsNull() ) - { - aBoundaryAspect->SetColor( aBorderColor ); - anAttributes->SetFaceBoundaryAspect( aBoundaryAspect ); - } - Handle(Prs3d_LineAspect) aWireAspect = anAttributes->WireAspect(); - if ( !aWireAspect.IsNull() ) - { - aWireAspect->SetColor( aBorderColor ); - anAttributes->SetWireAspect( aWireAspect ); - } - } + Handle(HYDROGUI_AISShape) aShape = Handle(HYDROGUI_AISShape)::DownCast( myShape ); + if( !aShape.IsNull() ) + aShape->SetBorderColor( aBorderColor ); } else if ( myDisplayMode == AIS_WireFrame ) { diff --git a/src/HYDROGUI/HYDROGUI_Tool.h b/src/HYDROGUI/HYDROGUI_Tool.h index 4ea4039e..24563aa1 100644 --- a/src/HYDROGUI/HYDROGUI_Tool.h +++ b/src/HYDROGUI/HYDROGUI_Tool.h @@ -31,9 +31,11 @@ #include +#ifndef LIGHT_MODE // IDL includes #include #include CORBA_SERVER_HEADER(GEOM_Gen) +#endif class SUIT_ViewManager; class OCCViewer_ViewFrame; @@ -341,6 +343,7 @@ public: */ static Handle(Image_PixMap) Pixmap( const QImage& theImage ); +#ifndef LIGHT_MODE /** * \brief Get the selected GEOM objects. * \param theModule the module @@ -349,6 +352,7 @@ public: */ static QStringList GetSelectedGeomObjects( HYDROGUI_Module* theModule, QList theTypes ); +#endif /** * \brief Delete the GEOM objects. diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt index 167285a9..4762aafb 100644 --- a/src/HYDRO_tests/CMakeLists.txt +++ b/src/HYDRO_tests/CMakeLists.txt @@ -15,6 +15,7 @@ set(PROJECT_HEADERS test_HYDROData_ShapeFile.h test_HYDROData_StricklerTable.h test_HYDROGUI_ListModel.h + test_HYDROGUI_Shape.h test_Dependencies.h TestShape.h @@ -38,6 +39,7 @@ set(PROJECT_SOURCES test_HYDROData_ShapeFile.cxx test_HYDROData_StricklerTable.cxx test_HYDROGUI_ListModel.cxx + test_HYDROGUI_Shape.cxx test_Dependencies.cxx TestShape.cxx diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake index 7ccb5c26..9c245ce2 100644 --- a/src/HYDRO_tests/ExternalFiles.cmake +++ b/src/HYDRO_tests/ExternalFiles.cmake @@ -57,4 +57,6 @@ set( EXTERNAL_FILES ../HYDROGUI/HYDROGUI_DataObject.cxx ../HYDROGUI/HYDROGUI_LandCoverMapPrs.cxx ../HYDROGUI/HYDROGUI_Polyline.cxx + ../HYDROGUI/HYDROGUI_AISShape.cxx + ../HYDROGUI/HYDROGUI_Shape.cxx ) diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx index 70dbd6fa..52917a31 100644 --- a/src/HYDRO_tests/TestViewer.cxx +++ b/src/HYDRO_tests/TestViewer.cxx @@ -84,9 +84,9 @@ OCCViewer_ViewWindow* TestViewer::viewWindow() return myViewWindow; } -Handle(AIS_InteractiveContext) context() +Handle(AIS_InteractiveContext) TestViewer::context() { - return TestViewer::viewer()->getAISContext(); + return viewer()->getAISContext(); } QColor TestViewer::GetColor(int i) diff --git a/src/HYDRO_tests/TestViewer.h b/src/HYDRO_tests/TestViewer.h index d33885b0..9030f33b 100644 --- a/src/HYDRO_tests/TestViewer.h +++ b/src/HYDRO_tests/TestViewer.h @@ -24,6 +24,7 @@ class OCCViewer_ViewWindow; class TopoDS_Shape; class QString; class QColor; +class Handle_AIS_InteractiveContext; class Handle_AIS_InteractiveObject; class Handle_Aspect_ColorScale; @@ -33,6 +34,7 @@ public: static OCCViewer_ViewManager* viewManager(); static OCCViewer_Viewer* viewer(); static OCCViewer_ViewWindow* viewWindow(); + static Handle_AIS_InteractiveContext context(); static void eraseAll( bool isUpdate ); static void show( const Handle_AIS_InteractiveObject& theObject, diff --git a/src/HYDRO_tests/reference_data/Shape_preview_im_zone.png b/src/HYDRO_tests/reference_data/Shape_preview_im_zone.png new file mode 100644 index 0000000000000000000000000000000000000000..fd1d1233d2898dada0cdce6f6fb6df15143a1209 GIT binary patch literal 7232 zcmb7J2{_c-`#&=VUxXQZS!RY}6c_E3F~(Suq?Aw?OIJc9sYJfRWG@r4RhC;xUDc%0 zZNZd1DJ{29$x_zrLe~Eo>HezU@;v`}o*w6W&bxfx<-F&dw-_61b8*o{q5uH#4Hk^8 z00@u(z}h21a3&)t+#mkI9iVU6hQMD4;t>tMMf@!s4gerg#{Y*oy-Y$80L9h~4C8Hw z&-T7|%G>REgg1DISo!KyBzdvmPJBj6lSR36yo?Uk?xLw~*_H@5`jdEzh{EJu^%oQd z**4tcQjHh1H5W(dH4auVyfybe6eFk8@S3;kQ{-$#v`u%m=VFY0A9Fhz(0=x2$(ZA_ z$uE;m2dy`b_UU_X^W}_*z4Y+p4JH>)hs}_dyYEV3Eb)n1#PHt%hd?Vw1p?l zViYh{we%;v-&@EAs8mCNASdg1Dkd!m9F$rN2DNVaYzPFsgvFrkCbxjRGao&MNTDqb z77j@Rz~5vYuTLve%k_*bPt^^_TqkGMuGl%+Re4oGZJ#F}&b+I@shg`Zi@-Nl@s%6r0RzwUveANU|BaOKa`lcp``|mD46A z9?v~oxC?_X-G+;1?$^w?EDVmM#RB&mc`_SA04EENiTqtp^Q86;kX$*c#iYn_{(xv~ zsI~;Ayxd8*Xi3nm%0PYXbz@0XkeAx)z*E+u7EQ}~&|C^7r!OxXRbj7OldlyiC^R&c?~$|QT&KDsc-Xfr!VNtJK2wlV_QLh7nE5;~8rLSyqz;8|0nb6O}m zXOE0udV5o%@ORAfSF?6}%Ai~_CrbWZ1+?@QBbuhQlMB#m4Jm>*l4s2L>$`Kwx>TKO zx1prY<9OC!eYha-kN0)ZRoPx5_YzK?_Cgl)Z0pkiz@{K#4f&a~ep)0#s6Q@WXPHX` zyqpFGgUu^^Cx8W9R_RfbcSP)4oBoaI#{h^+kL0ym(Eup)ScE-e`&o=X*|S2N^(74j zU;%F>?)CW>9m}U7f#)J@TsnX9$x57@ZM#Mqq%74FXPxJ>n?ZK-%Y$kVE;^VNiHabA zrtlK4i@6&Ky@;<|$#y>Xcp3*Pbl2VJ=r|$HJO#_n*{2XF8zD@zFgI(aAEPO+j*H!D z-QMGOlPh6dVr9}9BVc%OF)e$+p91H5$3~3g{PpBKzpXfq9s?+nfUlP7L zp1t{xi2c!os`3=Ay|20+E~Rxwb&_6dndRTW*Fc`Y;A~NRV~3O8&~jPU9#ytuU@!+x zcr+TPmmv%S`BiqQz_yS&m6sCTu5ohlo7gt@BqXgdbVaLmd1o#o@zsj9$@!%bTTz=e z8nTUWE4%B7=P=GGb6O*UMI;+F7|aE#>=%JSx}x}Qwe_6|cvemf-tt8Qi$cqb8USRh zi4-~ckDC!Ts13CRQz=4Fh&`}iNoQxXG%@+veOqokWLW!wV{0y)337HdoeJNC5EQ}@ za_UJ50}TBLTlh0Qns<$X=m!S!MDUNv>zNjGTo9Qa{kr<0I+YT2T&2S8YLu`38p7oy zf!Yl*Q&xtga4*DXBO8A)DZ&cnq?#)KAwsB+9F`>*=<{&Mk+fjizSm*($p_@!dzyIx zLuAQ*Rbx#n6Q<%*_xOtu5tb;vW}Ugs(hh<8WW;rWvXYJU+OiuqCS8!k_NngzU!5^& z)XqLTM`$uBc~m1R$&z{6f%~jgIkN6yd7=o?R`5x5?{1jx17?aQUQ;9~VtkF;0&V|m z=t2E{J={(%jIHaQa-WSUz7E`sUi$^cC{M0T_*O*`nfn{z(KQ_6V-Z5DVIcV?Y_1pv ztB5Do3G6IjDyy=6R~;jNs-Q=NrG;L`6;d#8}%INRJdrH)dIPgFA zW7&N%lFUP@IHnVpeGLxRs^aAI1X~=j?0xX-F#IBrmGGp%4I!Y7K;}jx2R4K!P41N#2kp*mDA5wJ|J;7K!46Jti<EoW+x2xq$MGxHDAzFAP8qKVjKnn4=y+Fdj;6&jM89?n~@x|j&n*GiLV z`Z&b&z^pLPm9yonhfo3`6iNhN_|9C?Ab+A%2G>p?-@qZ|0g#S%ls{Jv=kx?))V|q; z1NZp8PYW;m?uS$FPzl}Dw)nJ48IKUYb_A00B|__~{(=$!-VD0ujg>J|#g;S3x0MtR za@JBYVx$aBqMU-<5$BUBQKRY8W@41>pVxs$j(%3urs< zFr-nVQDPIC1*>Xha0<{^fUZglUtj`PD`EKBpfJEyx8=NtDZ0qtCIF}RBwV1xm9 z1Ys~Sws`w88IPm$ped0$WE|L&1=myfv^T`P*L}AKFgNCs&PbC0Pqfe#Q_7bPa{vqS zp$qwhEB-}jo=fWC6K437VuSu=h!9ipbujb>7xR{jzUO;EAzHI)?>~GnXKET_7$u1%fGu709U@uC2zTWw)P*`yePDI76wq_ zeC;(>$w1ex_XF57{{RPS1>!xF?|$c}hgl4GRX(K#aC7o=cs`aW<}XQ{9W)Y# z@teN6h<+RD;>TFLrF{Z(f=S=y&213E=O`Qqem;3H0eV#EqgfzR|DSbyeuuC9cLm>c zDWoYrXU!SrQP&en`gw6KsZhdS1m!e7N}9T1Q}k~?p_~W2yt|i*|E`8-5hA1GpEwtA zSgxA9E<5;55-}k7l|5fbXmGHa9URR0@JE|eiFg5}B~W}eD0=sw^}r;jSn8~C!GIA< zzASR^;T6BgQXBT|WMOVj-O?&lq=*eK{&mE6Ggs!vx z4?I5v;=d1V9`J9ZTN|_5;jRFmzsXr7&Y7-mST@#vObRBl-U%UCdu&vH2>`#$0Gq#3 zic@I+u6+9*uMcXpu+d954=T+qv;Ln3|AN@&#E&q2_^JDAvi-vG6M|>r#s8ko_UAVfpeJE{F`2LF^VRrY;r}5M=7#iDjuTVf z0CoPSy3SS9Z-w@M4z1cS1xD$iM_0ojgjWc#?VivB!V)Ksz-q1dOQZz7eV5&v+q?5; z#<#j1`=+tj9H5#1O?7O$P#{1Hf8qg5#$-}MkR!TqUWZJLcqdF}#|J9#KJbg3^iz)S z`VoNgRbzkB65BQ-iM}3R9oWqI5myccp5=gl(E&7;W2pPLI$(g{vmR`Tvs*?4sEIPn zBTm*D9P1wd4@Z{)l=>6Of}7K#Ae#vH3euXyWjbk>7%!t$UHK$04}iu`KniY5i)Nem z39y>xr^#aQWr!|Dm3$^8c-Em$ z;B@lDkzqSjH`du1%JlhG3k*c?=iggEGM}e+7X?4xfZ|O+dt3d_DOaQLgkLhBp9JrSMm(^6sn&6hwCR^p<03i*50H zP6JnX;RUEK#FuT8OR7`FJgR_iU3f(Tu4=6UsC_Q!*40YyW%CB*U#+AI!)^|#P73qL z5x(mIeEL6=z(&9ppO+3zT)LQ^ZHHy^-`hYT3AD&U4ENH)Z7wxkziS|hk9)Pes011k z{d@}wK<}WC+AA}ZIf0>lVj!;=XrMK8RoVXDCA53(f`GOT!jgjxC@5nz8lT4kT^y*F zBoB>QSti2{I3j)63=OPcNz&l!J30R*=sIc)TQT6{YX@`$wt?zWi$4Ui6Gb=@u+cKH zm`;i6xnY96uwNnwOsLbdS7I-?@}2hr;h4b|2E5_Yov+oL?AE1e(Lo)tBaC7ig?T|e zEe?jG@e~&Diig@MQQkL`3WTc4hmy6SzCOSwl{j#C~Rgh)j7B;>-u!VW!p>E?+<+l?Vo+(NgejPo4Mlz3`71#HqE-> z4)gu7$= zci_W=;iv2TiUYe|^uOOdYk;Idcog*D$OFd|&~WsaUxvztmr4nSE)H?=0`kDp=JglME!B;v)xNX~)jduw zM9&&okPKg()HnNks-;NRi@W~r+FmkxMM<)V(Ii-rvJ6m8BP{Z9;i`{fNnVzky+y$~ z7fUE!iguRzatg4?n8!j`Ic%4azR-hy!SByp-}o}i>ZPR4tnMbib8?4U3}-6)m49=4 zBmlZw)PmEWDL(EI%R+ZeU;Q(wIxul`bX4?2LUP5i)Y713An)`BAZW-8fy4U^*!l^|#x39{p zYE%~RUv{ZT*SYcfv!J1VCU$dQ0Kn2*7#7cPRqe3Q@}4p*63Qxr3PK2EK-(E&AO~v( zY=zO;BV{A*{OdkbR~2Vh9VA&b?3p>6suMO*LtHoBAin0Ef7`(~PGc*GU#rYBm41(~&lIU&t2a}>@B}0u%(j-t%^G}c!+^guF8JmW@9UrL zVUAnjg8=sJ$(*h2;7F~v^MQ%Ru&|lotl4vV zDjnzgLpq-I!e40DMwf}}k|E6kVH2mXhkUYiUoQb*ljMS3F0r&4Ps++D4r%MZR5H_k zC$pr#cy{uw_w1UaYL7Of?j2*Jxh`o|xivF>d>_8ipbo}dCr(W|^#{L+kk@gZ8pur$ z1l)Cmt%`$s`C7!%$)>U5mZ2W!v72vP?u`_8JT2`oY)Q>$9~lFU|TS&A#?9 z@J^WB;59K#oTg0o2WA|b?*4m+1P9_>7dG}{qt0~O{SVW9Sz+zzo-->hCaWCzcW2?k6=~kpKR4q+xw~08-EOLRgxEjgazFUX-ia0{ zI1v6F-Fz&uc+I)o549s*&H$Vl4ka&HF|FWSsH3{xzpX~6e?)ltOtr^EQP;}QZGix6 zAG&z_q7<=hKui!&!nGYP5=h_1v0fG;WtE4gwqii6`=Z38afKbDesp2by!Jz;_5EaJ zKzr^}9qTcnM=jX}(AI`TS>uqh0Wl$v7wJ`HUuLdU;sIc9BXYr}kg~@!rfhgPy9MQh zjK<<~tSu!$_TIwXy^luJGF?^!+7~O6LNaw|Kuj3yiNrgkj#pLcD1&VM!rj_x)S;m` zIGyNKwLj{EmJT&ws0My!;5SsiI=^@Z-npGR*D%V=9j3?t+5#2?%^~Dsdn$%ZLR3*Uw<#l1e8< wO$~vzvan}g_PS3QV*nE5djVMh=6-v}X0`Vyr=iN9AMw98m|8Qg(V5}@2i`hlQUCw| literal 0 HcmV?d00001 diff --git a/src/HYDRO_tests/test_HYDROGUI_Shape.cxx b/src/HYDRO_tests/test_HYDROGUI_Shape.cxx new file mode 100644 index 00000000..e99db415 --- /dev/null +++ b/src/HYDRO_tests/test_HYDROGUI_Shape.cxx @@ -0,0 +1,46 @@ +// Copyright (C) 2014-2015 EDF-R&D +// 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, or (at your option) any later version. +// +// 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 +// + +#undef HYDROGUI_EXPORTS + +#include +#include +#include +#include +#include + +void test_HYDROGUI_Shape::test_face_in_preview() +{ + TopoDS_Face aFace = Face( QList() << 21 << 34 << 24 << 25 << 37 << 37 << 40 << 61 << + 44 << 95 << 85 << 100 << 104 << 66 << 107 << 33 << + 128 << 18 << 140 << 50 << 131 << 89 << 104 << 111 << + 31 << 114 ); + + Handle_AIS_InteractiveContext aContext = TestViewer::context(); + Handle_HYDROData_Entity anEntity; //it should be null as in preview + + HYDROGUI_Shape* aPreview = new HYDROGUI_Shape( aContext, anEntity ); + aPreview->setFace( aFace, true, true, "" ); + aPreview->setFillingColor( Qt::red, false, false ); + aPreview->setBorderColor( Qt::darkBlue, false, false ); + + TestViewer::show( aPreview->getAISObject(), AIS_Shaded, 0, true, "Shape_preview_im_zone" ); + CPPUNIT_ASSERT_IMAGES + + delete aPreview; +} diff --git a/src/HYDRO_tests/test_HYDROGUI_Shape.h b/src/HYDRO_tests/test_HYDROGUI_Shape.h new file mode 100644 index 00000000..a4d2942d --- /dev/null +++ b/src/HYDRO_tests/test_HYDROGUI_Shape.h @@ -0,0 +1,32 @@ +// Copyright (C) 2014-2015 EDF-R&D +// 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, or (at your option) any later version. +// +// 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 + +class test_HYDROGUI_Shape : public CppUnit::TestFixture +{ + CPPUNIT_TEST_SUITE(test_HYDROGUI_Shape); + CPPUNIT_TEST(test_face_in_preview); + CPPUNIT_TEST_SUITE_END(); + +public: + void test_face_in_preview(); +}; + +CPPUNIT_TEST_SUITE_REGISTRATION(test_HYDROGUI_Shape); +CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_HYDROGUI_Shape, "HYDROGUI_Shape"); -- 2.39.2