myOutlineActor became a VTKViewer_Actor instead of vtkActor

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index 8cad00b312971a09d8d3501e702efd05b38e9f24..9a97f80002d6b2492f050a89ebbb5c4cadc5806c 100644 (file)
--- 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<vtkPolyDataMapper> 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 2e9996f4f7d42a4fb802dc4aced90e86f660a60f..d7088558858d403cf1765ce2542938f65c72a9f2 100644 (file)
--- 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<vtkProperty> myHighlightProperty;
   vtkSmartPointer<SVTK_Actor> myHighlightActor;
 
-  vtkSmartPointer<vtkActor> myOutlineActor;
+  vtkSmartPointer<VTKViewer_Actor> myOutlineActor;
   vtkSmartPointer<vtkOutlineSource> myOutline;
-  vtkSmartPointer<vtkPolyDataMapper> myOutlineMapper;
 };
 
 #endif // SALOME_ACTOR_H