Fixed bug GVIEW10220 : Scaling is not applied onto selection

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index 51528c5aab7d4c29fa71c991d7a3736d3da0e269..42baf828023d64408572dbf368435ffb01a4639f 100644 (file)
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_Actor.cxx
@@ -355,7 +355,10 @@ void
 SALOME_Actor
 ::SetTransform(VTKViewer_Transform* theTransform)
 {
-  myTransformFilter->SetTransform(theTransform);
+  Superclass::SetTransform(theTransform);
+
+  myPreHighlightActor->SetTransform(theTransform);
+  myHighlightActor->SetTransform(theTransform);
   myOutlineActor->SetTransform(theTransform);
 }
 
@@ -398,7 +401,7 @@ SALOME_Actor
       aMapper->SetInput(myPassFilter[anId]->GetPolyDataOutput());
     }
   }
-  vtkLODActor::SetMapper(theMapper);
+  Superclass::SetMapper(theMapper);
 }
 
 
@@ -415,12 +418,12 @@ void
     vtkMapper::SetResolveCoincidentTopologyToPolygonOffset();
     vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
                                                                   myPolygonOffsetUnits);
-    vtkLODActor::Render(ren,m);
+    Superclass::Render(ren,m);
     
     vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
     vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
   }else{
-    vtkLODActor::Render(ren,m);
+    Superclass::Render(ren,m);
   }
 }
 
@@ -739,7 +742,7 @@ SALOME_Actor
     if(theSelectionMode != ActorSelection)
       myHighlightActor->SetVisibility( theHighlight );
 
-    myOutline->SetBounds( GetBounds() );
+    myOutline->SetBounds( GetInput()->GetBounds() );
     myOutlineActor->SetVisibility( theHighlight );
   }
 }

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index d7088558858d403cf1765ce2542938f65c72a9f2..819a4c2d9310d7a303b7ce13fe3b7d758899f778 100644 (file)
--- a/src/SVTK/SALOME_Actor.h
+++ b/src/SVTK/SALOME_Actor.h
@@ -79,7 +79,7 @@ class SVTK_EXPORT SALOME_Actor : public VTKViewer_Actor
  public:
   static SALOME_Actor* New();
   
-  vtkTypeMacro(SALOME_Actor,vtkLODActor);
+  vtkTypeMacro(SALOME_Actor,VTKViewer_Actor);
 
   //----------------------------------------------------------------------------
   virtual