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
[bos #41122][EDF] Quadrangle radial for face which curved edges didn't discretize...
[modules/smesh.git]
/
src
/
SMESHDS
/
SMESHDS_GroupOnFilter.hxx
diff --git
a/src/SMESHDS/SMESHDS_GroupOnFilter.hxx
b/src/SMESHDS/SMESHDS_GroupOnFilter.hxx
index c53f3bc8fae1c50e4da1d06b57534c3ee7616105..a011c255d94c4677aaa1e4295e768cbd208d2e97 100644
(file)
--- a/
src/SMESHDS/SMESHDS_GroupOnFilter.hxx
+++ b/
src/SMESHDS/SMESHDS_GroupOnFilter.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-27,13
+27,14
@@
#include "SMESH_SMESHDS.hxx"
#include "SMESH_SMESHDS.hxx"
+#include "SMDS_ElementHolder.hxx"
#include "SMESHDS_GroupBase.hxx"
#include "SMESH_Controls.hxx"
#include "SMESHDS_GroupBase.hxx"
#include "SMESH_Controls.hxx"
-
+
/*!
* \brief Groups whose contents is dynamically updated using the filter
*/
/*!
* \brief Groups whose contents is dynamically updated using the filter
*/
-class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase
+class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase
, SMDS_ElementHolder
{
public:
{
public:
@@
-46,20
+47,20
@@
class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase
SMESH_PredicatePtr GetPredicate() const { return myPredicate; }
SMESH_PredicatePtr GetPredicate() const { return myPredicate; }
- std::vector<
int
> GetMeshInfo() const;
+ std::vector<
smIdType
> GetMeshInfo() const;
template< typename IDTYPE >
template< typename IDTYPE >
-
int
GetElementIds( IDTYPE* ids ) const
+
smIdType
GetElementIds( IDTYPE* ids ) const
{
return getElementIds( (void*)ids, sizeof(IDTYPE));
}
{
return getElementIds( (void*)ids, sizeof(IDTYPE));
}
- virtual
int
Extent() const;
+ virtual
smIdType
Extent() const;
virtual bool IsEmpty();
virtual bool IsEmpty();
- virtual bool Contains (const
int
theID);
+ virtual bool Contains (const
smIdType
theID);
virtual bool Contains (const SMDS_MeshElement* elem);
virtual bool Contains (const SMDS_MeshElement* elem);
@@
-69,9
+70,17
@@
class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase
bool IsUpToDate() const;
bool IsUpToDate() const;
+ protected: // methods of SMDS_ElementHolder
+
+ virtual SMDS_ElemIteratorPtr getElements();
+ virtual void tmpClear();
+ virtual void add( const SMDS_MeshElement* element );
+ virtual void compact() {};
+
private:
void update() const;
private:
void update() const;
+ bool updateParallel() const;
void setChanged(bool changed=true);
const SMDS_MeshElement* setNbElemToSkip( SMDS_ElemIteratorPtr& elIt );
int getElementIds( void* ids, size_t idSize ) const;
void setChanged(bool changed=true);
const SMDS_MeshElement* setNbElemToSkip( SMDS_ElemIteratorPtr& elIt );
int getElementIds( void* ids, size_t idSize ) const;
@@
-83,7
+92,7
@@
class SMESHDS_EXPORT SMESHDS_GroupOnFilter: public SMESHDS_GroupBase
// 2) The case of enough free memory. Remember all OK elements (myElements).
SMESH_PredicatePtr myPredicate;
// 2) The case of enough free memory. Remember all OK elements (myElements).
SMESH_PredicatePtr myPredicate;
- std::vector<
int >
myMeshInfo;
+ std::vector<
smIdType >
myMeshInfo;
std::vector< const SMDS_MeshElement*> myElements;
bool myElementsOK;
size_t myMeshModifTime; // when myMeshInfo was updated
std::vector< const SMDS_MeshElement*> myElements;
bool myElementsOK;
size_t myMeshModifTime; // when myMeshInfo was updated