From 380d865e8561461693b09337cd56ad976490fb50 Mon Sep 17 00:00:00 2001 From: ouv Date: Tue, 11 Oct 2005 12:38:04 +0000 Subject: [PATCH] myOutlineActor became a VTKViewer_Actor instead of vtkActor --- src/SVTK/SALOME_Actor.cxx | 11 ++++++----- src/SVTK/SALOME_Actor.h | 4 +--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx index 8cad00b31..9a97f8000 100644 --- a/src/SVTK/SALOME_Actor.cxx +++ b/src/SVTK/SALOME_Actor.cxx @@ -188,15 +188,15 @@ SALOME_Actor myOutline = vtkOutlineSource::New(); myOutline->Delete(); - myOutlineMapper = vtkPolyDataMapper::New(); - myOutlineMapper->Delete(); - myOutlineMapper->SetInput(myOutline->GetOutput()); + vtkSmartPointer anOutlineMapper = vtkPolyDataMapper::New(); + anOutlineMapper->Delete(); + anOutlineMapper->SetInput(myOutline->GetOutput()); - myOutlineActor = vtkActor::New(); + myOutlineActor = VTKViewer_Actor::New(); myOutlineActor->Delete(); myOutlineActor->PickableOff(); myOutlineActor->DragableOff(); - myOutlineActor->SetMapper( myOutlineMapper.GetPointer() ); + myOutlineActor->SetMapper( anOutlineMapper.GetPointer() ); myOutlineActor->GetProperty()->SetColor(1.0,0.0,0.0); myOutlineActor->GetProperty()->SetAmbient(1.0); myOutlineActor->GetProperty()->SetDiffuse(0.0); @@ -356,6 +356,7 @@ SALOME_Actor ::SetTransform(VTKViewer_Transform* theTransform) { myTransformFilter->SetTransform(theTransform); + myOutlineActor->SetTransform(theTransform); } diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h index 2e9996f4f..d70885588 100644 --- a/src/SVTK/SALOME_Actor.h +++ b/src/SVTK/SALOME_Actor.h @@ -55,7 +55,6 @@ class vtkDataSet; class vtkPolyData; class vtkCamera; class vtkProperty; -class vtkPolyDataMapper; class vtkOutlineSource; class vtkRenderer; class vtkInteractorStyle; @@ -392,9 +391,8 @@ class SVTK_EXPORT SALOME_Actor : public VTKViewer_Actor vtkSmartPointer myHighlightProperty; vtkSmartPointer myHighlightActor; - vtkSmartPointer myOutlineActor; + vtkSmartPointer myOutlineActor; vtkSmartPointer myOutline; - vtkSmartPointer myOutlineMapper; }; #endif // SALOME_ACTOR_H -- 2.39.2