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

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index 38dddb2ae6ff5c816ee76b5139f045068ae027f4..8f5c5bae6f32958c48438efb6cc66731cccd0d8a 100644 (file)
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -30,6 +30,7 @@
 #include "SMESH_DeviceActor.h"
 #include "SMESH_ObjectDef.h"
 #include "SMESH_ControlsDef.hxx"
+#include "VTKViewer_CellCenters.h"
 #include "VTKViewer_ExtractUnstructuredGrid.h"
 #include "VTKViewer_FramedTextActor.h"
 #include "SALOME_InteractiveObject.hxx"
@@ -59,7 +60,6 @@
 #include <vtkProperty2D.h>
 #include <vtkPolyData.h>
 #include <vtkMaskPoints.h>
-#include <vtkCellCenters.h>
 #include <vtkTextProperty.h>
 #include <vtkLabeledDataMapper.h>
 #include <vtkSelectVisiblePoints.h>
@@ -428,7 +428,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   //---------------------------------------
   myCellsNumDataSet = vtkUnstructuredGrid::New();
 
-  myCellCenters = vtkCellCenters::New();
+  myCellCenters = VTKViewer_CellCenters::New();
   myCellCenters->SetInput(myCellsNumDataSet);
 
   myClsMaskPoints = vtkMaskPoints::New();

diff --git a/src/OBJECT/SMESH_ActorDef.h b/src/OBJECT/SMESH_ActorDef.h
index e3d65ff7a50e89857a01409219da7d5a69b5b18b..0a740163b166774ee8e0687c24fbf4059fcdee16 100644 (file)
--- a/src/OBJECT/SMESH_ActorDef.h
+++ b/src/OBJECT/SMESH_ActorDef.h
@@ -63,7 +63,6 @@ class vtkPolyData;
 class vtkMapper;
 class vtkActor2D;
 class vtkMaskPoints;
-class vtkCellCenters;
 class vtkLabeledDataMapper;
 class vtkSelectVisiblePoints;
 
@@ -75,6 +74,8 @@ class vtkImplicitBoolean;
 
 class vtkTimeStamp;
 
+class VTKViewer_CellCenters;
+
 class SMESH_DeviceActor;
 
 
@@ -271,7 +272,7 @@ class SMESH_ActorDef : public SMESH_Actor
   vtkUnstructuredGrid* myCellsNumDataSet;
   vtkActor2D *myCellsLabels;
   vtkMaskPoints* myClsMaskPoints;
-  vtkCellCenters* myCellCenters;
+  VTKViewer_CellCenters* myCellCenters;
   vtkLabeledDataMapper* myClsLabeledDataMapper;
   vtkSelectVisiblePoints* myClsSelectVisiblePoints;
 

diff --git a/src/OBJECT/SMESH_FaceOrientationFilter.cxx b/src/OBJECT/SMESH_FaceOrientationFilter.cxx
index 9f01d0bdc6868f7ace845e4c49be869541d4b588..d2407af6be300dc5cd4def8ab9584f6b346ee3af 100644 (file)
--- a/src/OBJECT/SMESH_FaceOrientationFilter.cxx
+++ b/src/OBJECT/SMESH_FaceOrientationFilter.cxx
@@ -23,6 +23,8 @@
 #include "SUIT_Session.h"
 #include "SUIT_ResourceMgr.h"
 
+#include <VTKViewer_CellCenters.h>
+
 #include <vtkCellData.h>
 #include <vtkDataSet.h>
 #include <vtkPolyData.h>
@@ -33,7 +35,6 @@
 #include <vtkFloatArray.h>
 #include <vtkCellArray.h>
 #include <vtkMaskPoints.h>
-#include <vtkCellCenters.h>
 #include <vtkGlyph3D.h>
 #include <vtkGlyphSource2D.h>
 
@@ -59,7 +60,7 @@ SMESH_FaceOrientationFilter::SMESH_FaceOrientationFilter()
 
   myFacePolyData = vtkPolyData::New();
 
-  myFaceCenters = vtkCellCenters::New();
+  myFaceCenters = VTKViewer_CellCenters::New();
   myFaceCenters->SetInput(myFacePolyData);
 
   myFaceMaskPoints = vtkMaskPoints::New();

diff --git a/src/OBJECT/SMESH_FaceOrientationFilter.h b/src/OBJECT/SMESH_FaceOrientationFilter.h
index 7a1721cb6321f88077508bf29ebd9dfb04a6c535..813468047e73462a71191a63512520e47f127a6a 100644 (file)
--- a/src/OBJECT/SMESH_FaceOrientationFilter.h
+++ b/src/OBJECT/SMESH_FaceOrientationFilter.h
@@ -24,11 +24,12 @@
 
 #include <vtkPolyDataAlgorithm.h>
 
-class vtkCellCenters;
 class vtkGlyph3D;
 class vtkGlyphSource2D;
 class vtkMaskPoints;
 
+class VTKViewer_CellCenters;
+
 class SMESHOBJECT_EXPORT SMESH_FaceOrientationFilter : public vtkPolyDataAlgorithm
 {
 public:
@@ -63,7 +64,7 @@ private:
   vtkFloatingPointType myOrientationScale;
   vtkPolyData* myArrowPolyData;
   vtkPolyData* myFacePolyData;
-  vtkCellCenters* myFaceCenters;
+  VTKViewer_CellCenters* myFaceCenters;
   vtkMaskPoints* myFaceMaskPoints;
   vtkGlyphSource2D* myGlyphSource;
   vtkGlyph3D* myBaseGlyph;