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
/
SMESH
/
SMESH_subMesh.hxx
diff --git
a/src/SMESH/SMESH_subMesh.hxx
b/src/SMESH/SMESH_subMesh.hxx
index 331d701605dde9394c93afe155d86fcb91b9d666..3d26972411c1d608281f2d65ebcbad36789f47e5 100644
(file)
--- a/
src/SMESH/SMESH_subMesh.hxx
+++ b/
src/SMESH/SMESH_subMesh.hxx
@@
-29,9
+29,7
@@
#include "SMESH_SMESH.hxx"
#include "SMESH_SMESH.hxx"
-#include "SMESHDS_Mesh.hxx"
-#include "SMESHDS_SubMesh.hxx"
-#include "SMESH_Hypothesis.hxx"
+#include "SMDS_Iterator.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_Algo.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_Algo.hxx"
@@
-42,13
+40,15
@@
#include <list>
#include <map>
#include <list>
#include <map>
-class SMESH_Mesh;
-class SMESH
_Hypothesis
;
+class SMESH
DS
_Mesh;
+class SMESH
DS_SubMesh
;
class SMESH_Algo;
class SMESH_Gen;
class SMESH_Algo;
class SMESH_Gen;
+class SMESH_Hypothesis;
+class SMESH_Mesh;
+class SMESH_subMesh;
class SMESH_subMeshEventListener;
class SMESH_subMeshEventListenerData;
class SMESH_subMeshEventListener;
class SMESH_subMeshEventListenerData;
-class SMESH_subMesh;
typedef SMESH_subMeshEventListener EventListener;
typedef SMESH_subMeshEventListenerData EventListenerData;
typedef SMESH_subMeshEventListener EventListener;
typedef SMESH_subMeshEventListenerData EventListenerData;
@@
-96,8
+96,7
@@
class SMESH_EXPORT SMESH_subMesh
enum compute_state
{
enum compute_state
{
- NOT_READY, READY_TO_COMPUTE,
- COMPUTE_OK, FAILED_TO_COMPUTE
+ NOT_READY, READY_TO_COMPUTE, COMPUTE_OK, FAILED_TO_COMPUTE
};
enum algo_state
{
};
enum algo_state
{
@@
-113,7
+112,7
@@
class SMESH_EXPORT SMESH_subMesh
};
enum compute_event
{
};
enum compute_event
{
- MODIF_ALGO_STATE, COMPUTE, COMPUTE_SUBMESH, COMPUTE_CANCELED,
+ MODIF_ALGO_STATE, COMPUTE, COMPUTE_SUBMESH, COMPUTE_
NOGEOM, COMPUTE_
CANCELED,
CLEAN, SUBMESH_COMPUTED, SUBMESH_RESTORED, SUBMESH_LOADED,
MESH_ENTITY_REMOVED, CHECK_COMPUTE_STATE
};
CLEAN, SUBMESH_COMPUTED, SUBMESH_RESTORED, SUBMESH_LOADED,
MESH_ENTITY_REMOVED, CHECK_COMPUTE_STATE
};
@@
-123,7
+122,7
@@
class SMESH_EXPORT SMESH_subMesh
};
// ==================================================================
};
// ==================================================================
- // Members to track non hierarchical dependencies between submeshes
+ // Members to track non hierarchical dependencies between sub
-
meshes
// ==================================================================
/*!
// ==================================================================
/*!
@@
-191,7
+190,7
@@
protected:
void setEventListener(EventListener* listener, EventListenerData* data);
/*!
void setEventListener(EventListener* listener, EventListenerData* data);
/*!
- * \brief Notify stored event listeners on the occured event
+ * \brief Notify stored event listeners on the occur
r
ed event
* \param event - algo_event or compute_event itself
* \param eventType - algo_event or compute_event
* \param hyp - hypothesis, if eventType is algo_event
* \param event - algo_event or compute_event itself
* \param eventType - algo_event or compute_event
* \param hyp - hypothesis, if eventType is algo_event
@@
-237,17
+236,16
@@
public:
bool CanAddHypothesis(const SMESH_Hypothesis* theHypothesis) const;
// return true if theHypothesis can be attached to me:
bool CanAddHypothesis(const SMESH_Hypothesis* theHypothesis) const;
// return true if theHypothesis can be attached to me:
- // its dimen
t
ion is checked
+ // its dimen
s
ion is checked
- static bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis,
+ static bool IsApplicableHypot
h
esis(const SMESH_Hypothesis* theHypothesis,
const TopAbs_ShapeEnum theShapeType);
const TopAbs_ShapeEnum theShapeType);
- bool IsApplicableHypotesis(const SMESH_Hypothesis* theHypothesis) const
- { return IsApplicableHypotesis( theHypothesis, _subShape.ShapeType() ); }
+ bool IsApplicableHypothesis(const SMESH_Hypothesis* theHypothesis) const;
// return true if theHypothesis can be used to mesh me:
// its shape type is checked
// return true if theHypothesis can be used to mesh me:
// its shape type is checked
- SMESH_Hypothesis::Hypothesis_Status CheckConcurentHypothesis (const int theHypType);
+ SMESH_Hypothesis::Hypothesis_Status CheckConcur
r
entHypothesis (const int theHypType);
// check if there are several applicable hypothesis on fathers
/*!
// check if there are several applicable hypothesis on fathers
/*!