X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESH%2FSMESH_subMesh.hxx;h=43b8349f1b032c0dae5bf02b7e49d1b9ebb7d4c8;hb=1067ffa6e7e5c394e3a1b17219d8b355a57607cd;hp=057f532a7d3fb13db34481171e98c15bcd048f39;hpb=e6fb82fec115653b65edff9f5155d4e39bc13c6a;p=modules%2Fsmesh.git diff --git a/src/SMESH/SMESH_subMesh.hxx b/src/SMESH/SMESH_subMesh.hxx index 057f532a7..43b8349f1 100644 --- a/src/SMESH/SMESH_subMesh.hxx +++ b/src/SMESH/SMESH_subMesh.hxx @@ -59,15 +59,18 @@ typedef boost::shared_ptr< SMDS_Iterator > SMESH_subMeshIterator class SMESH_EXPORT SMESH_subMesh { public: - SMESH_subMesh(int Id, SMESH_Mesh * father, SMESHDS_Mesh * meshDS, + SMESH_subMesh(int Id, + SMESH_Mesh * father, + SMESHDS_Mesh * meshDS, const TopoDS_Shape & aSubShape); virtual ~ SMESH_subMesh(); - int GetId() const; + int GetId() const; // == meshDS->ShapeToIndex( aSubShape ) SMESH_Mesh* GetFather() { return _father; } - SMESHDS_SubMesh * GetSubMeshDS(); + SMESHDS_SubMesh * GetSubMeshDS(); + const SMESHDS_SubMesh * GetSubMeshDS() const; SMESHDS_SubMesh* CreateSubMeshDS(); // Explicit SMESHDS_SubMesh creation method, required for persistence mechanism @@ -206,9 +209,9 @@ public: 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); @@ -272,7 +275,7 @@ protected: 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 @@ -311,8 +314,8 @@ protected: 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