From: ouv <ouv@opencascade.com>
Date: Fri, 1 Feb 2013 10:36:39 +0000 (+0000)
Subject: Porting to VTK 6.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=77942a9bdb4e7db32fbf8f46253a293e4d879fea;p=modules%2Fgeom.git

Porting to VTK 6.
Debug.
---

diff --git a/src/OCC2VTK/GEOM_EdgeSource.cxx b/src/OCC2VTK/GEOM_EdgeSource.cxx
index 66dafa008..6d8f0880b 100755
--- a/src/OCC2VTK/GEOM_EdgeSource.cxx
+++ b/src/OCC2VTK/GEOM_EdgeSource.cxx
@@ -42,6 +42,7 @@ vtkStandardNewMacro(GEOM_EdgeSource);
 GEOM_EdgeSource::GEOM_EdgeSource() :
   myIsVector(false)
 { 
+  this->SetNumberOfInputPorts(0);
 } 
  
 GEOM_EdgeSource::~GEOM_EdgeSource() 
@@ -56,7 +57,7 @@ void GEOM_EdgeSource::AddEdge (const TopoDS_Edge& theEdge,
 }
 
 int GEOM_EdgeSource::RequestData(vtkInformation *vtkNotUsed(request),
-                                 vtkInformationVector **inputVector,
+                                 vtkInformationVector **vtkNotUsed(inputVector),
                                  vtkInformationVector *outputVector)
 {
   vtkInformation *outInfo = outputVector->GetInformationObject(0);
diff --git a/src/OCC2VTK/GEOM_EdgeSource.h b/src/OCC2VTK/GEOM_EdgeSource.h
index 89d04f56d..71e25a044 100755
--- a/src/OCC2VTK/GEOM_EdgeSource.h
+++ b/src/OCC2VTK/GEOM_EdgeSource.h
@@ -28,14 +28,14 @@
 typedef NCollection_Set<TopoDS_Edge> TEdgeSet; 
  
 #include <vtkPoints.h> 
-#include <vtkAlgorithm.h> 
+#include <vtkPolyDataAlgorithm.h> 
 
 class vtkPolyData;
 
-class OCC2VTK_EXPORT GEOM_EdgeSource: public vtkAlgorithm 
+class OCC2VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataAlgorithm 
 { 
 public: 
-  vtkTypeMacro(GEOM_EdgeSource,vtkAlgorithm); 
+  vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataAlgorithm); 
   static GEOM_EdgeSource* New(); 
  
   void AddEdge (const TopoDS_Edge& theEdge,
diff --git a/src/OCC2VTK/GEOM_FaceSource.cxx b/src/OCC2VTK/GEOM_FaceSource.cxx
index 868232a63..dba3eb5e4 100755
--- a/src/OCC2VTK/GEOM_FaceSource.cxx
+++ b/src/OCC2VTK/GEOM_FaceSource.cxx
@@ -29,6 +29,7 @@
  
 GEOM_FaceSource::GEOM_FaceSource() 
 { 
+  this->SetNumberOfInputPorts(0);
 } 
  
 GEOM_FaceSource::~GEOM_FaceSource() 
diff --git a/src/OCC2VTK/GEOM_FaceSource.h b/src/OCC2VTK/GEOM_FaceSource.h
index e0226cc94..03163eff6 100755
--- a/src/OCC2VTK/GEOM_FaceSource.h
+++ b/src/OCC2VTK/GEOM_FaceSource.h
@@ -29,14 +29,14 @@
 typedef NCollection_Set<TopoDS_Face> TFaceSet; 
  
 #include <vtkPoints.h> 
-#include <vtkAlgorithm.h> 
+#include <vtkPolyDataAlgorithm.h> 
 
 class vtkPolyData;
 
-class OCC2VTK_EXPORT GEOM_FaceSource: public vtkAlgorithm 
+class OCC2VTK_EXPORT GEOM_FaceSource: public vtkPolyDataAlgorithm 
 { 
 public: 
-  vtkTypeMacro(GEOM_FaceSource,vtkAlgorithm); 
+  vtkTypeMacro(GEOM_FaceSource,vtkPolyDataAlgorithm); 
  
   void AddFace(const TopoDS_Face& theFace); 
   void Clear(){ myFaceSet.Clear();} 
diff --git a/src/OCC2VTK/GEOM_ShadingFace.cxx b/src/OCC2VTK/GEOM_ShadingFace.cxx
index aae437dc8..7352e5eb6 100755
--- a/src/OCC2VTK/GEOM_ShadingFace.cxx
+++ b/src/OCC2VTK/GEOM_ShadingFace.cxx
@@ -37,6 +37,7 @@ vtkStandardNewMacro(GEOM_ShadingFace);
  
 GEOM_ShadingFace::GEOM_ShadingFace() 
 { 
+  this->SetNumberOfInputPorts(0);
 } 
  
 GEOM_ShadingFace::~GEOM_ShadingFace() 
@@ -44,7 +45,7 @@ GEOM_ShadingFace::~GEOM_ShadingFace()
 } 
  
 int GEOM_ShadingFace::RequestData(vtkInformation *vtkNotUsed(request),
-                                  vtkInformationVector **inputVector,
+                                  vtkInformationVector **vtkNotUsed(inputVector),
                                   vtkInformationVector *outputVector)
 {
   vtkInformation *outInfo = outputVector->GetInformationObject(0);
diff --git a/src/OCC2VTK/GEOM_VertexSource.cxx b/src/OCC2VTK/GEOM_VertexSource.cxx
index 4509dc12a..3bde4829e 100755
--- a/src/OCC2VTK/GEOM_VertexSource.cxx
+++ b/src/OCC2VTK/GEOM_VertexSource.cxx
@@ -35,6 +35,7 @@ vtkStandardNewMacro(GEOM_VertexSource);
  
 GEOM_VertexSource::GEOM_VertexSource() 
 { 
+  this->SetNumberOfInputPorts(0);
 } 
  
 GEOM_VertexSource::~GEOM_VertexSource() 
@@ -49,7 +50,7 @@ AddVertex(const TopoDS_Vertex& theVertex)
 } 
  
 int GEOM_VertexSource::RequestData(vtkInformation *vtkNotUsed(request),
-                                   vtkInformationVector **inputVector,
+                                   vtkInformationVector **vtkNotUsed(inputVector),
                                    vtkInformationVector *outputVector)
 {
   vtkInformation *outInfo = outputVector->GetInformationObject(0);
diff --git a/src/OCC2VTK/GEOM_VertexSource.h b/src/OCC2VTK/GEOM_VertexSource.h
index 6a1ef4b07..4dfea778e 100755
--- a/src/OCC2VTK/GEOM_VertexSource.h
+++ b/src/OCC2VTK/GEOM_VertexSource.h
@@ -28,14 +28,14 @@
 typedef NCollection_Set<TopoDS_Vertex> TVertexSet; 
  
 #include <vtkPoints.h> 
-#include <vtkAlgorithm.h> 
+#include <vtkPolyDataAlgorithm.h> 
 
 class vtkPolyData;
 
-class OCC2VTK_EXPORT GEOM_VertexSource: public vtkAlgorithm
+class OCC2VTK_EXPORT GEOM_VertexSource: public vtkPolyDataAlgorithm
 { 
 public: 
-  vtkTypeMacro(GEOM_VertexSource,vtkAlgorithm); 
+  vtkTypeMacro(GEOM_VertexSource,vtkPolyDataAlgorithm); 
   static GEOM_VertexSource* New(); 
  
   void AddVertex(const TopoDS_Vertex& theVertex); 
diff --git a/src/OCC2VTK/GEOM_WireframeFace.cxx b/src/OCC2VTK/GEOM_WireframeFace.cxx
index dceab70b5..e66c5d010 100755
--- a/src/OCC2VTK/GEOM_WireframeFace.cxx
+++ b/src/OCC2VTK/GEOM_WireframeFace.cxx
@@ -57,6 +57,8 @@ GEOM_WireframeFace::GEOM_WireframeFace():
 { 
   NbIso[0] = 1;
   NbIso[1] = 1;
+
+  this->SetNumberOfInputPorts(0);
 } 
  
 GEOM_WireframeFace::~GEOM_WireframeFace() 
@@ -64,7 +66,7 @@ GEOM_WireframeFace::~GEOM_WireframeFace()
 } 
  
 int GEOM_WireframeFace::RequestData(vtkInformation *vtkNotUsed(request),
-                                    vtkInformationVector **inputVector,
+                                    vtkInformationVector **vtkNotUsed(inputVector),
                                     vtkInformationVector *outputVector)
 {
   vtkInformation *outInfo = outputVector->GetInformationObject(0);