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/NETGENPlugin/NETGENPlugin_Hypothesis.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
index 1ed64eeddeec4c3110a73652a3f1b2c14c9c7b9c..75100b5ea4a11f21ee3ccd2bfce920b6a33b7e8d 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
@@ -295,15 +295,17 @@ bool NETGENPlugin_Hypothesis::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 NETGENPlugin_Hypothesis::SetParametersByElementSize(double            elemLenght,
-                                                         const SMESH_Mesh* /*theMesh*/)
+bool NETGENPlugin_Hypothesis::SetParametersByDefaults(const TDefaults&  dflts,
+                                                      const SMESH_Mesh* /*theMesh*/)
 {
-  return bool( _maxSize = elemLenght );
+  _nbSegPerEdge = dflts._nbSegments;
+  _maxSize      = dflts._elemLength;
+  return _nbSegPerEdge && _maxSize > 0;
 }
 
 //=============================================================================

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
index 3cf75a45cf01f5cc4b73e0657a5088d05e764a63..3654f86102219ba4959a6d48fbd1dbb30f3d55af 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
@@ -102,10 +102,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);
 
 private:
   double        _maxSize;

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
index 4ccef3b9c6b83301bcf13ca4221633f8d120a625..a54d2fbf35695d9ff07e0d68fe772a820d0a0346 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
@@ -209,14 +209,16 @@ bool NETGENPlugin_SimpleHypothesis_2D::SetParametersByMesh(const SMESH_Mesh*   t
 
 //================================================================================
 /*!
- * \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 NETGENPlugin_SimpleHypothesis_2D::SetParametersByElementSize(double            elemLenght,
-                                                                  const SMESH_Mesh* /*theMesh*/)
+bool NETGENPlugin_SimpleHypothesis_2D::SetParametersByDefaults(const TDefaults&    dflts,
+                                                               const SMESH_Mesh* /*theMesh*/)
 {
-  return bool( _segmentLength = elemLenght );
+  _nbSegments    = dflts._nbSegments;
+  _segmentLength = dflts._elemLength;
+  return _nbSegments && _segmentLength > 0;
 }
 

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
index 545f92ef4701ed62339053515239e6a2a10e1c5c..4ed92181a184e633c48b89cd17b34f1ce83032fe 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
@@ -93,10 +93,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);
 
 private:
   int    _nbSegments;