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
Porting to OCCT 7.8.0
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Algo.hxx
diff --git
a/src/SMESH/SMESH_Algo.hxx
b/src/SMESH/SMESH_Algo.hxx
index 24016e3f281eb6cf4756806e3d892e4903fb58af..127d437a114720241187e8368bb3288fa34ee152 100644
(file)
--- a/
src/SMESH/SMESH_Algo.hxx
+++ b/
src/SMESH/SMESH_Algo.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-60,8
+60,8
@@
class TopoDS_Vertex;
class TopoDS_Wire;
class gp_XYZ;
class TopoDS_Wire;
class gp_XYZ;
-typedef std::map< SMESH_subMesh*, std::vector<
int
> > MapShapeNbElems;
-typedef std::map< SMESH_subMesh*, std::vector<
int
> >::iterator MapShapeNbElemsItr;
+typedef std::map< SMESH_subMesh*, std::vector<
smIdType
> > MapShapeNbElems;
+typedef std::map< SMESH_subMesh*, std::vector<
smIdType
> >::iterator MapShapeNbElemsItr;
// ==================================================================================
/*!
// ==================================================================================
/*!
@@
-198,15
+198,15
@@
class SMESH_EXPORT SMESH_Algo : public SMESH_Hypothesis
/*!
* \brief Return a list of compatible hypotheses used to mesh a shape
/*!
* \brief Return a list of compatible hypotheses used to mesh a shape
- * \param aMesh - the mesh
+ * \param aMesh - the mesh
* \param aShape - the shape
* \param ignoreAuxiliary - do not include auxiliary hypotheses in the list
* \retval const std::list <const SMESHDS_Hypothesis*> - hypotheses list
* \param aShape - the shape
* \param ignoreAuxiliary - do not include auxiliary hypotheses in the list
* \retval const std::list <const SMESHDS_Hypothesis*> - hypotheses list
- *
+ *
* List the hypothesis used by the algorithm associated to the shape.
* Hypothesis associated to father shape -are- taken into account (see
* GetAppliedHypothesis). Relevant hypothesis have a name (type) listed in
* List the hypothesis used by the algorithm associated to the shape.
* Hypothesis associated to father shape -are- taken into account (see
* GetAppliedHypothesis). Relevant hypothesis have a name (type) listed in
- * the algorithm. This method could be surcharged by specific algorithms, in
+ * the algorithm. This method could be surcharged by specific algorithms, in
* case of several hypothesis simultaneously applicable.
*/
virtual const std::list <const SMESHDS_Hypothesis *> &
* case of several hypothesis simultaneously applicable.
*/
virtual const std::list <const SMESHDS_Hypothesis *> &
@@
-277,10
+277,13
@@
public:
// 6 - if algo !NeedDiscreteBoundary() but requires presence of
// hypotheses of dimension <dim> to generate all-dimensional mesh.
// This info is used not to issue warnings on hiding of lower global algos.
// 6 - if algo !NeedDiscreteBoundary() but requires presence of
// hypotheses of dimension <dim> to generate all-dimensional mesh.
// This info is used not to issue warnings on hiding of lower global algos.
+ //
+
+ virtual void setSubMeshesToCompute(SMESH_subMesh * aSubMesh) {SubMeshesToCompute().assign( 1, aSubMesh );}
public:
// ==================================================================
public:
// ==================================================================
- // Methods to track non hierarchical dependencies between submeshes
+ // Methods to track non hierarchical dependencies between submeshes
// ==================================================================
/*!
// ==================================================================
/*!
@@
-292,7
+295,7
@@
public:
* By default none listener is set
*/
virtual void SetEventListener(SMESH_subMesh* subMesh);
* By default none listener is set
*/
virtual void SetEventListener(SMESH_subMesh* subMesh);
-
+
/*!
* \brief Allow algo to do something after persistent restoration
* \param subMesh - restored submesh
/*!
* \brief Allow algo to do something after persistent restoration
* \param subMesh - restored submesh
@@
-300,7
+303,7
@@
public:
* This method is called only if a submesh has HYP_OK algo_state.
*/
virtual void SubmeshRestored(SMESH_subMesh* subMesh);
* This method is called only if a submesh has HYP_OK algo_state.
*/
virtual void SubmeshRestored(SMESH_subMesh* subMesh);
-
+
public:
// ==================================================================
// Common algo utilities
public:
// ==================================================================
// Common algo utilities
@@
-339,7
+342,7
@@
public:
*/
static double EdgeLength(const TopoDS_Edge & E);
*/
static double EdgeLength(const TopoDS_Edge & E);
-
int
NumberOfPoints(SMESH_Mesh& aMesh,const TopoDS_Wire& W);
+
smIdType
NumberOfPoints(SMESH_Mesh& aMesh,const TopoDS_Wire& W);
/*!
* \brief Return continuity of two edges
/*!
* \brief Return continuity of two edges
@@
-398,7
+401,7
@@
public:
enum EMeshError { MEr_OK = 0, MEr_HOLES, MEr_BAD_ORI, MEr_EMPTY };
/*!
enum EMeshError { MEr_OK = 0, MEr_HOLES, MEr_BAD_ORI, MEr_EMPTY };
/*!
- * \brief Finds topological errors of a sub-mesh
+ * \brief Finds topological errors of a sub-mesh
*/
static EMeshError GetMeshError(SMESH_subMesh* subMesh);
*/
static EMeshError GetMeshError(SMESH_subMesh* subMesh);
@@
-434,7
+437,7
@@
protected:
std::vector<std::string> _compatibleHypothesis;
std::list<const SMESHDS_Hypothesis *> _usedHypList;
std::list<TopoDS_Shape> _assigedShapeList; // _usedHypList assigned to
std::vector<std::string> _compatibleHypothesis;
std::list<const SMESHDS_Hypothesis *> _usedHypList;
std::list<TopoDS_Shape> _assigedShapeList; // _usedHypList assigned to
-
+
// Algo features influencing which Compute() and how is called:
// in what turn and with what input shape.
// Algo features influencing which Compute() and how is called:
// in what turn and with what input shape.