return enums instead of integers

-  int GetAlgoState() const { return _algoState; }
-  int GetComputeState() const { return _computeState; };
-  SMESH_ComputeErrorPtr& GetComputeError() { return _computeError; }

+  algo_state             GetAlgoState() const    { return _algoState; }
+  compute_state          GetComputeState() const { return _computeState; };
+  SMESH_ComputeErrorPtr& GetComputeError()       { return _computeError; }
This commit is contained in:
eap 2012-11-22 14:41:24 +00:00
parent 73bd553f09
commit a516695cf3
2 changed files with 8 additions and 8 deletions

View File

@ -1133,7 +1133,7 @@ bool SMESH_subMesh::IsConform(const SMESH_Algo* theAlgo)
*/ */
//============================================================================= //=============================================================================
void SMESH_subMesh::setAlgoState(int state) void SMESH_subMesh::setAlgoState(algo_state state)
{ {
_algoState = state; _algoState = state;
} }

View File

@ -65,7 +65,7 @@ class SMESH_EXPORT SMESH_subMesh
const TopoDS_Shape & aSubShape); const TopoDS_Shape & aSubShape);
virtual ~ SMESH_subMesh(); virtual ~ SMESH_subMesh();
int GetId() const; int GetId() const; // == meshDS->ShapeToIndex( aSubShape )
SMESH_Mesh* GetFather() { return _father; } SMESH_Mesh* GetFather() { return _father; }
@ -209,9 +209,9 @@ public:
SMESH_Hypothesis::Hypothesis_Status SMESH_Hypothesis::Hypothesis_Status
SubMeshesAlgoStateEngine(int event, SMESH_Hypothesis * anHyp); SubMeshesAlgoStateEngine(int event, SMESH_Hypothesis * anHyp);
int GetAlgoState() const { return _algoState; } algo_state GetAlgoState() const { return _algoState; }
int GetComputeState() const { return _computeState; }; compute_state GetComputeState() const { return _computeState; };
SMESH_ComputeErrorPtr& GetComputeError() { return _computeError; } SMESH_ComputeErrorPtr& GetComputeError() { return _computeError; }
void DumpAlgoState(bool isMain); void DumpAlgoState(bool isMain);
@ -275,7 +275,7 @@ protected:
void updateSubMeshState(const compute_state theState); void updateSubMeshState(const compute_state theState);
void cleanDependants(); void cleanDependants();
void cleanDependsOn(); void cleanDependsOn();
void setAlgoState(int state); void setAlgoState(algo_state state);
/*! /*!
* \brief Return a shape containing all sub-shapes of the MainShape that can be * \brief Return a shape containing all sub-shapes of the MainShape that can be
@ -314,8 +314,8 @@ protected:
std::map < int, SMESH_subMesh * >_mapDepend; std::map < int, SMESH_subMesh * >_mapDepend;
bool _dependenceAnalysed; bool _dependenceAnalysed;
int _algoState; algo_state _algoState;
int _computeState; compute_state _computeState;
SMESH_ComputeErrorPtr _computeError; SMESH_ComputeErrorPtr _computeError;
// allow algo->Compute() if a subshape of lower dim is meshed but // allow algo->Compute() if a subshape of lower dim is meshed but