#include "HYDROGUI_Module.h"
#include "HYDROGUI_VTKPrs.h"
#include "HYDROGUI_VTKPrsBathymetryDriver.h"
+#include "HYDROGUI_VTKPrsShapeDriver.h"
#include "HYDROGUI_Tool.h"
#include "HYDROData_Tool.h"
#define SATURATION_END 1.0
HYDROGUI_VTKPrsDisplayer::HYDROGUI_VTKPrsDisplayer( HYDROGUI_Module* theModule )
-: HYDROGUI_AbstractDisplayer( theModule ), myDriver( NULL )
+: HYDROGUI_AbstractDisplayer( theModule ), myDriver( NULL ), myShapeDriver( NULL )
{
}
{
aViewer->EraseAll( true );
module()->removeViewVTKPrs( (size_t)aViewer );
+ EraseScalarBar( theViewerId );
}
}
-void HYDROGUI_VTKPrsDisplayer::DeleteScalarBar( const int theViewerId )
+void HYDROGUI_VTKPrsDisplayer::EraseScalarBar( const int theViewerId, const bool theIsDelete )
{
SVTK_Viewer* aViewer = module()->getVTKViewer( theViewerId );
if( aViewer )
}
}
}
- myScalarBars.remove( (size_t)aViewer );
+ if ( theIsDelete )
+ {
+ myScalarBars.remove( (size_t)aViewer );
+ }
}
}
}
int anInvalidZ = HYDROGUI_VTKPrs::InvalidZValue();
bool isChanged = false;
+ bool isScalarBarNeeded = false;
HYDROGUI_VTKPrs* aPrs;
for ( int i = 1, n = theObjs.Length(); i <= n; i++ )
{
bool anIsInserted = ( aPrs != 0 );
if( anIsVisible && ( !aPrs || aPrs->getIsToUpdate() || theIsForced ) )
{
+ // 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 )
{
if ( anIsVisible )
{
-
- // 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 ) )
+ if ( aPrs->needScalarBar() )
{
- aGlobalRange[1] = aRange[1];
- anIsUpdate = true;
- }
-
- if ( anIsUpdate )
- {
- module()->updateVTKZRange( (size_t)aViewer, 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
if ( aView )
{
- if ( isChanged && aScalarBar )
+ if ( isChanged && isScalarBarNeeded && aScalarBar )
{
// Show colors legend bar
aView->getRenderer()->AddActor2D( aScalarBar );
}
else if ( isChanged )
{
- aView->Repaint();
+ aView->Repaint( true );
}
}
}
}
aDriver = myDriver;
}
+ else
+ {
+ if ( !myShapeDriver )
+ {
+ myShapeDriver = new HYDROGUI_VTKPrsShapeDriver( myScalarBars[ theViewId ] );
+ }
+ aDriver = myShapeDriver;
+ }
return aDriver;
}