X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_VTKPrsDisplayer.cxx;h=b096a067269bf316943b42c05495e80ab8ce7197;hb=637f41bd30ce380b1e9c4c100b394be08fdc5ef7;hp=c22b85aa109063e89126a51f7466bf6ee356ad8c;hpb=1be319b4746139ab2f4898ae00cd2a53b318c1f3;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.cxx index c22b85aa..b096a067 100644 --- a/src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.cxx +++ b/src/HYDROGUI/HYDROGUI_VTKPrsDisplayer.cxx @@ -26,6 +26,7 @@ #include "HYDROGUI_Module.h" #include "HYDROGUI_VTKPrs.h" #include "HYDROGUI_VTKPrsBathymetryDriver.h" +#include "HYDROGUI_VTKPrsShapeDriver.h" #include "HYDROGUI_Tool.h" #include "HYDROData_Tool.h" @@ -39,6 +40,7 @@ #include #include +#include #include #include @@ -52,24 +54,14 @@ //#define SATURATION_START 1.0 //#define SATURATION_END 0.4 -#define HUE_START 0.7 -#define HUE_END 0.0 +#define HUE_START 0.7 +#define HUE_END 0.0 #define SATURATION_START 1.0 #define SATURATION_END 1.0 HYDROGUI_VTKPrsDisplayer::HYDROGUI_VTKPrsDisplayer( HYDROGUI_Module* theModule ) -: HYDROGUI_AbstractDisplayer( theModule ), myDriver( NULL ) +: HYDROGUI_AbstractDisplayer( theModule ), myDriver( NULL ), myShapeDriver( NULL ) { - // The invalid value is used to identify the case when the table range is not initialized yet. - double anInvalidValue = HYDROGUI_VTKPrs::InvalidZValue(); - vtkLookupTable* aTable = vtkLookupTable::New(); - aTable->SetHueRange( HUE_START, HUE_END ); - aTable->SetSaturationRange( SATURATION_START, SATURATION_END ); - aTable->SetTableRange( anInvalidValue, anInvalidValue ); - aTable->SetValueRange( 1.0, 1.0 ); - aTable->SetAlphaRange( 1.0, 1.0 ); - aTable->SetNumberOfColors( NB_COLORS ); - myScalarBar->SetLookupTable( aTable ); } HYDROGUI_VTKPrsDisplayer::~HYDROGUI_VTKPrsDisplayer() @@ -105,6 +97,35 @@ void HYDROGUI_VTKPrsDisplayer::EraseAll( const int theViewerId ) { aViewer->EraseAll( true ); module()->removeViewVTKPrs( (size_t)aViewer ); + EraseScalarBar( theViewerId ); + } +} + +void HYDROGUI_VTKPrsDisplayer::EraseScalarBar( const int theViewerId, const bool theIsDelete ) +{ + SVTK_Viewer* aViewer = module()->getVTKViewer( theViewerId ); + if( aViewer ) + { + if ( myScalarBars.contains( (size_t)aViewer ) ) + { + SUIT_ViewManager* aViewMgr = dynamic_cast( aViewer->getViewManager() ); + if ( aViewMgr && aViewMgr->getViewsCount() > 0 ) + { + SVTK_ViewWindow* aView = dynamic_cast( aViewMgr->getActiveView() ); + if ( aView ) + { + vtkScalarBarActor* aScalarBar = myScalarBars[ (size_t)aViewer ]; + if ( aView->getRenderer()->HasViewProp( aScalarBar ) ) + { + aView->getRenderer()->RemoveActor2D( aScalarBar ); + } + } + } + if ( theIsDelete ) + { + myScalarBars.remove( (size_t)aViewer ); + } + } } } @@ -142,23 +163,31 @@ void HYDROGUI_VTKPrsDisplayer::Display( const HYDROData_SequenceOfObjects& theOb SVTK_Viewer* aViewer = module()->getVTKViewer( theViewerId ); if( aViewer ) { - // Invalidate global Z range - double anInvalidRange[2] = { HYDROGUI_VTKPrs::InvalidZValue(), HYDROGUI_VTKPrs::InvalidZValue() }; - SetZRange( anInvalidRange ); // Hide colors legend bar SVTK_ViewWindow* aView = dynamic_cast( aViewer->getViewManager()->getActiveView() ); + vtkScalarBarActor* aScalarBar = 0; if ( aView ) { - if ( aView->getRenderer()->HasViewProp( myScalarBar.GetPointer() ) ) + if ( !myScalarBars.contains( (size_t)aViewer ) ) + { + createScalarBar( (size_t)aViewer ); + } + aScalarBar = myScalarBars[ (size_t)aViewer ]; + + if ( aView->getRenderer()->HasViewProp( aScalarBar ) ) { - aView->getRenderer()->RemoveActor2D( myScalarBar.GetPointer() ); + aView->getRenderer()->RemoveActor2D( aScalarBar ); } } + // Invalidate global Z range + double anInvalidRange[2] = { HYDROGUI_VTKPrs::InvalidZValue(), HYDROGUI_VTKPrs::InvalidZValue() }; + SetZRange( (size_t)aViewer, anInvalidRange ); int anInvalidZ = HYDROGUI_VTKPrs::InvalidZValue(); bool isChanged = false; + bool isScalarBarNeeded = false; HYDROGUI_VTKPrs* aPrs; for ( int i = 1, n = theObjs.Length(); i <= n; i++ ) { @@ -171,7 +200,13 @@ void HYDROGUI_VTKPrsDisplayer::Display( const HYDROData_SequenceOfObjects& theOb bool anIsInserted = ( aPrs != 0 ); if( anIsVisible && ( !aPrs || aPrs->getIsToUpdate() || theIsForced ) ) { - if( HYDROGUI_VTKPrsDriver* aDriver = getDriver( anObj ) ) + // Erase the presentation in the view because of the problem with GEOM_Actor upadting on second SetShape. + if ( aPrs ) + { + aViewer->Erase( aPrs, true ); + } + // Update the presentation + if( HYDROGUI_VTKPrsDriver* aDriver = getDriver( (size_t)aViewer, anObj ) ) { if( aDriver->Update( anObj, aPrs ) && aPrs && !anIsInserted ) { @@ -184,28 +219,31 @@ void HYDROGUI_VTKPrsDisplayer::Display( const HYDROData_SequenceOfObjects& theOb { if ( anIsVisible ) { - - // Extend the global Z range if necessary - double* aGlobalRange = GetZRange(); - double* aRange = aPrs->getInternalZRange(); - bool anIsUpdate = false; - if ( aRange[0] < aGlobalRange[0] || ValuesEquals( aGlobalRange[0], anInvalidZ ) ) + if ( aPrs->needScalarBar() ) { - aGlobalRange[0] = aRange[0]; - anIsUpdate = true; - } - if ( aRange[1] > aGlobalRange[1] || ValuesEquals( aGlobalRange[1], anInvalidZ ) ) - { - aGlobalRange[1] = aRange[1]; - anIsUpdate = true; - } - - if ( anIsUpdate ) - { - module()->updateVTKZRange( aGlobalRange ); + // Extend the global Z range if necessary + double* aGlobalRange = GetZRange( (size_t)aViewer ); + double* aRange = aPrs->getInternalZRange(); + bool anIsUpdate = false; + if ( aRange[0] < aGlobalRange[0] || ValuesEquals( aGlobalRange[0], anInvalidZ ) ) + { + aGlobalRange[0] = aRange[0]; + anIsUpdate = true; + } + if ( aRange[1] > aGlobalRange[1] || ValuesEquals( aGlobalRange[1], anInvalidZ ) ) + { + aGlobalRange[1] = aRange[1]; + anIsUpdate = true; + } + + if ( anIsUpdate ) + { + module()->updateVTKZRange( (size_t)aViewer, aGlobalRange ); + } } aViewer->Display( aPrs ); + isScalarBarNeeded = isScalarBarNeeded || aPrs->needScalarBar(); } else @@ -217,35 +255,38 @@ void HYDROGUI_VTKPrsDisplayer::Display( const HYDROData_SequenceOfObjects& theOb } } - if ( isChanged ) + if ( aView ) { - // Show colors legend bar - if ( aView ) + if ( isChanged && isScalarBarNeeded && aScalarBar ) { - aView->getRenderer()->AddActor2D( myScalarBar.GetPointer() ); + // Show colors legend bar + aView->getRenderer()->AddActor2D( aScalarBar ); } - } - if ( theDoFitAll ) - { - // Repaint is done inside OnFitAll() - aViewer->getViewManager()->getActiveView()->onAccelAction( SUIT_Accel::ZoomFit ); - } - else if ( isChanged ) - { - aViewer->Repaint(); + // Refresh the view + if ( theDoFitAll ) + { + // Repaint is done inside OnFitAll() + aView->onAccelAction( SUIT_Accel::ZoomFit ); + } + else if ( isChanged ) + { + aView->Repaint( true ); + } } } } void HYDROGUI_VTKPrsDisplayer::purgeObjects( const int theViewerId ) { + bool doEraseScalarBar = false; + SVTK_Viewer* aViewer = module()->getVTKViewer( theViewerId ); if( aViewer ) { SALOME_ListIO aListIO; aViewer->GetVisible( aListIO ); - + HYDROGUI_VTKPrs* aPrs; SALOME_ListIteratorOfListIO anIter( aListIO ); for( ; anIter.More(); anIter.Next() ) @@ -255,21 +296,51 @@ void HYDROGUI_VTKPrsDisplayer::purgeObjects( const int theViewerId ) { Handle(HYDROData_Entity) anOwnerObj = module()->getDataModel()->objectByEntry( aPrsObj->getEntry() ); - if ( !anOwnerObj.IsNull() && anOwnerObj->IsRemoved() ) + if ( anOwnerObj.IsNull() ) + { + // We found an unknown IO presented in the viewer. + // Remove such an orphan presentation from all the views of the viewer. + SUIT_ViewManager* aViewMgr = dynamic_cast( aViewer->getViewManager() ); + if ( aViewMgr && aViewMgr->getViewsCount() > 0 ) + { + QVector aViews = aViewMgr->getViews(); + foreach ( SUIT_ViewWindow* aView, aViews ) + { + SVTK_ViewWindow* aVTKView = dynamic_cast( aView ); + if ( aVTKView ) + { + aVTKView->Erase( aPrsObj, false ); + } + } + } + // Remove the object presentation from the module's cache + module()->removeObjectVTKPrs( (size_t)aViewer, aPrsObj->getEntry() ); + doEraseScalarBar = true; + } + else if ( anOwnerObj->IsRemoved() ) { aPrs = module()->getObjectVTKPrs( (size_t)aViewer, anOwnerObj ); if ( aPrs ) { aViewer->Erase( aPrs ); } + else + { + } module()->removeObjectVTKPrs( (size_t)aViewer, anOwnerObj ); + doEraseScalarBar = true; } } } + + if ( doEraseScalarBar ) + { + EraseScalarBar( theViewerId ); + } } } -HYDROGUI_VTKPrsDriver* HYDROGUI_VTKPrsDisplayer::getDriver( const Handle(HYDROData_Entity)& theObj ) +HYDROGUI_VTKPrsDriver* HYDROGUI_VTKPrsDisplayer::getDriver( const int theViewId, const Handle(HYDROData_Entity)& theObj ) { HYDROGUI_VTKPrsDriver* aDriver = NULL; ObjectKind aKind = theObj->GetKind(); @@ -277,10 +348,18 @@ HYDROGUI_VTKPrsDriver* HYDROGUI_VTKPrsDisplayer::getDriver( const Handle(HYDRODa { if ( !myDriver ) { - myDriver = new HYDROGUI_VTKPrsBathymetryDriver( myScalarBar.GetPointer() ); + myDriver = new HYDROGUI_VTKPrsBathymetryDriver( myScalarBars[ theViewId ] ); } aDriver = myDriver; } + else + { + if ( !myShapeDriver ) + { + myShapeDriver = new HYDROGUI_VTKPrsShapeDriver( myScalarBars[ theViewId ] ); + } + aDriver = myShapeDriver; + } return aDriver; } @@ -290,12 +369,36 @@ QString HYDROGUI_VTKPrsDisplayer::GetType() const return SVTK_Viewer::Type(); } -void HYDROGUI_VTKPrsDisplayer::SetZRange( double theRange[] ) +void HYDROGUI_VTKPrsDisplayer::SetZRange( const int theViewId, double theRange[] ) +{ + myScalarBars[ theViewId ]->GetLookupTable()->SetRange( theRange ); +} + +double* HYDROGUI_VTKPrsDisplayer::GetZRange( const int theViewId ) const { - myScalarBar->GetLookupTable()->SetRange( theRange ); + return myScalarBars[ theViewId ]->GetLookupTable()->GetRange(); } -double* HYDROGUI_VTKPrsDisplayer::GetZRange() const +void HYDROGUI_VTKPrsDisplayer::createScalarBar( const int theViewId ) { - return myScalarBar->GetLookupTable()->GetRange(); -} \ No newline at end of file + if ( !myScalarBars.contains( theViewId ) ) + { + // The invalid value is used to identify the case when the table range is not initialized yet. + double anInvalidValue = HYDROGUI_VTKPrs::InvalidZValue(); + vtkLookupTable* aTable = vtkLookupTable::New(); + aTable->SetHueRange( HUE_START, HUE_END ); + aTable->SetSaturationRange( SATURATION_START, SATURATION_END ); + aTable->SetTableRange( anInvalidValue, anInvalidValue ); + aTable->SetValueRange( 1.0, 1.0 ); + aTable->SetAlphaRange( 1.0, 1.0 ); + aTable->SetNumberOfColors( NB_COLORS ); + aTable->Build(); + vtkSmartPointer aScalarBar = vtkScalarBarActor::New(); + aScalarBar->SetLookupTable( aTable ); + aScalarBar->SetNumberOfLabels( NB_COLORS * 0.75 ); + aScalarBar->SetWidth( aScalarBar->GetWidth() / 1.5 ); + aScalarBar->SetTextureGridWidth( aScalarBar->GetTextureGridWidth() * 4. ); + aTable->Delete(); + myScalarBars.insert( theViewId, aScalarBar ); + } +}