ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-22 02:45:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ouv 2010-09-20 13:00:13 +00:00
parent e350ffef91
commit 47134513c5
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OBJECT/SMESH_Actor.cxx
View File

@ -30,6 +30,7 @@
#include "SMESH_DeviceActor.h" #include "SMESH_DeviceActor.h"
#include "SMESH_ObjectDef.h" #include "SMESH_ObjectDef.h"
#include "SMESH_ControlsDef.hxx" #include "SMESH_ControlsDef.hxx"
#include "VTKViewer_CellCenters.h"
#include "VTKViewer_ExtractUnstructuredGrid.h" #include "VTKViewer_ExtractUnstructuredGrid.h"
#include "VTKViewer_FramedTextActor.h" #include "VTKViewer_FramedTextActor.h"
#include "SALOME_InteractiveObject.hxx" #include "SALOME_InteractiveObject.hxx"
@ -59,7 +60,6 @@
#include <vtkProperty2D.h> #include <vtkProperty2D.h>
#include <vtkPolyData.h> #include <vtkPolyData.h>
#include <vtkMaskPoints.h> #include <vtkMaskPoints.h>
#include <vtkCellCenters.h>
#include <vtkTextProperty.h> #include <vtkTextProperty.h>
#include <vtkLabeledDataMapper.h> #include <vtkLabeledDataMapper.h>
#include <vtkSelectVisiblePoints.h> #include <vtkSelectVisiblePoints.h>
@ -428,7 +428,7 @@ SMESH_ActorDef::SMESH_ActorDef()
//--------------------------------------- //---------------------------------------
myCellsNumDataSet = vtkUnstructuredGrid::New(); myCellsNumDataSet = vtkUnstructuredGrid::New();
myCellCenters = vtkCellCenters::New(); myCellCenters = VTKViewer_CellCenters::New();
myCellCenters->SetInput(myCellsNumDataSet); myCellCenters->SetInput(myCellsNumDataSet);
myClsMaskPoints = vtkMaskPoints::New(); myClsMaskPoints = vtkMaskPoints::New();

5
src/OBJECT/SMESH_ActorDef.h
View File

@ -63,7 +63,6 @@ class vtkPolyData;
class vtkMapper; class vtkMapper;
class vtkActor2D; class vtkActor2D;
class vtkMaskPoints; class vtkMaskPoints;
class vtkCellCenters;
class vtkLabeledDataMapper; class vtkLabeledDataMapper;
class vtkSelectVisiblePoints; class vtkSelectVisiblePoints;
@ -75,6 +74,8 @@ class vtkImplicitBoolean;
class vtkTimeStamp; class vtkTimeStamp;
class VTKViewer_CellCenters;
class SMESH_DeviceActor; class SMESH_DeviceActor;
@ -271,7 +272,7 @@ class SMESH_ActorDef : public SMESH_Actor
vtkUnstructuredGrid* myCellsNumDataSet; vtkUnstructuredGrid* myCellsNumDataSet;
vtkActor2D *myCellsLabels; vtkActor2D *myCellsLabels;
vtkMaskPoints* myClsMaskPoints; vtkMaskPoints* myClsMaskPoints;
vtkCellCenters* myCellCenters; VTKViewer_CellCenters* myCellCenters;
vtkLabeledDataMapper* myClsLabeledDataMapper; vtkLabeledDataMapper* myClsLabeledDataMapper;
vtkSelectVisiblePoints* myClsSelectVisiblePoints; vtkSelectVisiblePoints* myClsSelectVisiblePoints;

5
src/OBJECT/SMESH_FaceOrientationFilter.cxx
View File

@ -23,6 +23,8 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SUIT_ResourceMgr.h" #include "SUIT_ResourceMgr.h"
#include <VTKViewer_CellCenters.h>
#include <vtkCellData.h> #include <vtkCellData.h>
#include <vtkDataSet.h> #include <vtkDataSet.h>
#include <vtkPolyData.h> #include <vtkPolyData.h>
@ -33,7 +35,6 @@
#include <vtkFloatArray.h> #include <vtkFloatArray.h>
#include <vtkCellArray.h> #include <vtkCellArray.h>
#include <vtkMaskPoints.h> #include <vtkMaskPoints.h>
#include <vtkCellCenters.h>
#include <vtkGlyph3D.h> #include <vtkGlyph3D.h>
#include <vtkGlyphSource2D.h> #include <vtkGlyphSource2D.h>
@ -59,7 +60,7 @@ SMESH_FaceOrientationFilter::SMESH_FaceOrientationFilter()
myFacePolyData = vtkPolyData::New(); myFacePolyData = vtkPolyData::New();
myFaceCenters = vtkCellCenters::New(); myFaceCenters = VTKViewer_CellCenters::New();
myFaceCenters->SetInput(myFacePolyData); myFaceCenters->SetInput(myFacePolyData);
myFaceMaskPoints = vtkMaskPoints::New(); myFaceMaskPoints = vtkMaskPoints::New();

5
src/OBJECT/SMESH_FaceOrientationFilter.h
View File

@ -24,11 +24,12 @@
#include <vtkPolyDataAlgorithm.h> #include <vtkPolyDataAlgorithm.h>
class vtkCellCenters;
class vtkGlyph3D; class vtkGlyph3D;
class vtkGlyphSource2D; class vtkGlyphSource2D;
class vtkMaskPoints; class vtkMaskPoints;
class VTKViewer_CellCenters;
class SMESHOBJECT_EXPORT SMESH_FaceOrientationFilter : public vtkPolyDataAlgorithm class SMESHOBJECT_EXPORT SMESH_FaceOrientationFilter : public vtkPolyDataAlgorithm
{ {
public: public:
@ -63,7 +64,7 @@ private:
vtkFloatingPointType myOrientationScale; vtkFloatingPointType myOrientationScale;
vtkPolyData* myArrowPolyData; vtkPolyData* myArrowPolyData;
vtkPolyData* myFacePolyData; vtkPolyData* myFacePolyData;
vtkCellCenters* myFaceCenters; VTKViewer_CellCenters* myFaceCenters;
vtkMaskPoints* myFaceMaskPoints; vtkMaskPoints* myFaceMaskPoints;
vtkGlyphSource2D* myGlyphSource; vtkGlyphSource2D* myGlyphSource;
vtkGlyph3D* myBaseGlyph; vtkGlyph3D* myBaseGlyph;