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; }

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index 4e77b3f81afa43e5a8f64d9deee7f0f31bcb1ef2..e9811cffff52e8a2227ef571f1e1364efe1da5ef 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -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;
 }

diff --git a/src/SMESH/SMESH_subMesh.hxx b/src/SMESH/SMESH_subMesh.hxx
index 355107186a0bbb14d3b36fafbf5134b67337dea9..43b8349f1b032c0dae5bf02b7e49d1b9ebb7d4c8 100644 (file)
--- a/src/SMESH/SMESH_subMesh.hxx
+++ b/src/SMESH/SMESH_subMesh.hxx
@@ -65,7 +65,7 @@ class SMESH_EXPORT SMESH_subMesh
                 const TopoDS_Shape & aSubShape);
   virtual ~ SMESH_subMesh();
 
                 const TopoDS_Shape & aSubShape);
   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
     SubMeshesAlgoStateEngine(int event, SMESH_Hypothesis * anHyp);
 
   SMESH_Hypothesis::Hypothesis_Status
     SubMeshesAlgoStateEngine(int event, SMESH_Hypothesis * anHyp);
 

-  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; }

 
   void DumpAlgoState(bool isMain);
 
 
   void DumpAlgoState(bool isMain);
 


@@ -275,7 +275,7 @@ protected:
   void updateSubMeshState(const compute_state theState);
   void cleanDependants();
   void cleanDependsOn();
   void updateSubMeshState(const compute_state theState);
   void cleanDependants();
   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;
   bool                  _dependenceAnalysed;
 
   std::map < int, SMESH_subMesh * >_mapDepend;
   bool                  _dependenceAnalysed;
 

-  int                   _algoState;
-  int                   _computeState;
+  algo_state            _algoState;
+  compute_state         _computeState;

   SMESH_ComputeErrorPtr _computeError;
 
   // allow algo->Compute() if a subshape of lower dim is meshed but
   SMESH_ComputeErrorPtr _computeError;
 
   // allow algo->Compute() if a subshape of lower dim is meshed but