Patch from Erwan ADAM : fix bugs in DumpPython for NETGEN plugin when local size...

diff --git a/idl/NETGENPlugin_Algorithm.idl b/idl/NETGENPlugin_Algorithm.idl
index 365b04670f9283e00100c3e5e60c6695d39eedaf..d342a94c209c8298f2779bd739137c0ed90331dd 100644 (file)
--- a/idl/NETGENPlugin_Algorithm.idl
+++ b/idl/NETGENPlugin_Algorithm.idl
@@ -29,6 +29,7 @@
 
 #include "SALOME_Exception.idl"
 #include "SMESH_Hypothesis.idl"
+#include "GEOM_Gen.idl"
 
 /*!
  * NETGENPlugin: interfaces to NETGEN related hypotheses and algorithms
@@ -92,6 +93,7 @@ module NETGENPlugin
     void SetNbSegPerRadius(in double value);
     double GetNbSegPerRadius();
 
+    void SetLocalSizeOnShape(in GEOM::GEOM_Object GeomObj, in double localSize);
     void SetLocalSizeOnEntry(in string entry, in double localSize);
     double GetLocalSizeOnEntry(in string entry);
     string_array GetLocalSizeEntries();

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
index 7fa0b68d61c4c2b30fd3fc38bd6052bcd85dceae..04bd830c3973719e292d9bd515ef32dfe661d4ca 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
@@ -31,6 +31,7 @@
 #include "NETGENPlugin_Hypothesis_i.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
+#include "GEOM_Object.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -274,6 +275,15 @@ CORBA::Double NETGENPlugin_Hypothesis_i::GetNbSegPerRadius()
 
 //=============================================================================
 
+void NETGENPlugin_Hypothesis_i::SetLocalSizeOnShape(GEOM::GEOM_Object_ptr GeomObj, CORBA::Double localSize)
+{
+  string entry;
+  entry = GeomObj->GetStudyEntry();
+  SetLocalSizeOnEntry(entry.c_str(), localSize);
+}
+
+//=============================================================================
+
 void NETGENPlugin_Hypothesis_i::SetLocalSizeOnEntry(const char* entry, CORBA::Double localSize)
 {
   bool valueChanged = false;
@@ -281,7 +291,7 @@ void NETGENPlugin_Hypothesis_i::SetLocalSizeOnEntry(const char* entry, CORBA::Do
   if ( valueChanged )
     this->GetImpl()->SetLocalSizeOnEntry(entry, localSize);
   if ( valueChanged )
-    SMESH::TPythonDump() << _this() << ".SetLocalSizeOnEntry(" << entry << ", " << localSize << ")";
+    SMESH::TPythonDump() << _this() << ".SetLocalSizeOnShape(" << entry << ", " << localSize << ")";
 }
 
 //=============================================================================

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
index c3211223195dc1dfe68a08cc19a0f820e2cab020..1068706417cfa2768e874bc8f5ce0be6d8dd9f36 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
@@ -40,6 +40,7 @@
 #include "NETGENPlugin_Hypothesis.hxx"
 
 class SMESH_Gen;
+//class GEOM_Object;
 
 // NETGENPlugin parameters hypothesis
 
@@ -76,6 +77,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Hypothesis_i:
   void SetNbSegPerRadius(CORBA::Double theVal);
   CORBA::Double GetNbSegPerRadius();
 
+  void SetLocalSizeOnShape(GEOM::GEOM_Object_ptr GeomObj, CORBA::Double localSize);
   void SetLocalSizeOnEntry(const char* entry, CORBA::Double localSize);
   CORBA::Double GetLocalSizeOnEntry(const char* entry);
   NETGENPlugin::string_array* GetLocalSizeEntries();