Issue 0020226: [CEA 329] Invalid glyphs position in vector fields on polyhedrons...

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index bcb66281f6a9f3f4f4db4e4f5ea71022240fadc0..2e8e3a23912f4495547734d44622eef07084499e 100644 (file)
--- 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 84d8876c96e69c8c692c9902bc90db294573842f..7479d517a73f432c4eaffc7563a09c0befd793fc 100644 (file)
--- 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 a6026293af0bef7a6a13515413458e9b160e35d0..c3aef9e3d457df56cac1c753de599f48dbdec316 100644 (file)
--- a/src/PIPELINE/VISU_PipeLineUtils.hxx
+++ b/src/PIPELINE/VISU_PipeLineUtils.hxx
@@ -37,7 +37,6 @@
 #include <vtkUnstructuredGrid.h>
 
 #include <vtkCellDataToPointData.h>
-#include <vtkCellCenters.h>
 #include <vtkPointData.h>
 #include <vtkCellData.h>
 #include <vtkPolyData.h>

diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index a23956c23ebe973ff162d805610d80cc7177fafa..63b58cafc0506c4562d3b7c502a9a7899bd53dc1 100644 (file)
--- 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 <SUIT_Session.h>
@@ -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 b1f71ff618dcc71bede627b88dfbaf75bdf4ae61..73a604c13e6707041f6386be21eb4a88faf1c359 100644 (file)
--- 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 9831783b2259e9433a22cc05b430e9b4172aca50..e3e48d5825f31a533ef76505f507c3046ca20d23 100644 (file)
--- 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 <vtkGlyph3D.h>
 #include <vtkConeSource.h>
@@ -45,7 +46,7 @@ vtkStandardNewMacro(VISU_VectorsPL);
 //----------------------------------------------------------------------------
 template<class TOutputFilter>
 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 b6bb4e84b5df3986a6da80fba54d2567f8437299..0cf33d804999b73d4921e054a794792220723684 100644 (file)
--- 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;