Porting to VTK 6.

Debug.
This commit is contained in:
ouv 2013-02-01 10:36:39 +00:00
parent aad2d12a7c
commit 77942a9bdb
8 changed files with 19 additions and 13 deletions

View File

@ -42,6 +42,7 @@ vtkStandardNewMacro(GEOM_EdgeSource);
GEOM_EdgeSource::GEOM_EdgeSource() : GEOM_EdgeSource::GEOM_EdgeSource() :
myIsVector(false) myIsVector(false)
{ {
this->SetNumberOfInputPorts(0);
} }
GEOM_EdgeSource::~GEOM_EdgeSource() GEOM_EdgeSource::~GEOM_EdgeSource()
@ -56,7 +57,7 @@ void GEOM_EdgeSource::AddEdge (const TopoDS_Edge& theEdge,
} }
int GEOM_EdgeSource::RequestData(vtkInformation *vtkNotUsed(request), int GEOM_EdgeSource::RequestData(vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector, vtkInformationVector **vtkNotUsed(inputVector),
vtkInformationVector *outputVector) vtkInformationVector *outputVector)
{ {
vtkInformation *outInfo = outputVector->GetInformationObject(0); vtkInformation *outInfo = outputVector->GetInformationObject(0);

View File

@ -28,14 +28,14 @@
typedef NCollection_Set<TopoDS_Edge> TEdgeSet; typedef NCollection_Set<TopoDS_Edge> TEdgeSet;
#include <vtkPoints.h> #include <vtkPoints.h>
#include <vtkAlgorithm.h> #include <vtkPolyDataAlgorithm.h>
class vtkPolyData; class vtkPolyData;
class OCC2VTK_EXPORT GEOM_EdgeSource: public vtkAlgorithm class OCC2VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataAlgorithm
{ {
public: public:
vtkTypeMacro(GEOM_EdgeSource,vtkAlgorithm); vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataAlgorithm);
static GEOM_EdgeSource* New(); static GEOM_EdgeSource* New();
void AddEdge (const TopoDS_Edge& theEdge, void AddEdge (const TopoDS_Edge& theEdge,

View File

@ -29,6 +29,7 @@
GEOM_FaceSource::GEOM_FaceSource() GEOM_FaceSource::GEOM_FaceSource()
{ {
this->SetNumberOfInputPorts(0);
} }
GEOM_FaceSource::~GEOM_FaceSource() GEOM_FaceSource::~GEOM_FaceSource()

View File

@ -29,14 +29,14 @@
typedef NCollection_Set<TopoDS_Face> TFaceSet; typedef NCollection_Set<TopoDS_Face> TFaceSet;
#include <vtkPoints.h> #include <vtkPoints.h>
#include <vtkAlgorithm.h> #include <vtkPolyDataAlgorithm.h>
class vtkPolyData; class vtkPolyData;
class OCC2VTK_EXPORT GEOM_FaceSource: public vtkAlgorithm class OCC2VTK_EXPORT GEOM_FaceSource: public vtkPolyDataAlgorithm
{ {
public: public:
vtkTypeMacro(GEOM_FaceSource,vtkAlgorithm); vtkTypeMacro(GEOM_FaceSource,vtkPolyDataAlgorithm);
void AddFace(const TopoDS_Face& theFace); void AddFace(const TopoDS_Face& theFace);
void Clear(){ myFaceSet.Clear();} void Clear(){ myFaceSet.Clear();}

View File

@ -37,6 +37,7 @@ vtkStandardNewMacro(GEOM_ShadingFace);
GEOM_ShadingFace::GEOM_ShadingFace() GEOM_ShadingFace::GEOM_ShadingFace()
{ {
this->SetNumberOfInputPorts(0);
} }
GEOM_ShadingFace::~GEOM_ShadingFace() GEOM_ShadingFace::~GEOM_ShadingFace()
@ -44,7 +45,7 @@ GEOM_ShadingFace::~GEOM_ShadingFace()
} }
int GEOM_ShadingFace::RequestData(vtkInformation *vtkNotUsed(request), int GEOM_ShadingFace::RequestData(vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector, vtkInformationVector **vtkNotUsed(inputVector),
vtkInformationVector *outputVector) vtkInformationVector *outputVector)
{ {
vtkInformation *outInfo = outputVector->GetInformationObject(0); vtkInformation *outInfo = outputVector->GetInformationObject(0);

View File

@ -35,6 +35,7 @@ vtkStandardNewMacro(GEOM_VertexSource);
GEOM_VertexSource::GEOM_VertexSource() GEOM_VertexSource::GEOM_VertexSource()
{ {
this->SetNumberOfInputPorts(0);
} }
GEOM_VertexSource::~GEOM_VertexSource() GEOM_VertexSource::~GEOM_VertexSource()
@ -49,7 +50,7 @@ AddVertex(const TopoDS_Vertex& theVertex)
} }
int GEOM_VertexSource::RequestData(vtkInformation *vtkNotUsed(request), int GEOM_VertexSource::RequestData(vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector, vtkInformationVector **vtkNotUsed(inputVector),
vtkInformationVector *outputVector) vtkInformationVector *outputVector)
{ {
vtkInformation *outInfo = outputVector->GetInformationObject(0); vtkInformation *outInfo = outputVector->GetInformationObject(0);

View File

@ -28,14 +28,14 @@
typedef NCollection_Set<TopoDS_Vertex> TVertexSet; typedef NCollection_Set<TopoDS_Vertex> TVertexSet;
#include <vtkPoints.h> #include <vtkPoints.h>
#include <vtkAlgorithm.h> #include <vtkPolyDataAlgorithm.h>
class vtkPolyData; class vtkPolyData;
class OCC2VTK_EXPORT GEOM_VertexSource: public vtkAlgorithm class OCC2VTK_EXPORT GEOM_VertexSource: public vtkPolyDataAlgorithm
{ {
public: public:
vtkTypeMacro(GEOM_VertexSource,vtkAlgorithm); vtkTypeMacro(GEOM_VertexSource,vtkPolyDataAlgorithm);
static GEOM_VertexSource* New(); static GEOM_VertexSource* New();
void AddVertex(const TopoDS_Vertex& theVertex); void AddVertex(const TopoDS_Vertex& theVertex);

View File

@ -57,6 +57,8 @@ GEOM_WireframeFace::GEOM_WireframeFace():
{ {
NbIso[0] = 1; NbIso[0] = 1;
NbIso[1] = 1; NbIso[1] = 1;
this->SetNumberOfInputPorts(0);
} }
GEOM_WireframeFace::~GEOM_WireframeFace() GEOM_WireframeFace::~GEOM_WireframeFace()
@ -64,7 +66,7 @@ GEOM_WireframeFace::~GEOM_WireframeFace()
} }
int GEOM_WireframeFace::RequestData(vtkInformation *vtkNotUsed(request), int GEOM_WireframeFace::RequestData(vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector, vtkInformationVector **vtkNotUsed(inputVector),
vtkInformationVector *outputVector) vtkInformationVector *outputVector)
{ {
vtkInformation *outInfo = outputVector->GetInformationObject(0); vtkInformation *outInfo = outputVector->GetInformationObject(0);