From: ouv <ouv@opencascade.com>
Date: Thu, 13 Oct 2005 07:16:48 +0000 (+0000)
Subject: Fixed bug GVIEW10220 : Scaling is not applied onto selection
X-Git-Tag: TG-D5-38-2003_D2005-29-12~72
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d0882d540598960f48d6fc0667ad8b811e16cb74;p=modules%2Fgui.git

Fixed bug GVIEW10220 : Scaling is not applied onto selection
---

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index 51528c5aa..42baf8280 100644
--- 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 d70885588..819a4c2d9 100644
--- 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