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
PR: synchro V6_main tag mergeto_V7_main_11Feb13
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Hypothesis.hxx
diff --git
a/src/SMESH/SMESH_Hypothesis.hxx
b/src/SMESH/SMESH_Hypothesis.hxx
index 9b0e9defb20e6d24fc22bd03915b6459c4e25072..ec21fff14e5ffbdfc9cb30e8c1e6c48a389c27d0 100644
(file)
--- a/
src/SMESH/SMESH_Hypothesis.hxx
+++ b/
src/SMESH/SMESH_Hypothesis.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
@@
-51,7
+51,7
@@
public:
{
HYP_OK = 0,
HYP_MISSING, // algo misses a hypothesis
{
HYP_OK = 0,
HYP_MISSING, // algo misses a hypothesis
- HYP_CONCURENT, // several applicable hypotheses
+ HYP_CONCURENT, // several applicable hypotheses
assigned to father shapes
HYP_BAD_PARAMETER,// hypothesis has a bad parameter value
HYP_HIDDEN_ALGO, // an algo is hidden by an upper dim algo generating all-dim elements
HYP_HIDING_ALGO, // an algo hides lower dim algos by generating all-dim elements
HYP_BAD_PARAMETER,// hypothesis has a bad parameter value
HYP_HIDDEN_ALGO, // an algo is hidden by an upper dim algo generating all-dim elements
HYP_HIDING_ALGO, // an algo hides lower dim algos by generating all-dim elements
@@
-59,9
+59,9
@@
public:
// for Add/RemoveHypothesis operations
HYP_INCOMPATIBLE, // hypothesis does not fit algo
HYP_NOTCONFORM, // not conform mesh is produced appling a hypothesis
// for Add/RemoveHypothesis operations
HYP_INCOMPATIBLE, // hypothesis does not fit algo
HYP_NOTCONFORM, // not conform mesh is produced appling a hypothesis
- HYP_ALREADY_EXIST,// s
uch hypothesis already exist
+ HYP_ALREADY_EXIST,// s
everal applicable hypothesis of same priority assigned
HYP_BAD_DIM, // bad dimension
HYP_BAD_DIM, // bad dimension
- HYP_BAD_SUBSHAPE, // shape is neither the main one, nor its subshape, nor a group
+ HYP_BAD_SUBSHAPE, // shape is neither the main one, nor its sub
-
shape, nor a group
HYP_BAD_GEOMETRY, // shape geometry mismatches algorithm's expectation
HYP_NEED_SHAPE // algorithm can work on shape only
};
HYP_BAD_GEOMETRY, // shape geometry mismatches algorithm's expectation
HYP_NEED_SHAPE // algorithm can work on shape only
};
@@
-71,18
+71,19
@@
public:
SMESH_Hypothesis(int hypId, int studyId, SMESH_Gen* gen);
virtual ~SMESH_Hypothesis();
virtual int GetDim() const;
SMESH_Hypothesis(int hypId, int studyId, SMESH_Gen* gen);
virtual ~SMESH_Hypothesis();
virtual int GetDim() const;
- int GetStudyId() const;
- virtual void NotifySubMeshesHypothesisModification();
+ int
GetStudyId() const;
+ SMESH_Gen* GetGen() const { return (SMESH_Gen*) _gen; }
virtual int GetShapeType() const;
virtual const char* GetLibName() const;
virtual int GetShapeType() const;
virtual const char* GetLibName() const;
+ virtual void NotifySubMeshesHypothesisModification();
void SetLibName(const char* theLibName);
void SetLibName(const char* theLibName);
- void SetParameters(const char *theParameters);
- char* GetParameters() const;
+
//
void SetParameters(const char *theParameters);
+
//
char* GetParameters() const;
- void SetLastParameters(const char* theParameters);
- char* GetLastParameters() const;
- void ClearParameters();
+
//
void SetLastParameters(const char* theParameters);
+
//
char* GetLastParameters() const;
+
//
void ClearParameters();
/*!
* \brief Initialize my parameter values by the mesh built on the geometry
/*!
* \brief Initialize my parameter values by the mesh built on the geometry
@@
-122,14
+123,14
@@
public:
protected:
SMESH_Gen* _gen;
protected:
SMESH_Gen* _gen;
- int _studyId;
- int _shapeType;
- int _param_algo_dim; // to be set at descendant hypothesis constructor
+ int
_studyId;
+ int
_shapeType;
+ int
_param_algo_dim; // to be set at descendant hypothesis constructor
private:
private:
- std::string _libName;
- std::string _parameters;
- std::string _lastParameters;
+ std::string _libName;
// name of library of plug-in Engine
+
//
std::string _parameters;
+
//
std::string _lastParameters;
};
#endif
};
#endif