From: eap Date: Fri, 23 Jan 2009 14:07:47 +0000 (+0000) Subject: 0019941: EDF 766 SMESH : Max length hypothesis X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=88c60fd99dac45ff08bc58f9ad7066437013368e;p=modules%2Fsmesh.git 0019941: EDF 766 SMESH : Max length hypothesis - virtual bool SetParametersByElementSize(double elemLenght, const SMESH_Mesh* theMesh=0)=0; + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0)=0; --- diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx index b68acbe1c..7398cf856 100644 --- a/src/SMESH/SMESH_Algo.cxx +++ b/src/SMESH/SMESH_Algo.cxx @@ -294,7 +294,7 @@ bool SMESH_Algo::SetParametersByMesh(const SMESH_Mesh* /*theMesh*/, { return false; } -bool SMESH_Algo::SetParametersByElementSize(double, const SMESH_Mesh*) +bool SMESH_Algo::SetParametersByDefaults(const TDefaults& , const SMESH_Mesh*) { return false; } diff --git a/src/SMESH/SMESH_Algo.hxx b/src/SMESH/SMESH_Algo.hxx index 806b3d0f2..4b681dc0a 100644 --- a/src/SMESH/SMESH_Algo.hxx +++ b/src/SMESH/SMESH_Algo.hxx @@ -166,7 +166,7 @@ public: * \brief Just return false as the algorithm does not hold parameters values */ virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); - virtual bool SetParametersByElementSize(double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); /*! * \brief return compute error */ diff --git a/src/SMESH/SMESH_Hypothesis.hxx b/src/SMESH/SMESH_Hypothesis.hxx index 366ffeab1..d62f22352 100644 --- a/src/SMESH/SMESH_Hypothesis.hxx +++ b/src/SMESH/SMESH_Hypothesis.hxx @@ -85,11 +85,16 @@ public: */ virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape)=0; + struct TDefaults + { + double _elemLength; + int _nbSegments; + }; /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize(double elemLenght, const SMESH_Mesh* theMesh=0)=0; + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0)=0; /*! * \brief Return true if me is an auxiliary hypothesis diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index ec08a297e..351e6034e 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -944,14 +944,12 @@ SMESHGUI_MeshOp::getInitParamsHypothesis( const QString& aHypType, } } - if ( (!isSubMesh || !aMeshVar->_is_nil()) && !aGeomVar->_is_nil() ) - return SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(), - aServerLib.toLatin1().data(), - aMeshVar, - aGeomVar, - /*byMesh = */isSubMesh); - - return SMESH::SMESH_Hypothesis::_nil(); + return SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(), + aServerLib.toLatin1().data(), + aMeshVar, + aGeomVar, + /*byMesh = */isSubMesh); + } //================================================================================ diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.cxx b/src/StdMeshers/StdMeshers_Arithmetic1D.cxx index 5b63f922b..f5ac03c5e 100644 --- a/src/StdMeshers/StdMeshers_Arithmetic1D.cxx +++ b/src/StdMeshers/StdMeshers_Arithmetic1D.cxx @@ -198,14 +198,14 @@ bool StdMeshers_Arithmetic1D::SetParametersByMesh(const SMESH_Mesh* theMesh, //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_Arithmetic1D::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* /*mesh*/) +bool StdMeshers_Arithmetic1D::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*mesh*/) { - return bool( _begLength = _endLength = elemLenght ); + return bool( _begLength = _endLength = dflts._elemLength ); } diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx index fb8075d1c..94952b774 100644 --- a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx +++ b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx @@ -57,10 +57,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _begLength, _endLength; diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.cxx b/src/StdMeshers/StdMeshers_AutomaticLength.cxx index 3e91de780..95710c94e 100644 --- a/src/StdMeshers/StdMeshers_AutomaticLength.cxx +++ b/src/StdMeshers/StdMeshers_AutomaticLength.cxx @@ -369,13 +369,13 @@ bool StdMeshers_AutomaticLength::SetParametersByMesh(const SMESH_Mesh* theMesh //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_AutomaticLength::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* theMesh) +bool StdMeshers_AutomaticLength::SetParametersByDefaults(const TDefaults& /*theDflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.hxx b/src/StdMeshers/StdMeshers_AutomaticLength.hxx index 1ce7d30d5..627003aa6 100644 --- a/src/StdMeshers/StdMeshers_AutomaticLength.hxx +++ b/src/StdMeshers/StdMeshers_AutomaticLength.hxx @@ -96,10 +96,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: std::map _TShapeToLength; diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx index 98e3b4905..42ad9219a 100644 --- a/src/StdMeshers/StdMeshers_Deflection1D.cxx +++ b/src/StdMeshers/StdMeshers_Deflection1D.cxx @@ -223,13 +223,13 @@ bool StdMeshers_Deflection1D::SetParametersByMesh(const SMESH_Mesh* theMesh, //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_Deflection1D::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_Deflection1D::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; } diff --git a/src/StdMeshers/StdMeshers_Deflection1D.hxx b/src/StdMeshers/StdMeshers_Deflection1D.hxx index 47b863046..a3cf19b70 100644 --- a/src/StdMeshers/StdMeshers_Deflection1D.hxx +++ b/src/StdMeshers/StdMeshers_Deflection1D.hxx @@ -56,10 +56,10 @@ class STDMESHERS_EXPORT StdMeshers_Deflection1D:public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _value; diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.cxx b/src/StdMeshers/StdMeshers_LayerDistribution.cxx index 7b0331380..8e5987e6b 100644 --- a/src/StdMeshers/StdMeshers_LayerDistribution.cxx +++ b/src/StdMeshers/StdMeshers_LayerDistribution.cxx @@ -146,13 +146,13 @@ bool StdMeshers_LayerDistribution::SetParametersByMesh(const SMESH_Mesh* , } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_LayerDistribution::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* theMesh) +bool StdMeshers_LayerDistribution::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* theMesh) { - return myHyp ? myHyp->SetParametersByElementSize(elemLenght,theMesh) : false; + return myHyp ? myHyp->SetParametersByDefaults(dflts,theMesh) : false; } diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.hxx b/src/StdMeshers/StdMeshers_LayerDistribution.hxx index 4b170a2df..aca054d4f 100644 --- a/src/StdMeshers/StdMeshers_LayerDistribution.hxx +++ b/src/StdMeshers/StdMeshers_LayerDistribution.hxx @@ -83,10 +83,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: SMESH_Hypothesis* myHyp; diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx index abe6060e7..cad6e9186 100644 --- a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx +++ b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx @@ -153,13 +153,13 @@ bool StdMeshers_LengthFromEdges::SetParametersByMesh(const SMESH_Mesh* /*theMesh } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_LengthFromEdges::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_LengthFromEdges::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return true; } diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx index 6d3c02c62..cb52638e5 100644 --- a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx +++ b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx @@ -62,10 +62,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: int _mode; diff --git a/src/StdMeshers/StdMeshers_LocalLength.cxx b/src/StdMeshers/StdMeshers_LocalLength.cxx index a13811153..d74abe9fd 100644 --- a/src/StdMeshers/StdMeshers_LocalLength.cxx +++ b/src/StdMeshers/StdMeshers_LocalLength.cxx @@ -236,14 +236,14 @@ bool StdMeshers_LocalLength::SetParametersByMesh(const SMESH_Mesh* theMesh, } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_LocalLength::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_LocalLength::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*theMesh*/) { - return bool( _length = elemLenght ); + return bool( _length = dflts._elemLength ); } diff --git a/src/StdMeshers/StdMeshers_LocalLength.hxx b/src/StdMeshers/StdMeshers_LocalLength.hxx index a46a30521..1c8d72b27 100644 --- a/src/StdMeshers/StdMeshers_LocalLength.hxx +++ b/src/StdMeshers/StdMeshers_LocalLength.hxx @@ -60,10 +60,10 @@ class STDMESHERS_EXPORT StdMeshers_LocalLength: public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _length; diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.cxx b/src/StdMeshers/StdMeshers_MaxElementArea.cxx index 21fd6ea54..36e40e172 100644 --- a/src/StdMeshers/StdMeshers_MaxElementArea.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementArea.cxx @@ -187,14 +187,14 @@ bool StdMeshers_MaxElementArea::SetParametersByMesh(const SMESH_Mesh* theMesh, } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_MaxElementArea::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_MaxElementArea::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*theMesh*/) { - return bool( _maxArea = elemLenght*elemLenght ); + return bool( _maxArea = dflts._elemLength*dflts._elemLength ); } diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.hxx b/src/StdMeshers/StdMeshers_MaxElementArea.hxx index 17bd01815..095067363 100644 --- a/src/StdMeshers/StdMeshers_MaxElementArea.hxx +++ b/src/StdMeshers/StdMeshers_MaxElementArea.hxx @@ -57,10 +57,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _maxArea; diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx index 1fd721b2c..435213aad 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx @@ -198,14 +198,14 @@ bool StdMeshers_MaxElementVolume::SetParametersByMesh(const SMESH_Mesh* theMes } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_MaxElementVolume::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_MaxElementVolume::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*theMesh*/) { - return bool( _maxVolume = elemLenght*elemLenght*elemLenght ); + return bool( _maxVolume = dflts._elemLength*dflts._elemLength*dflts._elemLength ); } diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx index d63eb4d4f..6395fd419 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx @@ -59,10 +59,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _maxVolume; diff --git a/src/StdMeshers/StdMeshers_MaxLength.cxx b/src/StdMeshers/StdMeshers_MaxLength.cxx index aa34f81d8..475e56ae5 100644 --- a/src/StdMeshers/StdMeshers_MaxLength.cxx +++ b/src/StdMeshers/StdMeshers_MaxLength.cxx @@ -226,17 +226,17 @@ bool StdMeshers_MaxLength::SetParametersByMesh(const SMESH_Mesh* theMesh, } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_MaxLength::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_MaxLength::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*theMesh*/) { - _preestimation = ( elemLenght > 0.); - if ( _preestimation ) - _preestimated = elemLenght; - return bool( _length = elemLenght ); + //_preestimation = ( dflts._elemLength > 0.); + if ( dflts._elemLength > 0. ) + _preestimated = dflts._elemLength; + return bool( _length = dflts._elemLength ); } diff --git a/src/StdMeshers/StdMeshers_MaxLength.hxx b/src/StdMeshers/StdMeshers_MaxLength.hxx index 507706bb0..23d94a9f2 100644 --- a/src/StdMeshers/StdMeshers_MaxLength.hxx +++ b/src/StdMeshers/StdMeshers_MaxLength.hxx @@ -58,10 +58,10 @@ class STDMESHERS_EXPORT StdMeshers_MaxLength: public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _length, _preestimated; diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx index 9325c334b..66c58f13c 100644 --- a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx +++ b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx @@ -113,13 +113,13 @@ bool StdMeshers_NotConformAllowed::SetParametersByMesh(const SMESH_Mesh* /*theMe } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_NotConformAllowed::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_NotConformAllowed::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return true; } diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx index 4c2423b14..ddcfcb445 100644 --- a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx +++ b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx @@ -55,10 +55,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); }; diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx index df8fc7dba..604ee185a 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx @@ -162,14 +162,16 @@ bool StdMeshers_NumberOfLayers::SetParametersByMesh(const SMESH_Mesh* , //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_NumberOfLayers::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* theMesh) +bool StdMeshers_NumberOfLayers::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* theMesh) { - return bool( theMesh ? _nbLayers = int( theMesh->GetShapeDiagonalSize() / elemLenght/ 2.) : 0); + if ( dflts._elemLength ) + return bool( theMesh ? _nbLayers = int( theMesh->GetShapeDiagonalSize() / dflts._elemLength/ 2.) : 0); + return false; } diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx index 5b9f06955..ebaae84a9 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx @@ -74,10 +74,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: int _nbLayers; diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index e96083c64..90c50a0bb 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -684,14 +684,14 @@ bool StdMeshers_NumberOfSegments::SetParametersByMesh(const SMESH_Mesh* theMes } //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_NumberOfSegments::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_NumberOfSegments::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*theMesh*/) { - return false; + return bool(_numberOfSegments = dflts._nbSegments ); } diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx index 595893e2a..1be5b9176 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx @@ -171,10 +171,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); virtual std::ostream & SaveTo(std::ostream & save); virtual std::istream & LoadFrom(std::istream & load); diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx index 6e74ca1e0..8a2052071 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx @@ -230,13 +230,13 @@ void StdMeshers_ProjectionSource1D::RestoreParams(const TopoDS_Shape& s1, //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_ProjectionSource1D::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_ProjectionSource1D::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; } diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx index e734049f7..301dedf30 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx @@ -137,10 +137,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx index 6301c9e19..a1393fc79 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx @@ -298,13 +298,13 @@ void StdMeshers_ProjectionSource2D::RestoreParams(const TopoDS_Shape& s1, //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_ProjectionSource2D::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_ProjectionSource2D::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; } diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx index 18c01c806..a23d4c494 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx @@ -147,10 +147,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx index 6e5cf4630..b77808f36 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx @@ -298,13 +298,13 @@ void StdMeshers_ProjectionSource3D::RestoreParams(const TopoDS_Shape& s1, //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_ProjectionSource3D::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_ProjectionSource3D::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; } diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx index e2fcb5278..fd6848aec 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx @@ -139,10 +139,10 @@ public: virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: diff --git a/src/StdMeshers/StdMeshers_Propagation.cxx b/src/StdMeshers/StdMeshers_Propagation.cxx index 55c102f1b..c6b9b015f 100644 --- a/src/StdMeshers/StdMeshers_Propagation.cxx +++ b/src/StdMeshers/StdMeshers_Propagation.cxx @@ -96,7 +96,7 @@ ostream & operator << (ostream & save, StdMeshers_Propagation & hyp) { return istream & operator >> (istream & load, StdMeshers_Propagation & hyp) { return hyp.LoadFrom(load); } bool StdMeshers_Propagation::SetParametersByMesh(const SMESH_Mesh*, const TopoDS_Shape& ) { return false; } -bool StdMeshers_Propagation::SetParametersByElementSize(double,const SMESH_Mesh*) { return false; } +bool StdMeshers_Propagation::SetParametersByDefaults(const TDefaults&,const SMESH_Mesh*) { return false; } void StdMeshers_Propagation::SetPropagationMgr(SMESH_subMesh* subMesh) { PropagationMgr::Set( subMesh ); } /*! * \brief Return an edge from which hypotheses are propagated from diff --git a/src/StdMeshers/StdMeshers_Propagation.hxx b/src/StdMeshers/StdMeshers_Propagation.hxx index b57ee92be..b02f9aebe 100644 --- a/src/StdMeshers/StdMeshers_Propagation.hxx +++ b/src/StdMeshers/StdMeshers_Propagation.hxx @@ -81,10 +81,10 @@ class STDMESHERS_EXPORT StdMeshers_Propagation:public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); }; #endif diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx index 4b09c904c..cf3986e38 100644 --- a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx +++ b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx @@ -115,13 +115,13 @@ bool StdMeshers_QuadranglePreference::SetParametersByMesh(const SMESH_Mesh* /*th //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_QuadranglePreference::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_QuadranglePreference::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; } diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx index 9ff059fbb..ec641d15a 100644 --- a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx +++ b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx @@ -59,10 +59,10 @@ class STDMESHERS_EXPORT StdMeshers_QuadranglePreference:public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); }; diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx index 193b9d75e..4764356f2 100644 --- a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx +++ b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx @@ -110,13 +110,13 @@ bool StdMeshers_QuadraticMesh::SetParametersByMesh(const SMESH_Mesh*, const Topo //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_QuadraticMesh::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_QuadraticMesh::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; } diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx index f30ebac3f..9972469c0 100644 --- a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx +++ b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx @@ -61,10 +61,10 @@ class STDMESHERS_EXPORT StdMeshers_QuadraticMesh:public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); }; diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx index 44fe4ae43..f5540a88c 100644 --- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx +++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx @@ -203,13 +203,13 @@ bool StdMeshers_SegmentLengthAroundVertex::SetParametersByMesh(const SMESH_Mesh* //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_SegmentLengthAroundVertex::SetParametersByElementSize(double, - const SMESH_Mesh*) +bool StdMeshers_SegmentLengthAroundVertex::SetParametersByDefaults(const TDefaults&, + const SMESH_Mesh*) { return false; } diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx index f77f15dd1..c7c54bbf6 100644 --- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx +++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx @@ -60,10 +60,10 @@ class STDMESHERS_EXPORT StdMeshers_SegmentLengthAroundVertex:public SMESH_Hypoth virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _length; diff --git a/src/StdMeshers/StdMeshers_StartEndLength.cxx b/src/StdMeshers/StdMeshers_StartEndLength.cxx index 0177576cf..0beb6349a 100644 --- a/src/StdMeshers/StdMeshers_StartEndLength.cxx +++ b/src/StdMeshers/StdMeshers_StartEndLength.cxx @@ -199,14 +199,14 @@ bool StdMeshers_StartEndLength::SetParametersByMesh(const SMESH_Mesh* theMesh, //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_StartEndLength::SetParametersByElementSize(double elemLenght, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_StartEndLength::SetParametersByDefaults(const TDefaults& dflts, + const SMESH_Mesh* /*theMesh*/) { - return bool(_begLength = _endLength = elemLenght ); + return bool(_begLength = _endLength = dflts._elemLength ); } diff --git a/src/StdMeshers/StdMeshers_StartEndLength.hxx b/src/StdMeshers/StdMeshers_StartEndLength.hxx index 94b609139..00f228771 100644 --- a/src/StdMeshers/StdMeshers_StartEndLength.hxx +++ b/src/StdMeshers/StdMeshers_StartEndLength.hxx @@ -56,10 +56,10 @@ class STDMESHERS_EXPORT StdMeshers_StartEndLength:public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); protected: double _begLength, _endLength; diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.cxx b/src/StdMeshers/StdMeshers_TrianglePreference.cxx index 5d21cf90e..331cd0d1c 100644 --- a/src/StdMeshers/StdMeshers_TrianglePreference.cxx +++ b/src/StdMeshers/StdMeshers_TrianglePreference.cxx @@ -115,13 +115,13 @@ bool StdMeshers_TrianglePreference::SetParametersByMesh(const SMESH_Mesh* /*theM //================================================================================ /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_TrianglePreference::SetParametersByElementSize(double /*elemLenght*/, - const SMESH_Mesh* /*theMesh*/) +bool StdMeshers_TrianglePreference::SetParametersByDefaults(const TDefaults& /*dflts*/, + const SMESH_Mesh* /*theMesh*/) { return false; } diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.hxx b/src/StdMeshers/StdMeshers_TrianglePreference.hxx index 16963b093..34ec364a1 100644 --- a/src/StdMeshers/StdMeshers_TrianglePreference.hxx +++ b/src/StdMeshers/StdMeshers_TrianglePreference.hxx @@ -58,10 +58,10 @@ class STDMESHERS_EXPORT StdMeshers_TrianglePreference:public SMESH_Hypothesis virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape); /*! - * \brief Initialize my parameter values by linear size of mesh element. + * \brief Initialize my parameter values by default parameters. * \retval bool - true if parameter values have been successfully defined */ - virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0); + virtual bool SetParametersByDefaults(const TDefaults& dflts, const SMESH_Mesh* theMesh=0); };