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 'V8_4_BR'
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_SubMesh.hxx
diff --git
a/src/SMESHDS/SMESHDS_SubMesh.hxx
b/src/SMESHDS/SMESHDS_SubMesh.hxx
index 049c73e33b19e0cd4e4482fcff7d1f713b400770..9a9d61f63db944e90b705aa40d657d1423cd43c5 100644
(file)
--- a/
src/SMESHDS/SMESHDS_SubMesh.hxx
+++ b/
src/SMESHDS/SMESHDS_SubMesh.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-52,6
+52,8
@@
class SMESHDS_EXPORT SMESHDS_SubMesh
virtual bool RemoveElement(const SMDS_MeshElement * ME, bool isElemDeleted); // ret true if ME was in
virtual void AddNode(const SMDS_MeshNode * ME);
virtual bool RemoveNode(const SMDS_MeshNode * ME, bool isNodeDeleted); // ret true if ME was in
virtual bool RemoveElement(const SMDS_MeshElement * ME, bool isElemDeleted); // ret true if ME was in
virtual void AddNode(const SMDS_MeshNode * ME);
virtual bool RemoveNode(const SMDS_MeshNode * ME, bool isNodeDeleted); // ret true if ME was in
+ virtual const SMDS_MeshElement* GetElement( size_t idInShape ) const;
+ virtual const SMDS_MeshNode* GetNode ( size_t idInShape ) const;
// if IsComplexSubmesh()
void AddSubMesh( const SMESHDS_SubMesh* theSubMesh );
// if IsComplexSubmesh()
void AddSubMesh( const SMESHDS_SubMesh* theSubMesh );
@@
-63,22
+65,24
@@
class SMESHDS_EXPORT SMESHDS_SubMesh
// for both types
virtual int NbElements() const;
// for both types
virtual int NbElements() const;
- virtual SMDS_ElemIteratorPtr GetElements() const;
+ virtual SMDS_ElemIteratorPtr GetElements(
bool reverse=false
) const;
virtual int NbNodes() const;
virtual int NbNodes() const;
- virtual SMDS_NodeIteratorPtr GetNodes() const;
+ virtual SMDS_NodeIteratorPtr GetNodes(
bool reverse=false
) const;
virtual bool Contains(const SMDS_MeshElement * ME) const; // check if elem or node is in
virtual bool Contains(const SMDS_MeshElement * ME) const; // check if elem or node is in
+ virtual bool IsQuadratic() const;
// clear the contents
virtual void Clear();
// clear the contents
virtual void Clear();
- int getSize();
+ int
getSize();
void compactList();
void compactList();
- inline SMESHDS_Mesh *getParent() {return myParent; };
+ SMESHDS_Mesh* GetParent() const { return const_cast< SMESHDS_Mesh*>( myParent ); }
+ int GetID() const { return myIndex; }
private:
private:
- SMESHDS_Mesh * myParent;
+ SMESHDS_Mesh *
myParent;
std::vector<const SMDS_MeshElement*> myElements;
std::vector<const SMDS_MeshElement*> myElements;
- std::vector<const SMDS_MeshNode*> myNodes;
+ std::vector<const SMDS_MeshNode*>
myNodes;
int myUnusedIdNodes;
int myUnusedIdElements;
int myUnusedIdNodes;
int myUnusedIdElements;