X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOCCViewer%2FOCCViewer_ViewModel.cxx;h=ae9e8639f91e23d97a48391bcf5ddd38a1fdce86;hb=ba89da1b1663a9ae63a39595e58ef5281f1179f7;hp=366d3bb0cc53954d530318213857a9872fda4120;hpb=02904c3728214667f919cfe06072a91e1687b12f;p=modules%2Fgui.git diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx index 366d3bb0c..ae9e8639f 100755 --- a/src/OCCViewer/OCCViewer_ViewModel.cxx +++ b/src/OCCViewer/OCCViewer_ViewModel.cxx @@ -26,6 +26,7 @@ #include "OCCViewer_VService.h" #include "OCCViewer_ViewPort3d.h" #include "OCCViewer_ClippingDlg.h" +#include "OCCViewer_Utilities.h" #include "SUIT_ViewWindow.h" #include "SUIT_ViewManager.h" @@ -35,6 +36,8 @@ #include "ViewerData_AISShape.hxx" +#include + #include "QtxActionToolMgr.h" #include "QtxBackgroundTool.h" @@ -54,6 +57,9 @@ #include #include +#include +#include + #include #include #include @@ -62,10 +68,6 @@ #include - -// VSR: Uncomment below line to allow texture background support in OCC viewer -#define OCC_ENABLE_TEXTURED_BACKGROUND - /*! Get data for supported background modes: gradient types, identifiers and supported image formats */ @@ -79,11 +81,7 @@ QString OCCViewer_Viewer::backgroundData( QStringList& gradList, QIntList& idLis Diagonal1Gradient << Diagonal2Gradient << Corner1Gradient << Corner2Gradient << Corner3Gradient << Corner4Gradient; -#if OCC_VERSION_LARGE > 0x06050200 // enabled since OCCT 6.5.3, since in previous version this functionality is buggy -#ifdef OCC_ENABLE_TEXTURED_BACKGROUND txtList << Qtx::CenterTexture << Qtx::TileTexture << Qtx::StretchTexture; -#endif -#endif return tr("BG_IMAGE_FILES"); } @@ -104,18 +102,8 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron) //myV3dViewer->Init(); // to avoid creation of the useless perspective view (see OCCT issue 0024267) myV3dViewer->SetDefaultLights(); -#if OCC_VERSION_LARGE <= 0x06060000 // Porting to OCCT higher 6.6.0 version - myV3dCollector = OCCViewer_VService::CreateViewer( TCollection_ExtendedString("Collector3d").ToExtString() ); - //myV3dCollector->Init(); // to avoid creation of the useless perspective view (see OCCT issue 0024267) - myV3dCollector->SetDefaultLights(); -#endif - // init selector -#if OCC_VERSION_LARGE <= 0x06060000 - myAISContext = new AIS_InteractiveContext( myV3dViewer, myV3dCollector ); -#else myAISContext = new AIS_InteractiveContext( myV3dViewer ); -#endif myAISContext->SelectionColor( Quantity_NOC_WHITE ); // display isoline on planar faces (box for ex.) @@ -162,9 +150,6 @@ OCCViewer_Viewer::~OCCViewer_Viewer() { myAISContext.Nullify(); myV3dViewer.Nullify(); -#if OCC_VERSION_LARGE <= 0x06060000 - myV3dCollector.Nullify(); -#endif } /*! @@ -411,10 +396,8 @@ void OCCViewer_Viewer::onViewMapped(OCCViewer_ViewPort3d* viewPort) int OCCViewer_Viewer::getTopLayerId() { -#if OCC_VERSION_LARGE > 0x06050200 if ( myTopLayerId == 0 && !myAISContext->CurrentViewer().IsNull() ) myAISContext->CurrentViewer()->AddZLayer( myTopLayerId ); -#endif return myTopLayerId; } @@ -727,15 +710,6 @@ bool OCCViewer_Viewer::isInViewer( const Handle(AIS_InteractiveObject)& obj, AIS_ListOfInteractive List; myAISContext->DisplayedObjects(List); -#if OCC_VERSION_LARGE <= 0x06060000 - if( !onlyInViewer ) - { - AIS_ListOfInteractive List1; - myAISContext->ObjectsInCollector(List1); - List.Append(List1); - } -#endif - AIS_ListIteratorOfListOfInteractive ite(List); for ( ; ite.More(); ite.Next() ) if( ite.Value()==obj ) @@ -984,7 +958,17 @@ double OCCViewer_Viewer::computeSceneSize(const Handle(V3d_View)& view3d) const double aMaxSide = 0; double Xmin = 0, Ymin = 0, Zmin = 0, Xmax = 0, Ymax = 0, Zmax = 0; +#if OCC_VERSION_LARGE > 0x06070100 + Bnd_Box aBox = view3d->View()->MinMaxValues(); + Xmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X(); + Ymin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y(); + Zmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Z(); + Xmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X(); + Ymax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y(); + Zmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z(); +#else view3d->View()->MinMaxValues( Xmin, Ymin, Zmin, Xmax, Ymax, Zmax ); +#endif if ( Xmin != RealFirst() && Ymin != RealFirst() && Zmin != RealFirst() && Xmax != RealLast() && Ymax != RealLast() && Zmax != RealLast() ) @@ -1031,7 +1015,29 @@ void OCCViewer_Viewer::setSelectionOptions( bool isPreselectionEnabled, bool isS } } - +/*! + Creates clipping plane based on the incoming plane +*/ +Handle(Graphic3d_ClipPlane) OCCViewer_Viewer::createClipPlane(const gp_Pln& thePlane, const Standard_Boolean theIsOn) +{ + Handle(Graphic3d_ClipPlane) aGraphic3dPlane = new Graphic3d_ClipPlane( thePlane ); + aGraphic3dPlane->SetOn( theIsOn ); + aGraphic3dPlane->SetCapping( Standard_True ); + + // load capping texture + QPixmap px( ":images/hatch.png" ); + if( !px.isNull() ) { + const Handle(Image_PixMap) aPixmap = OCCViewer_Utilities::imageToPixmap( px.toImage() ); + Handle(Graphic3d_Texture2Dmanual) aTexture = new Graphic3d_Texture2Dmanual( aPixmap ); + if( aTexture->IsDone() ) { + aTexture->EnableModulate(); + aTexture->EnableRepeat(); + aTexture->GetParams()->SetScale( Graphic3d_Vec2( 0.01, 0.01 ) ); + aGraphic3dPlane->SetCappingTexture( aTexture ); + } + } + return aGraphic3dPlane; +} /*! Applies clipping planes to clippable objects */ @@ -1053,10 +1059,7 @@ void OCCViewer_Viewer::setClipPlanes(ClipPlanesList theList) gp_Pnt anOrigin( aPlane.X, aPlane.Y, aPlane.Z ); gp_Dir aDirection( aDx, aDy, aDz ); - Handle(Graphic3d_ClipPlane) aGraphic3dPlane = new Graphic3d_ClipPlane( gp_Pln( anOrigin, aDirection ) ); - aGraphic3dPlane->SetOn( aPlane.IsOn ); - - myInternalClipPlanes.Append( aGraphic3dPlane ); + myInternalClipPlanes.Append( createClipPlane( gp_Pln( anOrigin, aDirection ), aPlane.IsOn ) ); myClipPlanes.push_back( aPlane ); }