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

0022100: EDF 2413 SMESH: Take into account TRIA7

Browse Source 
Now  SMDS_VtkCellIteratorToUNV inherits from SMDS_NodeIterator and
hence next() returns a node

-class SMDS_VtkCellIteratorToUNV: public SMDS_VtkCellIterator
+class SMDS_VtkCellIteratorToUNV: public SMDS_NodeIterator, protected SMDS_VtkCellIterator
 {
 public:
   SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCellId, SMDSAbs_EntityType aType);
+  virtual const SMDS_MeshNode* next();
+  virtual bool more();
   virtual ~SMDS_VtkCellIteratorToUNV();
 };
This commit is contained in:
eap 2013-05-16 16:16:22 +00:00
parent 5030955be8
commit 1267641d31
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SMDS/SMDS_VtkCellIterator.cxx
View File

@ -81,9 +81,11 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCel
break; break;
} }
case SMDSEntity_Quad_Triangle: case SMDSEntity_Quad_Triangle:
case SMDSEntity_BiQuad_Triangle:
{ {
static int id[] = { 0, 3, 1, 4, 2, 5 }; static int id[] = { 0, 3, 1, 4, 2, 5 };
ids = id; ids = id;
_nbNodes = 6;
break; break;
} }
case SMDSEntity_Quad_Quadrangle: case SMDSEntity_Quad_Quadrangle:
@ -146,6 +148,16 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCel
_vtkIdList->SetId(i, pts[i]); _vtkIdList->SetId(i, pts[i]);
} }
bool SMDS_VtkCellIteratorToUNV::more()
{
return SMDS_VtkCellIterator::more();
}
const SMDS_MeshNode* SMDS_VtkCellIteratorToUNV::next()
{
return static_cast< const SMDS_MeshNode* >( SMDS_VtkCellIterator::next() );
}
SMDS_VtkCellIteratorToUNV::~SMDS_VtkCellIteratorToUNV() SMDS_VtkCellIteratorToUNV::~SMDS_VtkCellIteratorToUNV()
{ {
} }

4
src/SMDS/SMDS_VtkCellIterator.hxx
View File

@ -52,10 +52,12 @@ protected:
vtkIdList* _vtkIdList; vtkIdList* _vtkIdList;
}; };
class SMDS_VtkCellIteratorToUNV: public SMDS_VtkCellIterator class SMDS_VtkCellIteratorToUNV: public SMDS_NodeIterator, protected SMDS_VtkCellIterator
{ {
public: public:
SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCellId, SMDSAbs_EntityType aType); SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCellId, SMDSAbs_EntityType aType);
virtual const SMDS_MeshNode* next();
virtual bool more();
virtual ~SMDS_VtkCellIteratorToUNV(); virtual ~SMDS_VtkCellIteratorToUNV();
}; };