refs #416: to store the open state of object browser items in the binary array

[modules/gui.git] / src / SVTK / SVTK_Actor.cxx

diff --git a/src/SVTK/SVTK_Actor.cxx b/src/SVTK/SVTK_Actor.cxx
index 2ea4910cf2fde0df5cd75ab478b27a50b699ff81..e13b0350bdde0c53a430d3961d76072659ccf3c3 100644 (file)
--- a/src/SVTK/SVTK_Actor.cxx
+++ b/src/SVTK/SVTK_Actor.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,6 +22,7 @@
 
 #include "SVTK_Actor.h"
 #include "SALOME_Actor.h"
+#include "SVTK_Utils.h"
 
 #include "SALOME_InteractiveObject.hxx"
 
@@ -32,6 +33,7 @@
 #include <vtkRenderer.h>
 
 #include <vtkCell.h>
+#include <vtkVersion.h>
 #define VTK_XVERSION (VTK_MAJOR_VERSION*10000+VTK_MINOR_VERSION*100+VTK_BUILD_VERSION)
 #if VTK_XVERSION > 50700
 #include <vtkPolyhedron.h>
@@ -41,19 +43,6 @@
 #include "Utils_SALOME_Exception.hxx"
 #include "utilities.h"
 
-static 
-void
-CopyPoints(vtkUnstructuredGrid* theGrid, vtkDataSet *theSourceDataSet)
-{
-  vtkPoints *aPoints = vtkPoints::New();
-  vtkIdType iEnd = theSourceDataSet->GetNumberOfPoints();
-  aPoints->SetNumberOfPoints(iEnd);
-  for(vtkIdType i = 0; i < iEnd; i++){
-    aPoints->SetPoint(i,theSourceDataSet->GetPoint(i));
-  }
-  theGrid->SetPoints(aPoints);
-  aPoints->Delete();
-}
 
 vtkStandardNewMacro(SVTK_Actor);
 
@@ -77,7 +66,7 @@ void
 SVTK_Actor
 ::Initialize()
 {
-  SetInput(GetSource());
+  SetInputData(GetSource());
 }
 
 void
@@ -89,7 +78,7 @@ SVTK_Actor
 
   myUnstructuredGrid = theUnstructuredGrid;
 
-  SetInput(theUnstructuredGrid);
+  SetInputData(theUnstructuredGrid);
 }
 
 vtkUnstructuredGrid*
@@ -123,7 +112,7 @@ SVTK_Actor
   myUnstructuredGrid->Allocate();
 
   vtkDataSet *aSourceDataSet = theMapActor->GetInput();
-  CopyPoints(GetSource(),aSourceDataSet);
+  SVTK::CopyPoints(GetSource(),aSourceDataSet);
 
   int aNbOfParts = theMapIndex.Extent();
   for(int ind = 1; ind <= aNbOfParts; ind++){
@@ -169,7 +158,7 @@ SVTK_Actor
     aPoints->SetNumberOfPoints(aNbOfParts);
     for(vtkIdType i = 0; i < aNbOfParts; i++){
       int aPartId = theMapIndex( i+1 );
-      if(vtkFloatingPointType* aCoord = theMapActor->GetNodeCoord(aPartId)){
+      if(double* aCoord = theMapActor->GetNodeCoord(aPartId)){
         aPoints->SetPoint(i,aCoord);
         // Change the type from int to vtkIdType in order to avoid compilation errors while using VTK
         // from ParaView-3.4.0 compiled on 64-bit Debian platform with VTK_USE_64BIT_IDS = ON
@@ -194,7 +183,7 @@ SVTK_Actor
   myUnstructuredGrid->Allocate();
 
   vtkDataSet *aSourceDataSet = theMapActor->GetInput();
-  CopyPoints(GetSource(),aSourceDataSet);
+  SVTK::CopyPoints(GetSource(),aSourceDataSet);
 
 
   if(theMapIndex.Extent() == 2){
@@ -223,3 +212,20 @@ SVTK_Actor
 
   myMapIndex = theMapIndex;
 }
+
+/*!
+  To publish the actor an all its internal devices
+*/
+void
+SVTK_Actor
+::AddToRender(vtkRenderer* theRenderer)
+{
+  theRenderer->AddActor(this);
+}
+
+void
+SVTK_Actor
+::RemoveFromRender(vtkRenderer* theRenderer) 
+{
+  theRenderer->RemoveActor(this);
+}