PAL10494 (SMESH python dump uses idl interface). Python dump using TPythonDump tool

diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
index 9c39bc72b794d6825bf620cd5f4f19bc5a8623a4..1208075f557fcb6bc1579944b6224f9fc19584a3 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
@@ -30,6 +30,7 @@ using namespace std;
 #include "StdMeshers_Arithmetic1D_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -92,11 +93,8 @@ void StdMeshers_Arithmetic1D_i::SetLength(CORBA::Double theLength,
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrLen ((double)theLength), aStrFlag ((int)theIsStart);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetLength(";
-  aStr += aStrLen + ", " + aStrFlag + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetLength( "
+                       << theLength << ", " << theIsStart << " )";
 }
 
 //=============================================================================

diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
index 0f3f4a942e7a122538cd0b9fd41a2eda66f03f02..72a715d81e5e187680547ef54cfa57a9f3d13307 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
@@ -31,6 +31,7 @@ using namespace std;
 #include "StdMeshers_Deflection1D_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -92,11 +93,7 @@ void StdMeshers_Deflection1D_i::SetDeflection( CORBA::Double theValue )
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrVal ((double)theValue);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetDeflection(";
-  aStr += aStrVal + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetDeflection( " << theValue << " )";
 }
 
 //=============================================================================

diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
index a37b8e14a72ed18f69c6049dbefaba239e3281b7..deb431fca1dbf0649678f17876cc84fc6fba0e97 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
@@ -31,6 +31,7 @@ using namespace std;
 #include "StdMeshers_LocalLength_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -92,11 +93,7 @@ void StdMeshers_LocalLength_i::SetLength( CORBA::Double theLength )
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrLen ((double)theLength);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetLength(";
-  aStr += aStrLen + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetLength( " << theLength << " )";
 }
 
 //=============================================================================

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
index c7ab795552b112001df7c7bab494ca276a34c3c5..af8513b7a4ae9e325297129e6336cba30bfd277b 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
@@ -31,6 +31,7 @@ using namespace std;
 #include "StdMeshers_MaxElementArea_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -92,11 +93,7 @@ void StdMeshers_MaxElementArea_i::SetMaxElementArea( CORBA::Double theArea )
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrArea ((double)theArea);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetMaxElementArea(";
-  aStr += aStrArea + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetMaxElementArea( " << theArea << " )";
 }
 
 //=============================================================================

diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
index d8686ab334528bf053e64bc5053cb0d2984e7943..582938b94db7e60f39e4c4502e775ff5fcddabb8 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
@@ -31,6 +31,7 @@ using namespace std;
 #include "StdMeshers_MaxElementVolume_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -92,11 +93,7 @@ void StdMeshers_MaxElementVolume_i::SetMaxElementVolume( CORBA::Double theVolume
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrVol ((double)theVolume);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetMaxElementVolume(";
-  aStr += aStrVol + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetMaxElementVolume( " << theVolume << " )";
 }
 
 //=============================================================================

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index 69d5073466e1e343f2c73ae60916cd97bf7fd192..88149b400ade44cc43857b202959b0d8caf5131e 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -31,6 +31,7 @@ using namespace std;
 #include "StdMeshers_NumberOfSegments_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -92,11 +93,7 @@ void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegments
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrNb ((int)theSegmentsNumber);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetNumberOfSegments(";
-  aStr += aStrNb + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetNumberOfSegments( " << theSegmentsNumber << " )";
 }
 
 //=============================================================================
@@ -126,6 +123,9 @@ void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ)
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ );
+
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -160,6 +160,8 @@ void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetScaleFactor( theScaleFactor );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetScaleFactor( " << theScaleFactor << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -206,6 +208,8 @@ void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array&
     tbl[i] = table[i];
   try {
     this->GetImpl()->SetTableFunction( tbl );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetTableFunction( " << table << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -250,6 +254,8 @@ void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr)
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetExpressionFunction( expr );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetExpressionFunction( " << expr << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -290,6 +296,8 @@ void StdMeshers_NumberOfSegments_i::SetExponentMode(CORBA::Boolean isExp)
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetExponentMode( isExp );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetExponentMode( " << isExp << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),

diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
index 56ce6f51d3725d0fbaea397c9c4b66b4c7d3e182..91d398a991d5d506c924048f608c9b9ca40be49b 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
@@ -31,6 +31,7 @@ using namespace std;
 #include "StdMeshers_StartEndLength_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -93,11 +94,8 @@ void StdMeshers_StartEndLength_i::SetLength(CORBA::Double theLength,
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrLen ((double)theLength), aStrFlag ((int)theIsStart);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetLength(";
-  aStr += aStrLen + ", " + aStrFlag + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetLength( "
+                       << theLength << ", " << theIsStart << " )";
 }
 
 //=============================================================================