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 b68acbe1c62e5e3f2ce5b95df83a9b377776a0de..7398cf856ed4199cf815b9829f71293c72c0b465 100644 (file)
--- 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 806b3d0f293432e191e8451d96a053ff83c91f78..4b681dc0a75a4d6e6e1ace83812c6b87a160a2be 100644 (file)
--- 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 366ffeab10ced48d8290417a09e6bfd9a915f9d9..d62f22352e91d93af46ea5cfdbc2d5869722bd04 100644 (file)
--- 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 ec08a297e222f5fcf41897719d716ba40ebf9520..351e6034e8b12e94b0b0515eed3163b2b07f10d7 100644 (file)
--- 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 5b63f922bbb7a78fc9320fe78366dc3a3fb2d570..f5ac03c5e640768c33f23e64e9313e0212f44353 100644 (file)
--- 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 fb8075d1c01a9f5a9b655ef33579a44a0e88e0b3..94952b774da39110650b247447f60b0b348e2479 100644 (file)
--- 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 3e91de78004ce0603e43e9538b1510e40f7908e9..95710c94eb9768299be9e522472eea143f38140e 100644 (file)
--- 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 1ce7d30d5a69460e3a2456924cefd76f613dfcb4..627003aa608b4ffba44250961c4ce7eef8576567 100644 (file)
--- 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<const TopoDS_TShape*, double> _TShapeToLength;

diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx
index 98e3b4905f6f904ebcb80736f8780dcceef9841e..42ad9219a50bcf938bc4f67114b088df717d6f5f 100644 (file)
--- 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 47b863046cc0021d194de737ec94dc61e86230a5..a3cf19b70607c0e55fae27e9f82a3f3fb4f8f8b8 100644 (file)
--- 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 7b0331380ccebebe4de70c832372331a07f8f845..8e5987e6b5059ffddeba6ab4a37ed894fec24c38 100644 (file)
--- 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 4b170a2df6ccf61fb89a93bd4fe9dde03c369d76..aca054d4fb93e93e769ecfa1688808361a75638a 100644 (file)
--- 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 abe6060e782ae2f691ad993e9f2443d82ae08d23..cad6e91869e790a5a637f6ef3a63b4e47ee50745 100644 (file)
--- 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 6d3c02c62c451b43a95ae47d0231e795490ec170..cb52638e573025c5182055e7f7a330635dd4964d 100644 (file)
--- 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 a138111537efe41949f1513d598c0f9cc80af576..d74abe9fd2c89aa5700b558ff9dfe079d5ab47e5 100644 (file)
--- 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 a46a305212b87a5eafbe73e0da8263bd64c0d269..1c8d72b2784a93aa020165f741487f3e2f6fdd89 100644 (file)
--- 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 21fd6ea548661733496a22034101acec6d68b179..36e40e172e37cc81bf53cbd8456ce536516aa932 100644 (file)
--- 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 17bd018150d96b9977dd050f95634e3ebbdf4f65..09506736393c557bff7387efc14c6823a7d25c15 100644 (file)
--- 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 1fd721b2caa34f5f76483fb4297b89fd7cf2ae15..435213aad535435f7df24d8c33b5a9d84b05c412 100644 (file)
--- 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 d63eb4d4fdd7d4c27719a6293efb5e026451e4ae..6395fd419e30149eaabb88a0436199d3a9b1b07e 100644 (file)
--- 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 aa34f81d8b9d7a7b493441752f5df6860517568e..475e56ae5aa94c9c0448a673dcd503838c89d9e0 100644 (file)
--- 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 507706bb0f6d0c5e466b1af4293567214540c697..23d94a9f286f2ad1828adaa93b5bdf1539d6f13e 100644 (file)
--- 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 9325c334b3ff67f1b4ebff636bbf311ca295bca1..66c58f13cc7915cbc59d91fa7b8ee15d7f1977bf 100644 (file)
--- 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 4c2423b140f115e19a862919e87729a3b34fde55..ddcfcb445d4b463046638a26a49e955539fba651 100644 (file)
--- 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 df8fc7dba4b1685389e5ad3c520bb7c0f64841f2..604ee185aa8683eedb2d9c5e0312ec7113f7ce89 100644 (file)
--- 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 5b9f0695594b5e634ce3cabac66354bb2ac253e0..ebaae84a918cca3d7c56b64fa4b63de249743064 100644 (file)
--- 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 e96083c64f475111c002c70e59a4ec72e8409762..90c50a0bb4c8aa16747131e7810d24f9422b3949 100644 (file)
--- 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 595893e2a18206073dbe2ee562b664b1fd42975a..1be5b9176f61929055bdee75e90807b0f9d56e1f 100644 (file)
--- 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 6e74ca1e05b36e48bc075596aaf8e42d6bed6c25..8a2052071360bd2af2be3ec034401f028f4ba937 100644 (file)
--- 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 e734049f709315c19c5a45a2218553e1b9a59e76..301dedf304b1bf947e84a67f4716b7d1460626bd 100644 (file)
--- 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 6301c9e19ab4296f55d6e89623c6e7fa7ea30b0a..a1393fc79e8007923b98b2fc696dba6dc206bf97 100644 (file)
--- 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 18c01c806445f8f037ef0fc3029504593684675f..a23d4c4948639db476b6ceab675ca7f18c047f12 100644 (file)
--- 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 6e5cf463063e2b2f3863ee49381023b2a26a2c44..b77808f3606941ee6bfb2d483150822667035f8a 100644 (file)
--- 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 e2fcb5278aa2e28a230b51c20e5847f7e054e4bf..fd6848aec658b5552db101f12c7135448a075488 100644 (file)
--- 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 55c102f1b10cbf005dd21225666db4c943c81de4..c6b9b015fb50193491cfb8dd7525e74b8cfe26f4 100644 (file)
--- 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 b57ee92be5f9c2c37e15dbbaecce6d73f1ebaec4..b02f9aebe03b39961ca1069c0296e63e113d53fe 100644 (file)
--- 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 4b09c904ce041247ed7f99fe37f2985b671f3d37..cf3986e38a0070ece022db2a77fbec41a2d4de2b 100644 (file)
--- 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 9ff059fbb27084048f673498eb84458683b4d1a1..ec641d15a81e97c7307a2ed258f3af7486aaea15 100644 (file)
--- 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 193b9d75e665dc506102e34c08c6df203914026a..4764356f25d99ba7fb22d9cf97f876d0369f4912 100644 (file)
--- 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 f30ebac3ffd55d515a2bb3b2eec53fe1afc5fc31..9972469c0a3f08bb18eee894ae329f141f8991e3 100644 (file)
--- 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 44fe4ae43cdac3f3f98574359df06dc912bd448b..f5540a88c8f977a13927b7ebd70196200056ddf0 100644 (file)
--- 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 f77f15dd18c86076e19e33993536a71bb83802d4..c7c54bbf688a07d36b9fec0d88ac5a0229cdb093 100644 (file)
--- 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 0177576cf5e5a4a7729077cf14731b64b7caa4fe..0beb6349a1e83a5b0f06c6275fbbf7ffe17d643c 100644 (file)
--- 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 94b6091397b6075b4040e4f33e7e4b7d555c449f..00f228771fee69fa82d1f726a0888b2ed6bcfcbb 100644 (file)
--- 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 5d21cf90e97c010e5916a172ab50b9ee7cba8360..331cd0d1cea9edea5820cd05217d9bd6aa0caf7e 100644 (file)
--- 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 16963b0930fae059c57ebabc78f498a543c0cf78..34ec364a16000a973203e8d9d9dbab426ce98d86 100644 (file)
--- 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);
 
 };