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
Copyright update: 2016
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.hxx
diff --git
a/src/SMESH/SMESH_Gen.hxx
b/src/SMESH/SMESH_Gen.hxx
index 064d7685331d37192e8d1d617d8f84520f6f058f..65dc4f347062e19cecbbafde1e067c1e27309f55 100644
(file)
--- a/
src/SMESH/SMESH_Gen.hxx
+++ b/
src/SMESH/SMESH_Gen.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-87,7
+87,7
@@
public:
void CancelCompute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape);
void CancelCompute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape);
- const SMESH_subMesh* GetCurrentSubMesh() const
{ return _sm_current; }
+ const SMESH_subMesh* GetCurrentSubMesh() const
;
/*!
* \brief evaluates size of prospective mesh on a shape
/*!
* \brief evaluates size of prospective mesh on a shape
@@
-125,7
+125,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)
@@
-173,8
+173,11
@@
private:
// default number of segments
int _nbSegments;
// default number of segments
int _nbSegments;
- volatile bool _compute_canceled;
- SMESH_subMesh* _sm_current;
+ void setCurrentSubMesh(SMESH_subMesh* sm);
+ void resetCurrentSubMesh();
+
+ volatile bool _compute_canceled;
+ std::list< SMESH_subMesh* > _sm_current;
};
#endif
};
#endif