Merge from BR_V5_IMP_P8

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
index b49e2106a612755a9f2a1f762038db0cd9212fb6..dfe8cc6e067e63dd845b6247ed7e2707921f1bab 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx
@@ -203,6 +203,18 @@ bool GHS3DPRLPlugin_Hypothesis::SetParametersByMesh(const SMESH_Mesh*   theMesh,
 {
   return false;
 }
+//================================================================================
+/*!
+ * \brief Initialize my parameter values by linear size of mesh element.
+ *  \retval bool - true if parameter values have been successfully defined
+ */
+//================================================================================
+
+bool GHS3DPRLPlugin_Hypothesis::SetParametersByElementSize(double            /*elemLenght*/,
+                                                           const SMESH_Mesh* /*theMesh*/)
+{
+  return false;
+}
 
 //=============================================================================
 std::string GHS3DPRLPlugin_Hypothesis::GetDefaultMEDName()

diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
index 48de7170eea574ee2f004969dc43af60312452f2..53734dee119f1fd26ae234c59af04bb38e5b8242 100755 (executable)
--- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
+++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.hxx
@@ -68,6 +68,11 @@ public:
    * \retval bool - always false
    */
   virtual bool          SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape);
+  /*!
+   * \brief Initialize my parameter values by linear size of mesh element.
+   *  \retval bool - true if parameter values have been successfully defined
+   */
+  virtual bool          SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0);
 
 private:
   int          _countSubMesh;