Merge from BR_V5_IMP_P8

diff --git a/src/GHS3DPlugin_Hypothesis.cxx b/src/GHS3DPlugin_Hypothesis.cxx
index 108f6b090b1cc4516f55af58da9405a96d7be3a2..13165503f32cf1a65b31ed3058f198baf55839ad 100644 (file)
--- a/src/GHS3DPlugin_Hypothesis.cxx
+++ b/src/GHS3DPlugin_Hypothesis.cxx
@@ -488,6 +488,19 @@ bool GHS3DPlugin_Hypothesis::SetParametersByMesh(const SMESH_Mesh* ,const TopoDS
   return false;
 }
 
+
+//================================================================================
+/*!
+ * \brief Return false
+ */
+//================================================================================
+
+bool GHS3DPlugin_Hypothesis::SetParametersByElementSize(double            /*elemLenght*/,
+                                                        const SMESH_Mesh* /*theMesh*/)
+{
+  return false;
+}
+
 //================================================================================
 /*!
  * \brief Return command to run ghs3d mesher excluding file prefix (-f)

diff --git a/src/GHS3DPlugin_Hypothesis.hxx b/src/GHS3DPlugin_Hypothesis.hxx
index bbf7675af9b8f7cb2ff9c5cc559105f39b3e1503..1f11f75240d3baa0c3ee3c92db97cc36355be12f 100644 (file)
--- a/src/GHS3DPlugin_Hypothesis.hxx
+++ b/src/GHS3DPlugin_Hypothesis.hxx
@@ -128,6 +128,11 @@ public:
    */
   virtual bool SetParametersByMesh(const SMESH_Mesh* theMesh, const TopoDS_Shape& theShape);
 
+  /*!
+   * \brief Does nothing
+   */
+  virtual bool SetParametersByElementSize( double elemLenght, const SMESH_Mesh* theMesh=0);
+
 private:
 
   bool   myToMeshHoles;