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
Merge from V7_3_BR branch 18/12/2013
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Regular_1D.hxx
diff --git
a/src/StdMeshers/StdMeshers_Regular_1D.hxx
b/src/StdMeshers/StdMeshers_Regular_1D.hxx
index aed1064abee96b9c69bc7a08751e79813b668de9..fbb9d0380628e70b8af7abd89b69cd6eb365467b 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Regular_1D.hxx
+++ b/
src/StdMeshers/StdMeshers_Regular_1D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-31,13
+31,13
@@
#include "SMESH_StdMeshers.hxx"
#include "SMESH_StdMeshers.hxx"
-#include "SMESH_1D_Algo.hxx"
-
-#include "StdMeshers_FixedPoints1D.hxx"
+#include "SMESH_Algo.hxx"
class Adaptor3d_Curve;
class Adaptor3d_Curve;
-class TopoDS_Vertex;
+class StdMeshers_Adaptive1D;
+class StdMeshers_FixedPoints1D;
class StdMeshers_SegmentLengthAroundVertex;
class StdMeshers_SegmentLengthAroundVertex;
+class TopoDS_Vertex;
class STDMESHERS_EXPORT StdMeshers_Regular_1D: public SMESH_1D_Algo
{
class STDMESHERS_EXPORT StdMeshers_Regular_1D: public SMESH_1D_Algo
{
@@
-55,6
+55,8
@@
public:
virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
MapShapeNbElems& aResMap);
virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
MapShapeNbElems& aResMap);
+ virtual void CancelCompute();
+
virtual const std::list <const SMESHDS_Hypothesis *> &
GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, const bool=true);
virtual const std::list <const SMESHDS_Hypothesis *> &
GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape, const bool=true);
@@
-100,7
+102,7
@@
protected:
StdMeshers_SegmentLengthAroundVertex* getVertexHyp(SMESH_Mesh & theMesh,
const TopoDS_Vertex & theV);
StdMeshers_SegmentLengthAroundVertex* getVertexHyp(SMESH_Mesh & theMesh,
const TopoDS_Vertex & theV);
- enum HypothesisType { LOCAL_LENGTH, MAX_LENGTH, NB_SEGMENTS, BEG_END_LENGTH, DEFLECTION, ARITHMETIC_1D, FIXED_POINTS_1D, NONE };
+ enum HypothesisType { LOCAL_LENGTH, MAX_LENGTH, NB_SEGMENTS, BEG_END_LENGTH, DEFLECTION, ARITHMETIC_1D, FIXED_POINTS_1D,
ADAPTIVE,
NONE };
enum ValueIndex {
SCALE_FACTOR_IND = 0,
enum ValueIndex {
SCALE_FACTOR_IND = 0,
@@
-111,9
+113,9
@@
protected:
};
enum IValueIndex {
};
enum IValueIndex {
- NB_SEGMENTS_IND = 0,
- DISTR_TYPE_IND = 1,
- CONV_MODE_IND = 2
+ NB_SEGMENTS_IND
= 0,
+ DISTR_TYPE_IND
= 1,
+ CONV_MODE_IND
= 2
};
enum VValueIndex {
};
enum VValueIndex {
@@
-127,6
+129,7
@@
protected:
HypothesisType _hypType;
const StdMeshers_FixedPoints1D* _fpHyp;
HypothesisType _hypType;
const StdMeshers_FixedPoints1D* _fpHyp;
+ const StdMeshers_Adaptive1D* _adaptiveHyp;
double _value[2];
int _ivalue[3];
double _value[2];
int _ivalue[3];