Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_9_BR'
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_PolygonalFaceOfNodes.hxx
diff --git
a/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx
b/src/SMDS/SMDS_PolygonalFaceOfNodes.hxx
index 2fec139fb08974ae1eb5d383407f7c95da04cee5..b0dc36b1f370633bd398c116d76c934d6f748246 100644
(file)
--- a/
src/SMDS/SMDS_PolygonalFaceOfNodes.hxx
+++ b/
src/SMDS/SMDS_PolygonalFaceOfNodes.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-26,16
+26,11
@@
#define _SMDS_PolygonalFaceOfNodes_HeaderFile
#include "SMESH_SMDS.hxx"
#define _SMDS_PolygonalFaceOfNodes_HeaderFile
#include "SMESH_SMDS.hxx"
+#include "SMDS_CellOfNodes.hxx"
-#include "SMDS_MeshFace.hxx"
-//#include "SMDS_FaceOfNodes.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMDS_Iterator.hxx"
+#include <vector>
-#include <iostream>
-
-//class SMDS_PolygonalFaceOfNodes:public SMDS_FaceOfNodes
-class SMDS_EXPORT SMDS_PolygonalFaceOfNodes:public SMDS_MeshFace
+class SMDS_EXPORT SMDS_PolygonalFaceOfNodes : public SMDS_CellOfNodes
{
public:
SMDS_PolygonalFaceOfNodes (const std::vector<const SMDS_MeshNode *>& nodes);
{
public:
SMDS_PolygonalFaceOfNodes (const std::vector<const SMDS_MeshNode *>& nodes);
@@
-43,13
+38,10
@@
class SMDS_EXPORT SMDS_PolygonalFaceOfNodes:public SMDS_MeshFace
virtual SMDSAbs_ElementType GetType() const;
virtual SMDSAbs_EntityType GetEntityType() const { return SMDSEntity_Polygon; }
virtual SMDSAbs_GeometryType GetGeomType() const { return SMDSGeom_POLYGON; }
virtual SMDSAbs_ElementType GetType() const;
virtual SMDSAbs_EntityType GetEntityType() const { return SMDSEntity_Polygon; }
virtual SMDSAbs_GeometryType GetGeomType() const { return SMDSGeom_POLYGON; }
- virtual bool IsPoly() const { return true; };
-
- bool ChangeNodes (std::vector<const SMDS_MeshNode *> nodes);
-
- bool ChangeNodes (const SMDS_MeshNode* nodes[],
- const int nbNodes);
- // to support the same interface, as SMDS_FaceOfNodes
+ virtual bool IsPoly() const { return true; }
+ virtual bool IsQuadratic() const { return false; }
+ virtual bool IsMediumNode(const SMDS_MeshNode* /*node*/) const { return false; }
+ virtual int NbCornerNodes() const { return NbNodes(); }
virtual int NbNodes() const;
virtual int NbEdges() const;
virtual int NbNodes() const;
virtual int NbEdges() const;
@@
-57,17
+49,13
@@
class SMDS_EXPORT SMDS_PolygonalFaceOfNodes:public SMDS_MeshFace
virtual void Print (std::ostream & OS) const;
virtual void Print (std::ostream & OS) const;
- /*!
- * \brief Return node by its index
- * \param ind - node index
- * \retval const SMDS_MeshNode* - the node
- */
virtual const SMDS_MeshNode* GetNode(const int ind) const;
virtual const SMDS_MeshNode* GetNode(const int ind) const;
+ virtual SMDS_ElemIteratorPtr nodesIterator() const;
+ virtual SMDS_NodeIteratorPtr nodeIterator() const;
+
protected:
protected:
- virtual SMDS_ElemIteratorPtr elementsIterator (SMDSAbs_ElementType type) const;
- private:
std::vector<const SMDS_MeshNode *> myNodes;
};
std::vector<const SMDS_MeshNode *> myNodes;
};