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 bug 12796: Warning missed for the bad file 'test18.med'
[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 548d5980204e69acefcfc36247a57405231adcab..b820df11b64420253feb7410d05a131d15d3ffc6 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Regular_1D.hxx
+++ b/
src/StdMeshers/StdMeshers_Regular_1D.hxx
@@
-17,7
+17,7
@@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-//
See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
//
//
//
@@
-49,7
+49,7
@@
public:
const TopoDS_Shape& aShape);
virtual const std::list <const SMESHDS_Hypothesis *> &
const TopoDS_Shape& aShape);
virtual const std::list <const SMESHDS_Hypothesis *> &
- GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape);
+ GetUsedHypothesis(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape
, const bool=true
);
ostream & SaveTo(ostream & save);
istream & LoadFrom(istream & load);
ostream & SaveTo(ostream & save);
istream & LoadFrom(istream & load);
@@
-58,23
+58,43
@@
public:
protected:
protected:
- bool computeInternalParameters (const TopoDS_Edge& theEdge,
- std::list< double > & theParameters ) const;
+ virtual bool computeInternalParameters (const TopoDS_Edge& theEdge,
+ std::list< double > & theParameters,
+ const bool theReverse) const;
enum HypothesisType { LOCAL_LENGTH, NB_SEGMENTS, BEG_END_LENGTH, DEFLECTION, ARITHMETIC_1D, NONE };
enum ValueIndex {
enum HypothesisType { LOCAL_LENGTH, NB_SEGMENTS, BEG_END_LENGTH, DEFLECTION, ARITHMETIC_1D, NONE };
enum ValueIndex {
- NB_SEGMENTS_IND = 0,
- SCALE_FACTOR_IND = 1,
+ SCALE_FACTOR_IND = 0,
BEG_LENGTH_IND = 0,
END_LENGTH_IND = 1,
DEFLECTION_IND = 0
};
BEG_LENGTH_IND = 0,
END_LENGTH_IND = 1,
DEFLECTION_IND = 0
};
-
+
+ enum IValueIndex {
+ NB_SEGMENTS_IND = 0,
+ DISTR_TYPE_IND = 1,
+ CONV_MODE_IND = 2
+ };
+
+ enum VValueIndex {
+ TAB_FUNC_IND = 0
+ };
+
+ enum SValueIndex {
+ EXPR_FUNC_IND = 0
+ };
+
HypothesisType _hypType;
double _value[2];
HypothesisType _hypType;
double _value[2];
-
+ int _ivalue[3];
+ std::vector<double> _vvalue[1];
+ std::string _svalue[1];
+
+ // a source of propagated hypothesis, is set by CheckHypothesis()
+ // always called before Compute()
+ TopoDS_Shape _mainEdge;
};
#endif
};
#endif