Fix for Bug GVIEW10346

Previews of Local coordinate system remain in VTK.
This commit is contained in:
apo 2006-01-12 07:47:38 +00:00
parent 96478dfdc2
commit e3949b7f11
2 changed files with 6 additions and 7 deletions

View File

@ -207,7 +207,6 @@ GEOM_VTKTrihedron::GEOM_VTKTrihedron()
{ {
myMapper = vtkPolyDataMapper::New(); myMapper = vtkPolyDataMapper::New();
myAxis[ 0 ] = myAxis[ 1 ] = myAxis[ 2 ] = 0; myAxis[ 0 ] = myAxis[ 1 ] = myAxis[ 2 ] = 0;
myPresent = vtkActorCollection::New();
mySize = 100; mySize = 100;
SetInfinitive( true ); SetInfinitive( true );
myColor[ 0 ] = myColor[ 1 ] = myColor[ 1 ] = -1; myColor[ 0 ] = myColor[ 1 ] = myColor[ 1 ] = -1;
@ -216,8 +215,6 @@ GEOM_VTKTrihedron::GEOM_VTKTrihedron()
GEOM_VTKTrihedron::~GEOM_VTKTrihedron() GEOM_VTKTrihedron::~GEOM_VTKTrihedron()
{ {
myPresent->RemoveAllItems();
myPresent->Delete();
for ( int i = 0; i < 3; i++ ) for ( int i = 0; i < 3; i++ )
myAxis[i]->Delete(); myAxis[i]->Delete();
@ -285,9 +282,12 @@ void GEOM_VTKTrihedron::AddToRender( vtkRenderer* theRenderer )
void GEOM_VTKTrihedron::RemoveFromRender( vtkRenderer* theRenderer ) void GEOM_VTKTrihedron::RemoveFromRender( vtkRenderer* theRenderer )
{ {
myPresent->InitTraversal(); for(int i = 0; i < 3; i++)
while(vtkActor* anActor = myPresent->GetNextActor()) {
theRenderer->RemoveActor(anActor); myAxis[i]->RemoveFromRender(theRenderer);
}
theRenderer->RemoveActor( this );
} }
int GEOM_VTKTrihedron::GetVisibleActorCount(vtkRenderer* theRenderer) int GEOM_VTKTrihedron::GetVisibleActorCount(vtkRenderer* theRenderer)

View File

@ -89,7 +89,6 @@ public:
virtual bool hasHighlight() { return false; } virtual bool hasHighlight() { return false; }
protected: protected:
vtkActorCollection* myPresent;
VTKViewer_Axis* myAxis[3]; VTKViewer_Axis* myAxis[3];
vtkPolyDataMapper* myMapper; vtkPolyDataMapper* myMapper;
float mySize; float mySize;