From: ouv Date: Mon, 20 Sep 2010 12:59:37 +0000 (+0000) Subject: Issue 0020226: [CEA 329] Invalid glyphs position in vector fields on polyhedrons... X-Git-Tag: V5_1_main_20100921 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=73693c50e4daf080a2d594cbe1233eeabe49ee6d;p=modules%2Fvisu.git Issue 0020226: [CEA 329] Invalid glyphs position in vector fields on polyhedrons cell. --- diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx index bcb66281..2e8e3a23 100644 --- a/src/OBJECT/VISU_Actor.cxx +++ b/src/OBJECT/VISU_Actor.cxx @@ -37,6 +37,7 @@ #include "SVTK_Actor.h" #include "SVTK_Event.h" +#include "VTKViewer_CellCenters.h" #include "VTKViewer_FramedTextActor.h" #include "VTKViewer_ShrinkFilter.h" #include "VTKViewer_GeometryFilter.h" @@ -161,7 +162,7 @@ VISU_Actor myValLblDataSet = vtkUnstructuredGrid::New(); - myValCellCenters = vtkCellCenters::New(); + myValCellCenters = VTKViewer_CellCenters::New(); myValCellCenters->SetInput(myValLblDataSet); myValMaskPoints = vtkMaskPoints::New(); diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h index 84d8876c..7479d517 100644 --- a/src/OBJECT/VISU_Actor.h +++ b/src/OBJECT/VISU_Actor.h @@ -51,11 +51,11 @@ class vtkPlane; class vtkImplicitFunctionCollection; class vtkFeatureEdges; class vtkTextProperty; -class vtkCellCenters; class vtkLabeledDataMapper; class vtkMaskPoints; class vtkActor2D; +class VTKViewer_CellCenters; class VTKViewer_FramedTextActor; class VISU_SelectVisiblePoints; @@ -416,7 +416,7 @@ class VISU_OBJECT_EXPORT VISU_Actor : public VISU_ActorBase vtkDataSet* myValLblDataSet; vtkActor2D* myValLabels; vtkMaskPoints* myValMaskPoints; - vtkCellCenters* myValCellCenters; + VTKViewer_CellCenters* myValCellCenters; vtkLabeledDataMapper* myValLabeledDataMapper; VISU_SelectVisiblePoints* myValSelectVisiblePoints; }; diff --git a/src/PIPELINE/VISU_PipeLineUtils.hxx b/src/PIPELINE/VISU_PipeLineUtils.hxx index a6026293..c3aef9e3 100644 --- a/src/PIPELINE/VISU_PipeLineUtils.hxx +++ b/src/PIPELINE/VISU_PipeLineUtils.hxx @@ -37,7 +37,6 @@ #include #include -#include #include #include #include diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx index a23956c2..63b58caf 100644 --- a/src/PIPELINE/VISU_StreamLinesPL.cxx +++ b/src/PIPELINE/VISU_StreamLinesPL.cxx @@ -34,6 +34,7 @@ #include "VISU_PipeLineUtils.hxx" #include "VISU_StreamLine.hxx" +#include "VTKViewer_CellCenters.h" #include "VTKViewer_GeometryFilter.h" #include @@ -68,7 +69,7 @@ VISU_StreamLinesPL SetIsFeatureEdgesAllowed(false); myStream = VISU_StreamLine::New(); - myCenters = vtkCellCenters::New(); + myCenters = VTKViewer_CellCenters::New(); myGeomFilter = VTKViewer_GeometryFilter::New(); myPointsFilter = VISU_MaskPointsFilter::New(); mySource = NULL; diff --git a/src/PIPELINE/VISU_StreamLinesPL.hxx b/src/PIPELINE/VISU_StreamLinesPL.hxx index b1f71ff6..73a604c1 100644 --- a/src/PIPELINE/VISU_StreamLinesPL.hxx +++ b/src/PIPELINE/VISU_StreamLinesPL.hxx @@ -35,7 +35,7 @@ class vtkDataSet; class vtkPointSet; -class vtkCellCenters; +class VTKViewer_CellCenters; class VTKViewer_GeometryFilter; class VISU_MaskPointsFilter; class VISU_StreamLine; @@ -249,7 +249,7 @@ protected: VISU_StreamLine* myStream; vtkPointSet* mySource; - vtkCellCenters* myCenters; + VTKViewer_CellCenters* myCenters; VTKViewer_GeometryFilter *myGeomFilter; VISU_MaskPointsFilter *myPointsFilter; vtkFloatingPointType myPercents; diff --git a/src/PIPELINE/VISU_VectorsPL.cxx b/src/PIPELINE/VISU_VectorsPL.cxx index 9831783b..e3e48d58 100644 --- a/src/PIPELINE/VISU_VectorsPL.cxx +++ b/src/PIPELINE/VISU_VectorsPL.cxx @@ -31,6 +31,7 @@ #include "VISU_UsedPointsFilter.hxx" #include "VTKViewer_TransformFilter.h" #include "VTKViewer_Transform.h" +#include "VTKViewer_CellCenters.h" #include #include @@ -45,7 +46,7 @@ vtkStandardNewMacro(VISU_VectorsPL); //---------------------------------------------------------------------------- template void ToCellCenters( TOutputFilter *theOutputFilter, - vtkCellCenters *theCellCenters, + VTKViewer_CellCenters *theCellCenters, vtkDataSet* theDataSet, VISU_UsedPointsFilter* theUsedPointsFilter ) { @@ -72,7 +73,7 @@ VISU_VectorsPL myConeSource = vtkConeSource::New(); myLineSource = vtkLineSource::New(); - myCenters = vtkCellCenters::New(); + myCenters = VTKViewer_CellCenters::New(); myTransformFilter = VTKViewer_TransformFilter::New(); myUsedPointsFilter = VISU_UsedPointsFilter::New(); diff --git a/src/PIPELINE/VISU_VectorsPL.hxx b/src/PIPELINE/VISU_VectorsPL.hxx index b6bb4e84..0cf33d80 100644 --- a/src/PIPELINE/VISU_VectorsPL.hxx +++ b/src/PIPELINE/VISU_VectorsPL.hxx @@ -33,7 +33,7 @@ class VTKViewer_TransformFilter; class VTKViewer_Transform; -class vtkCellCenters; +class VTKViewer_CellCenters; class vtkGlyphSource2D; class vtkConeSource; @@ -142,7 +142,7 @@ protected: vtkLineSource *myLineSource; vtkConeSource *myConeSource; - vtkCellCenters* myCenters; + VTKViewer_CellCenters* myCenters; VTKViewer_TransformFilter *myTransformFilter; VISU_UsedPointsFilter* myUsedPointsFilter;