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
Fix regression of the proxy mesh
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_subMesh.hxx
diff --git
a/src/SMESH/SMESH_subMesh.hxx
b/src/SMESH/SMESH_subMesh.hxx
index 4d408033cef42de25bccb111cc5bb037e151515b..05890e8cef1ac776e7bab1caee33890127abb1ef 100644
(file)
--- a/
src/SMESH/SMESH_subMesh.hxx
+++ b/
src/SMESH/SMESH_subMesh.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-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;
@@
-81,6
+81,7
@@
class SMESH_EXPORT SMESH_subMesh
const std::map < int, SMESH_subMesh * >& DependsOn();
bool DependsOn( const SMESH_subMesh* other ) const;
const std::map < int, SMESH_subMesh * >& DependsOn();
bool DependsOn( const SMESH_subMesh* other ) const;
+ bool DependsOn( const int shapeID ) const;
/*!
* \brief Return iterator on the sub-meshes this one depends on. By default
* most simple sub-meshes go first.
/*!
* \brief Return iterator on the sub-meshes this one depends on. By default
* most simple sub-meshes go first.
@@
-95,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
{
@@
-122,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
// ==================================================================
/*!
// ==================================================================
/*!
@@
-215,10
+215,10
@@
protected:
public:
SMESH_Hypothesis::Hypothesis_Status
public:
SMESH_Hypothesis::Hypothesis_Status
- AlgoStateEngine(
i
nt event, SMESH_Hypothesis * anHyp);
+ AlgoStateEngine(
algo_eve
nt event, SMESH_Hypothesis * anHyp);
SMESH_Hypothesis::Hypothesis_Status
SMESH_Hypothesis::Hypothesis_Status
- SubMeshesAlgoStateEngine(
i
nt event, SMESH_Hypothesis * anHyp, bool exitOnFatal=false);
+ SubMeshesAlgoStateEngine(
algo_eve
nt event, SMESH_Hypothesis * anHyp, bool exitOnFatal=false);
algo_state GetAlgoState() const { return _algoState; }
compute_state GetComputeState() const { return _computeState; }
algo_state GetAlgoState() const { return _algoState; }
compute_state GetComputeState() const { return _computeState; }
@@
-226,8
+226,8
@@
public:
void DumpAlgoState(bool isMain);
void DumpAlgoState(bool isMain);
- bool ComputeStateEngine(
i
nt event);
- void ComputeSubMeshStateEngine(
i
nt event, const bool includeSelf=false);
+ bool ComputeStateEngine(
compute_eve
nt event);
+ void ComputeSubMeshStateEngine(
compute_eve
nt event, const bool includeSelf=false);
bool Evaluate(MapShapeNbElems& aResMap);
bool Evaluate(MapShapeNbElems& aResMap);
@@
-280,7
+280,9
@@
public:
protected:
// ==================================================================
protected:
// ==================================================================
- void insertDependence(const TopoDS_Shape aSubShape);
+ void insertDependence(const TopoDS_Shape aShape,
+ TopAbs_ShapeEnum aSubType,
+ TopAbs_ShapeEnum avoidType=TopAbs_SHAPE);
void removeSubMeshElementsAndNodes();
void updateDependantsState(const compute_event theEvent);
void removeSubMeshElementsAndNodes();
void updateDependantsState(const compute_event theEvent);