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
0021262: EDF 1867 SMESH: Problem with concatenate that causes failure in an important...
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Gen.hxx
diff --git
a/src/SMESH/SMESH_Gen.hxx
b/src/SMESH/SMESH_Gen.hxx
index 44c7d5a79e206ecd31c085788957f2bc41caed5c..311fe4aad4d8581942fcf1c63fc48d04f9e38927 100644
(file)
--- a/
src/SMESH/SMESH_Gen.hxx
+++ b/
src/SMESH/SMESH_Gen.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,12
+19,12
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESH : implementaion of SMESH idl descriptions
// File : SMESH_Gen.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
//
// SMESH SMESH : implementaion of SMESH idl descriptions
// File : SMESH_Gen.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
//
-
#ifndef _SMESH_GEN_HXX_
#define _SMESH_GEN_HXX_
#ifndef _SMESH_GEN_HXX_
#define _SMESH_GEN_HXX_
@@
-41,6
+41,8
@@
#include "SMESH_3D_Algo.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_3D_Algo.hxx"
#include "SMESH_Mesh.hxx"
+#include "chrono.hxx"
+
#include <TopoDS_Shape.hxx>
#include <map>
#include <TopoDS_Shape.hxx>
#include <map>
@@
-81,6
+83,13
@@
public:
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);
+#endif
+
/*!
* \brief evaluates size of prospective mesh on a shape
* \param aMesh - the mesh
/*!
* \brief evaluates size of prospective mesh on a shape
* \param aMesh - the mesh
@@
-159,6
+168,12
@@
private:
int _segmentation;
// default of segments
int _nbSegments;
int _segmentation;
// default of segments
int _nbSegments;
+ counters *_counters;
+
+#ifdef WITH_SMESH_CANCEL_COMPUTE
+ volatile bool _compute_canceled;
+ SMESH_subMesh* _sm_current;
+#endif
};
#endif
};
#endif