X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROGUI%2FHYDROGUI_OCCDisplayer.cxx;h=de674e8b413e1688fcd0962af2b346c3449ba316;hb=6eed8444c3fc377ad0bf2fdd536ffc4657dad034;hp=b7505b0c0d19a980056972e8ba9df22c9b1ffa2a;hpb=64b1c61587fc5a975a06821be9e85e524d4dd2e4;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx index b7505b0c..de674e8b 100644 --- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx +++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx @@ -27,6 +27,7 @@ #include "HYDROGUI_Operation.h" #include "HYDROGUI_DataObject.h" #include "HYDROGUI_ZLayers.h" +#include "HYDROGUI_Polyline.h" #include #include @@ -36,8 +37,7 @@ #include #include #include - -#include +#include #include @@ -163,12 +163,12 @@ HYDROGUI_Shape* HYDROGUI_OCCDisplayer::createShape( const int return aResShape; if( theObject->IsKind( STANDARD_TYPE( HYDROData_Image ) ) ) - aResShape = new HYDROGUI_ShapeImage( theContext, Handle_HYDROData_Image::DownCast( theObject ) ); + aResShape = new HYDROGUI_ShapeImage( theContext, Handle(HYDROData_Image)::DownCast( theObject ) ); else if( theObject->IsKind( STANDARD_TYPE( HYDROData_Bathymetry ) ) ) - aResShape = new HYDROGUI_ShapeBathymetry( this, theContext, Handle_HYDROData_Bathymetry::DownCast( theObject ) ); + aResShape = new HYDROGUI_ShapeBathymetry( this, theContext, Handle(HYDROData_Bathymetry)::DownCast( theObject ) ); else if( theObject->IsKind( STANDARD_TYPE( HYDROData_LandCoverMap ) ) ) { bool isScalarMode = module()->isLandCoversScalarMapModeOn( theViewerId ); - aResShape = new HYDROGUI_ShapeLandCoverMap( this, theContext, Handle_HYDROData_LandCoverMap::DownCast( theObject ), -1, isScalarMode ); + aResShape = new HYDROGUI_ShapeLandCoverMap( this, theContext, Handle(HYDROData_LandCoverMap)::DownCast( theObject ), -1, isScalarMode ); } else aResShape = new HYDROGUI_Shape( theContext, theObject ); @@ -294,7 +294,7 @@ void HYDROGUI_OCCDisplayer::Display( const HYDROData_SequenceOfObjects& theObjs, } } else if ( !aCtx.IsNull() ) { // TODO: determine if this code is necessary (added as a fix for issue# 359) - aCtx->UpdateSelected(); + aCtx->UpdateSelected(true); } UpdateColorScale( aViewer ); @@ -325,6 +325,7 @@ void HYDROGUI_OCCDisplayer::purgeObjects( const int theViewerId ) if ( !anOwnerObj.IsNull() && anOwnerObj->IsRemoved() ) module()->removeObjectShape( (size_t)aViewer, anOwnerObj ); } + UpdateColorScale( aViewer ); } QString HYDROGUI_OCCDisplayer::GetType() const @@ -399,8 +400,11 @@ void HYDROGUI_OCCDisplayer::SetZLayer( const OCCViewer_Viewer* theViewer, HYDROGUI_Shape* anObjShape = module()->getObjectShape( aViewerId, theObject ); // Set Z layer - if ( anObjShape ) { - aCtx->SetZLayer( anObjShape->getAISObject(), theZLayerId ); + if ( anObjShape ) + { + QList shapes = anObjShape->getAISObjects(); + foreach( Handle(AIS_InteractiveObject) shape, shapes ) + aCtx->SetZLayer( shape, theZLayerId ); } } @@ -417,21 +421,33 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer OCCViewer_ViewWindow* aWnd = dynamic_cast( theViewer->getViewManager()->getActiveView() ); Handle(V3d_View) aView = aWnd->getViewPort()->getView(); + + HYDROGUI_Module* aModule = module(); int aViewerId = (size_t)theViewer;//TODO: check if viewer id is correct - bool isLandCoverColoringOn = module()->isLandCoversScalarMapModeOn( aViewerId ); + bool isLandCoverColoringOn = aModule->isLandCoversScalarMapModeOn( aViewerId ); - QList aLandCoverMapShapes = module()->getObjectShapes( aViewerId, KIND_LAND_COVER_MAP ); - QList aBathShapes = module()->getObjectShapes( aViewerId, KIND_BATHYMETRY ); - - bool isDisplayColorScale = !aBathShapes.empty() || isLandCoverColoringOn; - Standard_Real anXPos = 0.05; //TODO - Standard_Real anYPos = 0.1; //TODO - Standard_Real aWidth = 0.2; //TODO - Standard_Real aHeight = 0.5; //TODO - Standard_Integer aTextHeight = 14; //TODO - Standard_Integer aNbIntervals = 20; //TODO - TCollection_ExtendedString aColorScaleTitle = "";//TODO + QList aLandCoverMapShapes = aModule->getObjectShapes( aViewerId, KIND_LAND_COVER_MAP ); + QList aBathShapes = aModule->getObjectShapes( aViewerId, KIND_BATHYMETRY ); + bool isDisplayColorScale = false; + foreach (HYDROGUI_Shape* shape, aLandCoverMapShapes) + { + if (aModule->isObjectVisible(aViewerId, shape->getObject())) + { + isDisplayColorScale = true; + break; + } + } + if (!isDisplayColorScale) + foreach (HYDROGUI_Shape* shape, aBathShapes) + { + if (aModule->isObjectVisible(aViewerId, shape->getObject())) + { + isDisplayColorScale = true; + break; + } + } + Standard_Real aColorScaleMin = 0, aColorScaleMax = 1; // Get range @@ -465,22 +481,20 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer } } - Handle(Aspect_ColorScale) aColorScale; + Handle(AIS_ColorScale) aColorScale = GetColorScale( aViewerId ); + Handle(AIS_InteractiveContext) aCtx = theViewer->getAISContext(); if( isDisplayColorScale ) { - aColorScale = aView->ColorScale(); if( !aColorScale.IsNull() ) { - aColorScale->SetXPosition( anXPos ); - aColorScale->SetYPosition( anYPos ); - aColorScale->SetWidth( aWidth ); - aColorScale->SetHeight( aHeight ); - - aColorScale->SetTextHeight( aTextHeight ); - aColorScale->SetNumberOfIntervals( aNbIntervals ); - + // Set color scale title + TCollection_ExtendedString aColorScaleTitle = ""; //TODO aColorScale->SetTitle( aColorScaleTitle ); + + // Set color scale range aColorScale->SetRange( aColorScaleMin, aColorScaleMax ); + + aColorScale->SetToUpdate(); if ( !isLandCoverColoringOn ) { foreach( HYDROGUI_Shape* aShape, aBathShapes ) { @@ -491,14 +505,21 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer aBathShape->UpdateWithColorScale( aColorScale ); } } + + if ( !aCtx.IsNull()/* && !aCtx->IsDisplayed( aColorScale ) */) { + if ( !aCtx->IsDisplayed( aColorScale ) ) { + aCtx->Display( aColorScale, Standard_False ); + } + + aCtx->Update( aColorScale, true ); + } } - if( !aView->ColorScaleIsDisplayed() ) - aView->ColorScaleDisplay(); } else { - if( aView->ColorScaleIsDisplayed() ) - aView->ColorScaleErase(); + if ( !aCtx.IsNull() && aCtx->IsDisplayed( aColorScale ) ) { + aCtx->Erase( aColorScale, true ); + } } foreach( HYDROGUI_Shape* aShape, aLandCoverMapShapes ) { @@ -520,9 +541,72 @@ void HYDROGUI_OCCDisplayer::UpdateColorScale( const OCCViewer_Viewer* theViewer if( isScalarMode != isLandCoverColoringOn ) { aLandCoverMapShape->setScalarMapModeEnabled( isLandCoverColoringOn ); - theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObject() ); + theViewer->getAISContext()->Redisplay( aLandCoverMapShape->getAISObjects()[0], Standard_False ); } } myToUpdateColorScale = false; } + +Handle(AIS_ColorScale) HYDROGUI_OCCDisplayer::GetColorScale( const int theViewerId ) +{ + Handle(AIS_ColorScale) aColorScale; + + aColorScale = myColorScales.value( theViewerId, aColorScale ); + if ( aColorScale.IsNull() ) { + // Create color scale + aColorScale = new AIS_ColorScale(); + + // Set properties + Standard_Integer anXPos = 50; //TODO + Standard_Integer anYPos = 100; //TODO + Standard_Integer aWidth = 100; //TODO + Standard_Integer aHeight = 350; //TODO + + Standard_Integer aTextHeight = 14; //TODO + Standard_Integer aNbIntervals = 20; //TODO + + aColorScale->SetTransformPersistence( Graphic3d_TMF_2d, gp_Pnt( -1, -1, 0 ) ); + + aColorScale->SetXPosition( anXPos ); + aColorScale->SetYPosition( anYPos ); + aColorScale->SetSize( aWidth, aHeight ); + + aColorScale->SetTextHeight( aTextHeight ); + aColorScale->SetNumberOfIntervals( aNbIntervals ); + + // Put into the map + myColorScales.insert( theViewerId, aColorScale ); + } + + return aColorScale; +} + +void HYDROGUI_OCCDisplayer::UpdatePolylines( int theViewerId, int theType, int theSize ) +{ + OCCViewer_Viewer* aViewer = module()->getOCCViewer( theViewerId ); + if( !aViewer ) + return; + + // Get interactive context + Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); + if( aCtx.IsNull() ) + return; + + AIS_ListOfInteractive objs; + aCtx->DisplayedObjects( objs ); + AIS_ListOfInteractive::const_iterator it = objs.begin(), last = objs.end(); + for( ; it!=last; it++ ) + { + Handle(HYDROGUI_Arrow) arr = Handle(HYDROGUI_Arrow)::DownCast( *it ); + if( !arr.IsNull() ) + { + if( theType>=0 ) + arr->SetType( (HYDROGUI_Arrow::Type)theType ); + if( theSize>=0 ) + arr->SetSize( theSize ); + aCtx->Redisplay( arr, Standard_False ); + } + } + aCtx->UpdateCurrentViewer(); +}