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 regressions
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.hxx
diff --git
a/src/SMESH/SMESH_Gen.hxx
b/src/SMESH/SMESH_Gen.hxx
index b7854786fc072753e187141e1b6014bba1ae255a..d011050354f065381884f99f8ffb016f5c77c67d 100644
(file)
--- a/
src/SMESH/SMESH_Gen.hxx
+++ b/
src/SMESH/SMESH_Gen.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-32,21
+32,22
@@
#include "Utils_SALOME_Exception.hxx"
#include "Utils_SALOME_Exception.hxx"
-#include "SMESH_Hypothesis.hxx"
-#include "SMESH_ComputeError.hxx"
#include "SMESH_Algo.hxx"
#include "SMESH_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-
-#include "chrono.hxx"
-
-#include <TopoDS_Shape.hxx>
+#include "SMESH_ComputeError.hxx"
#include <map>
#include <list>
#include <map>
#include <list>
+#include <set>
#include <vector>
#include <string>
#include <vector>
#include <string>
+#include <TopoDS_Shape.hxx>
+
class SMESHDS_Document;
class SMESHDS_Document;
+class SMESH_Algo;
+class SMESH_Mesh;
+class TopoDS_Shape;
+class SMESH_subMesh;
typedef SMESH_Hypothesis::Hypothesis_Status TAlgoStateErrorName;
typedef SMESH_Hypothesis::Hypothesis_Status TAlgoStateErrorName;
@@
-59,7
+60,7
@@
typedef struct studyContextStruct
typedef std::set<int> TSetOfInt;
typedef std::set<int> TSetOfInt;
-class SMESH_EXPORT
SMESH_Gen
+class SMESH_EXPORT SMESH_Gen
{
public:
SMESH_Gen();
{
public:
SMESH_Gen();
@@
-68,25
+69,34
@@
public:
SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode)
throw(SALOME_Exception);
SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode)
throw(SALOME_Exception);
+ enum ComputeFlags
+ {
+ SHAPE_ONLY = 1, // to ignore algo->OnlyUnaryInput() feature and to compute a given shape only.
+ UPWARD = 2, // to compute from vertices up to more complex shape (internal usage)
+ COMPACT_MESH = 4, // to compact the mesh at the end
+ SHAPE_ONLY_UPWARD = 3 // SHAPE_ONLY | UPWARD
+ };
/*!
* \brief Computes aMesh on aShape
/*!
* \brief Computes aMesh on aShape
- * \param anUpward - compute from vertices up to more complex shape (internal usage)
- * \param aDim - upper level dimension of the mesh computation
+ * \param aMesh - the mesh.
+ * \param aShape - the shape.
+ * \param aFlags - ComputeFlags. By default compute the whole mesh and compact at the end.
+ * \param aDim - upper level dimension of the mesh computation (for preview)
* \param aShapesId - list of shapes with computed mesh entities (elements or nodes)
* \param aShapesId - list of shapes with computed mesh entities (elements or nodes)
- * \retval bool - true if none submesh failed to compute
+ * \retval bool - true if none sub
-
mesh failed to compute
*/
bool Compute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape,
*/
bool Compute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape,
- const
bool anUpward=false
,
+ const
int aFlags = COMPACT_MESH
,
const ::MeshDimension aDim=::MeshDim_3D,
TSetOfInt* aShapesId=0);
const ::MeshDimension aDim=::MeshDim_3D,
TSetOfInt* aShapesId=0);
-#ifdef WITH_SMESH_CANCEL_COMPUTE
void PrepareCompute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape);
void CancelCompute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape);
void PrepareCompute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape);
void CancelCompute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape);
-#endif
+
+ const SMESH_subMesh* GetCurrentSubMesh() const;
/*!
* \brief evaluates size of prospective mesh on a shape
/*!
* \brief evaluates size of prospective mesh on a shape
@@
-124,7
+134,7
@@
public:
int _algoDim;
bool _isGlobalAlgo;
int _algoDim;
bool _isGlobalAlgo;
- TAlgoStateError(): _
algoDim(0),_algo(0),_name(SMESH_Hypothesis::HYP_OK
) {}
+ TAlgoStateError(): _
name(SMESH_Hypothesis::HYP_OK), _algo(0), _algoDim(0
) {}
void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal)
{ _name = name; _algo = algo; _algoDim = algo->GetDim(); _isGlobalAlgo = isGlobal; }
void Set(TAlgoStateErrorName name, const int algoDim, bool isGlobal)
void Set(TAlgoStateErrorName name, const SMESH_Algo* algo, bool isGlobal)
{ _name = name; _algo = algo; _algoDim = algo->GetDim(); _isGlobalAlgo = isGlobal; }
void Set(TAlgoStateErrorName name, const int algoDim, bool isGlobal)
@@
-140,10
+150,11
@@
public:
StudyContextStruct *GetStudyContext(int studyId);
static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType);
StudyContextStruct *GetStudyContext(int studyId);
static int GetShapeDim(const TopAbs_ShapeEnum & aShapeType);
- static int GetShapeDim(const TopoDS_Shape & aShape)
+ static int GetShapeDim(const TopoDS_Shape &
aShape)
{ return GetShapeDim( aShape.ShapeType() ); }
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
{ return GetShapeDim( aShape.ShapeType() ); }
SMESH_Algo* GetAlgo(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, TopoDS_Shape* assignedTo=0);
+ SMESH_Algo* GetAlgo(SMESH_subMesh * aSubMesh, TopoDS_Shape* assignedTo=0);
static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
static bool IsGlobalHypothesis(const SMESH_Hypothesis* theHyp, SMESH_Mesh& aMesh);
@@
-151,12
+162,6
@@
public:
int GetANewId();
int GetANewId();
- std::map < int, SMESH_Algo * >_mapAlgo;
- std::map < int, SMESH_0D_Algo * >_map0D_Algo;
- std::map < int, SMESH_1D_Algo * >_map1D_Algo;
- std::map < int, SMESH_2D_Algo * >_map2D_Algo;
- std::map < int, SMESH_3D_Algo * >_map3D_Algo;
-
private:
int _localId; // unique Id of created objects, within SMESH_Gen entity
private:
int _localId; // unique Id of created objects, within SMESH_Gen entity
@@
-168,14
+173,14
@@
private:
// number of segments per diagonal of boundary box of geometry by which
// default segment length of appropriate 1D hypotheses is defined
int _segmentation;
// number of segments per diagonal of boundary box of geometry by which
// default segment length of appropriate 1D hypotheses is defined
int _segmentation;
- // default of segments
+ // default
number
of segments
int _nbSegments;
int _nbSegments;
- counters *_counters;
-#ifdef WITH_SMESH_CANCEL_COMPUTE
- volatile bool _compute_canceled;
- SMESH_subMesh* _sm_current;
-#endif
+ void setCurrentSubMesh(SMESH_subMesh* sm);
+ void resetCurrentSubMesh();
+
+ volatile bool _compute_canceled;
+ std::list< SMESH_subMesh* > _sm_current;
};
#endif
};
#endif