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;

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;
 }

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
    */

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

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(),
-    return SMESHGUI::GetSMESHGen()->GetHypothesisParameterValues( aHypType.toLatin1().data(),
+                                                                aServerLib.toLatin1().data(),
-                                                                  aServerLib.toLatin1().data(),
+                                                                aMeshVar,
-                                                                  aMeshVar,
+                                                                aGeomVar,
-                                                                  aGeomVar,
+                                                                /*byMesh = */isSubMesh);
-                                                                  /*byMesh = */isSubMesh);
 
-  return SMESH::SMESH_Hypothesis::_nil();
 }
 
 //================================================================================

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,
+bool StdMeshers_Arithmetic1D::SetParametersByDefaults(const TDefaults&  dflts,
-                                                         const SMESH_Mesh* /*mesh*/)
+                                                      const SMESH_Mesh* /*mesh*/)
 {
-  return bool( _begLength = _endLength = elemLenght );
+  return bool( _begLength = _endLength = dflts._elemLength );
 }
 

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;

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,
+bool StdMeshers_AutomaticLength::SetParametersByDefaults(const TDefaults&  /*theDflts*/,
-                                                            const SMESH_Mesh* theMesh)
+                                                         const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 

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<const TopoDS_TShape*, double> _TShapeToLength;

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*/,
+bool StdMeshers_Deflection1D::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                         const SMESH_Mesh* /*theMesh*/)
+                                                      const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 }

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;

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,
+bool StdMeshers_LayerDistribution::SetParametersByDefaults(const TDefaults&  dflts,
-                                                              const SMESH_Mesh* theMesh)
+                                                           const SMESH_Mesh* theMesh)
 {
-  return myHyp ? myHyp->SetParametersByElementSize(elemLenght,theMesh) : false;
+  return myHyp ? myHyp->SetParametersByDefaults(dflts,theMesh) : false;
 }

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;

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*/,
+bool StdMeshers_LengthFromEdges::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                            const SMESH_Mesh* /*theMesh*/)
+                                                         const SMESH_Mesh* /*theMesh*/)
 {
   return true;
 }

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;

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,
+bool StdMeshers_LocalLength::SetParametersByDefaults(const TDefaults&  dflts,
-                                                        const SMESH_Mesh* /*theMesh*/)
+                                                     const SMESH_Mesh* /*theMesh*/)
 {
-  return bool( _length = elemLenght );
+  return bool( _length = dflts._elemLength );
 }
 

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;

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,
+bool StdMeshers_MaxElementArea::SetParametersByDefaults(const TDefaults&  dflts,
-                                                           const SMESH_Mesh* /*theMesh*/)
+                                                        const SMESH_Mesh* /*theMesh*/)
 {
-  return bool( _maxArea = elemLenght*elemLenght );
+  return bool( _maxArea = dflts._elemLength*dflts._elemLength );
 }
 

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;

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,
+bool StdMeshers_MaxElementVolume::SetParametersByDefaults(const TDefaults&  dflts,
-                                                             const SMESH_Mesh* /*theMesh*/)
+                                                          const SMESH_Mesh* /*theMesh*/)
 {
-  return bool( _maxVolume = elemLenght*elemLenght*elemLenght );
+  return bool( _maxVolume = dflts._elemLength*dflts._elemLength*dflts._elemLength );
 }
 

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;

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,
+bool StdMeshers_MaxLength::SetParametersByDefaults(const TDefaults&  dflts,
-                                                      const SMESH_Mesh* /*theMesh*/)
+                                                   const SMESH_Mesh* /*theMesh*/)
 {
-  _preestimation = ( elemLenght > 0.);
+  //_preestimation = ( dflts._elemLength > 0.);
-  if ( _preestimation )
+  if ( dflts._elemLength > 0. )
-    _preestimated = elemLenght;
+    _preestimated = dflts._elemLength;
-  return bool( _length = elemLenght );
+  return bool( _length = dflts._elemLength );
 }
 

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;

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*/,
+bool StdMeshers_NotConformAllowed::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                              const SMESH_Mesh* /*theMesh*/)
+                                                           const SMESH_Mesh* /*theMesh*/)
 {
   return true;
 }

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);
 
 };
 

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,
+bool StdMeshers_NumberOfLayers::SetParametersByDefaults(const TDefaults&  dflts,
-                                                           const SMESH_Mesh* theMesh)
+                                                        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;
 }
 

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;

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,
+bool StdMeshers_NumberOfSegments::SetParametersByDefaults(const TDefaults&  dflts,
-                                                             const SMESH_Mesh* /*theMesh*/)
+                                                          const SMESH_Mesh* /*theMesh*/)
 {
-  return false;
+  return bool(_numberOfSegments = dflts._nbSegments );
 }
 

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);

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*/,
+bool StdMeshers_ProjectionSource1D::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                               const SMESH_Mesh* /*theMesh*/)
+                                                            const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 }

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:
 

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*/,
+bool StdMeshers_ProjectionSource2D::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                               const SMESH_Mesh* /*theMesh*/)
+                                                            const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 }

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:
 

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*/,
+bool StdMeshers_ProjectionSource3D::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                               const SMESH_Mesh* /*theMesh*/)
+                                                            const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 }

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:
 

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

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

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*/,
+bool StdMeshers_QuadranglePreference::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                                 const SMESH_Mesh* /*theMesh*/)
+                                                              const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 }

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);
 
 };
 

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*/,
+bool StdMeshers_QuadraticMesh::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                          const SMESH_Mesh* /*theMesh*/)
+                                                       const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 }

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);
 
 };
 

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,
+bool StdMeshers_SegmentLengthAroundVertex::SetParametersByDefaults(const TDefaults&,
-                                                                      const SMESH_Mesh*)
+                                                                   const SMESH_Mesh*)
 {
   return false;
 }

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;

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,
+bool StdMeshers_StartEndLength::SetParametersByDefaults(const TDefaults&  dflts,
-                                                           const SMESH_Mesh* /*theMesh*/)
+                                                        const SMESH_Mesh* /*theMesh*/)
 {
-  return bool(_begLength = _endLength = elemLenght );
+  return bool(_begLength = _endLength = dflts._elemLength );
 }
 

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;

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*/,
+bool StdMeshers_TrianglePreference::SetParametersByDefaults(const TDefaults&  /*dflts*/,
-                                                               const SMESH_Mesh* /*theMesh*/)
+                                                            const SMESH_Mesh* /*theMesh*/)
 {
   return false;
 }

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);
 
 };