Dump Python: dump more methods.

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index c148a3d75a174cde02a2bc8008c758fe764e1590..46802b6953b885ad0203d9e28587303f92aa93cd 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -515,9 +515,8 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj
 
     // Update Python script
     TCollection_AsciiString aStr (aSO->GetID());
-    aStr += " = smesh.CreateMesh(salome.IDToObject(\"";
-    aStr += theShapeObject->GetStudyEntry();
-    aStr += "\"))";
+    aStr += " = smesh.CreateMesh(";
+    SMESH_Gen_i::AddObject(aStr, theShapeObject) += ")";
 
     AddToPythonScript(myCurrentStudy->StudyId(), aStr);
   }
@@ -629,9 +628,6 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromMED( const char* theFileName,
 
   AddToPythonScript(myCurrentStudy->StudyId(), aStr);
 
-  aStr = "print \"CreateMeshesFromMED: \", status";
-  AddToPythonScript(myCurrentStudy->StudyId(), aStr);
-
   return aResult._retn();
 }
 
@@ -811,16 +807,14 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
                                   SALOME::BAD_PARAM );
 
   // Update Python script
-  SALOMEDS::SObject_var aSO = ObjectToSObject(myCurrentStudy, theMesh);
   TCollection_AsciiString aStr ("isDone = smesh.Compute(");
-  aStr += aSO->GetID();
-  aStr += ", salome.IDToObject(\"";
-  aStr += theShapeObject->GetStudyEntry();
-  aStr += "\"))";
+  SMESH_Gen_i::AddObject(aStr, theMesh) += ", ";
+  SMESH_Gen_i::AddObject(aStr, theShapeObject) += ")";
 
   AddToPythonScript(myCurrentStudy->StudyId(), aStr);
 
-  aStr = "print \"Compute: \", isDone";
+  aStr = "if isDone == 0: print \"Mesh ";
+  SMESH_Gen_i::AddObject(aStr, theMesh) += " computation failed\"";
   AddToPythonScript(myCurrentStudy->StudyId(), aStr);
 
   try {

diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index 671d6d7291e9b9b8e4474e11737854677a056712..3b9dccf9dace96dc18f51153528562cbb4a1c192 100644 (file)
--- a/src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx
@@ -410,9 +410,6 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfEleme
   TCollection_AsciiString str ("isDone = mesh_editor.Reorient(");
   SMESH_Gen_i::AddArray( str, IDsOfElements ) += ")";
   SMESH_Gen_i::AddToCurrentPyScript( str );
-#ifdef _DEBUG_
-  SMESH_Gen_i::AddToCurrentPyScript( "print \"Reorient: \", isDone" );
-#endif
 
   return true;
 }
@@ -427,7 +424,18 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfEleme
 CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theObject)
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
-  return Reorient(anElementsId);
+  CORBA::Boolean isDone = Reorient(anElementsId);
+
+  // Clear python line, created by Reorient()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+
+  // Update Python script
+  TCollection_AsciiString str ("isDone = mesh_editor.ReorientObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ")";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
+
+  return isDone;
 }
 
 //=============================================================================
@@ -482,7 +490,25 @@ CORBA::Boolean
                                       CORBA::Double               MaxAngle)
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
-  return TriToQuad(anElementsId, Criterion, MaxAngle);
+  CORBA::Boolean isDone = TriToQuad(anElementsId, Criterion, MaxAngle);
+
+  // Clear python line(s), created by TriToQuad()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+#ifdef _DEBUG_
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+#endif
+
+  // Update Python script
+  TCollection_AsciiString str ("isDone = mesh_editor.TriToQuadObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", None, ";
+  str += (Standard_Real) MaxAngle;
+  SMESH_Gen_i::AddToCurrentPyScript( str + ")" );
+#ifdef _DEBUG_
+  SMESH_Gen_i::AddToCurrentPyScript( "print \"TriToQuadObject: \", isDone" );
+#endif
+
+  return isDone;
 }
 
 //=============================================================================
@@ -567,7 +593,25 @@ CORBA::Boolean
                                      CORBA::Boolean            Diag13)
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
-  return SplitQuad(anElementsId, Diag13);
+  CORBA::Boolean isDone = SplitQuad(anElementsId, Diag13);
+
+  // Clear python line(s), created by SplitQuad()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+#ifdef _DEBUG_
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+#endif
+
+  // Update Python script
+  TCollection_AsciiString str ("isDone = mesh_editor.SplitQuadObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", ";
+  str += TCollection_AsciiString( Diag13 ) + ")";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
+#ifdef _DEBUG_
+  SMESH_Gen_i::AddToCurrentPyScript( "print \"SplitQuadObject: \", isDone" );
+#endif
+
+  return isDone;
 }
 
 //=============================================================================
@@ -616,14 +660,13 @@ CORBA::Boolean
   str += (Standard_Integer) MaxNbOfIterations;
   str += ", ";
   str += (Standard_Real) MaxAspectRatio;
-  str += ", ";
   if ( method == ::SMESH_MeshEditor::CENTROIDAL )
-    str += "SMESH.SMESH_MeshEditor.LAPLACIAN_SMOOTH )";
+    str += ", SMESH.SMESH_MeshEditor.CENTROIDAL_SMOOTH )";
   else
-    str += "SMESH.SMESH_MeshEditor.CENTROIDAL_SMOOTH )";
+    str += ", SMESH.SMESH_MeshEditor.LAPLACIAN_SMOOTH )";
   SMESH_Gen_i::AddToCurrentPyScript( str );
 #ifdef _DEBUG_
-  SMESH_Gen_i::AddToCurrentPyScript( "print \"SplitQuad: \", isDone" );
+  SMESH_Gen_i::AddToCurrentPyScript( "print \"Smooth: \", isDone" );
 #endif
 
   return true;
@@ -643,7 +686,33 @@ CORBA::Boolean
                                   SMESH::SMESH_MeshEditor::Smooth_Method Method)
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
-  return Smooth(anElementsId, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method);
+  CORBA::Boolean isDone = Smooth
+    (anElementsId, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method);
+
+  // Clear python line(s), created by Smooth()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+#ifdef _DEBUG_
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+#endif
+
+  // Update Python script
+  TCollection_AsciiString str ("isDone = mesh_editor.SmoothObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", ";
+  SMESH_Gen_i::AddArray( str, IDsOfFixedNodes ) += ", ";
+  str += (Standard_Integer) MaxNbOfIterations;
+  str += ", ";
+  str += (Standard_Real) MaxAspectRatio;
+  if ( Method == SMESH::SMESH_MeshEditor::CENTROIDAL_SMOOTH )
+    str += ", SMESH.SMESH_MeshEditor.CENTROIDAL_SMOOTH )";
+  else
+    str += ", SMESH.SMESH_MeshEditor.LAPLACIAN_SMOOTH )";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
+#ifdef _DEBUG_
+  SMESH_Gen_i::AddToCurrentPyScript( "print \"SmoothObject: \", isDone" );
+#endif
+
+  return isDone;
 }
 
 //=============================================================================
@@ -706,7 +775,7 @@ void SMESH_MeshEditor_i::RotationSweep(const SMESH::long_array & theIDsOfElement
   TCollection_AsciiString str = "axis = ";
   addAxis( str, theAxis );
   SMESH_Gen_i::AddToCurrentPyScript( str );
-  str = ("mesh_editor.RotationSweep(");
+  str = "mesh_editor.RotationSweep(";
   SMESH_Gen_i::AddArray( str, theIDsOfElements ) += ", axis, ";
   str += TCollection_AsciiString( theAngleInRadians ) + ", ";
   str += TCollection_AsciiString( (int)theNbOfSteps ) + ", ";
@@ -727,6 +796,18 @@ void SMESH_MeshEditor_i::RotationSweepObject(SMESH::SMESH_IDSource_ptr theObject
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
   RotationSweep(anElementsId, theAxis, theAngleInRadians, theNbOfSteps, theTolerance);
+
+  // Clear python line, created by RotationSweep()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+
+  // Update Python script
+  TCollection_AsciiString str ("mesh_editor.RotationSweepObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", axis, ";
+  str += TCollection_AsciiString( theAngleInRadians ) + ", ";
+  str += TCollection_AsciiString( (int)theNbOfSteps ) + ", ";
+  str += TCollection_AsciiString( theTolerance      ) + " )";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
 }
 
 //=======================================================================
@@ -778,6 +859,16 @@ void SMESH_MeshEditor_i::ExtrusionSweepObject(SMESH::SMESH_IDSource_ptr theObjec
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
   ExtrusionSweep(anElementsId, theStepVector, theNbOfSteps);
+
+  // Clear python line, created by ExtrusionSweep()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+
+  // Update Python script
+  TCollection_AsciiString str ("mesh_editor.ExtrusionSweepObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", stepVector, ";
+  str += TCollection_AsciiString((int)theNbOfSteps) + " )";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
 }
 
 #define RETCASE(enm) case ::SMESH_MeshEditor::enm: return SMESH::SMESH_MeshEditor::enm;
@@ -852,8 +943,8 @@ SMESH::SMESH_MeshEditor::Extrusion_Error
   SMESH_Gen_i::AddToCurrentPyScript( str );
   str = ("error = mesh_editor.ExtrusionAlongPath(");
   SMESH_Gen_i::AddArray ( str, theIDsOfElements ) += ", ";
-  SMESH_Gen_i::AddObject( str, thePathMesh ) += ", salome.IDToObject(\"";
-  SMESH_Gen_i::AddObject( str, thePathShape ) += "\"), ";
+  SMESH_Gen_i::AddObject( str, thePathMesh ) += ", ";
+  SMESH_Gen_i::AddObject( str, thePathShape ) += ", ";
   str += TCollection_AsciiString( (int)theNodeStart ) + ", ";
   str += TCollection_AsciiString( (int)theHasAngles ) + ", ";
   SMESH_Gen_i::AddArray ( str, theAngles ) += ", ";
@@ -880,7 +971,26 @@ SMESH::SMESH_MeshEditor::Extrusion_Error
                                               const SMESH::PointStruct &  theRefPoint)
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
-  return ExtrusionAlongPath( anElementsId, thePathMesh, thePathShape, theNodeStart, theHasAngles, theAngles, theHasRefPoint, theRefPoint );
+  SMESH::SMESH_MeshEditor::Extrusion_Error error = ExtrusionAlongPath
+    (anElementsId, thePathMesh, thePathShape, theNodeStart,
+     theHasAngles, theAngles, theHasRefPoint, theRefPoint);
+
+  // Clear python line, created by ExtrusionAlongPath()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+
+  // Update Python script
+  TCollection_AsciiString str ("error = mesh_editor.ExtrusionAlongPathObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", ";
+  SMESH_Gen_i::AddObject( str, thePathMesh ) += ", ";
+  SMESH_Gen_i::AddObject( str, thePathShape ) += ", ";
+  str += TCollection_AsciiString( (int)theNodeStart ) + ", ";
+  str += TCollection_AsciiString( theHasAngles ) + ", ";
+  SMESH_Gen_i::AddArray ( str, theAngles ) += ", ";
+  str += TCollection_AsciiString( theHasRefPoint ) + ", refPoint )";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
+
+  return error;
 }
 
 //=======================================================================
@@ -946,6 +1056,29 @@ void SMESH_MeshEditor_i::MirrorObject(SMESH::SMESH_IDSource_ptr           theObj
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
   Mirror(anElementsId, theAxis, theMirrorType, theCopy);
+
+  // Clear python line, created by Mirror()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+
+  // Update Python script
+  TCollection_AsciiString typeStr, copyStr( theCopy );
+  switch ( theMirrorType ) {
+  case  SMESH::SMESH_MeshEditor::POINT:
+    typeStr = "SMESH.SMESH_MeshEditor.POINT";
+    break;
+  case  SMESH::SMESH_MeshEditor::AXIS:
+    typeStr = "SMESH.SMESH_MeshEditor.AXIS";
+    break;
+  default:
+    typeStr = "SMESH.SMESH_MeshEditor.PLANE";
+  }
+
+  TCollection_AsciiString str ("mesh_editor.MirrorObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", ";
+  addAxis( str, theAxis ) += ", ";
+  str += typeStr + ", " + copyStr + " )";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
 }
 
 //=======================================================================
@@ -997,6 +1130,16 @@ void SMESH_MeshEditor_i::TranslateObject(SMESH::SMESH_IDSource_ptr theObject,
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
   Translate(anElementsId, theVector, theCopy);
+
+  // Clear python line, created by Translate()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+
+  // Update Python script
+  TCollection_AsciiString str ("mesh_editor.TranslateObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", vector, ";
+  str += TCollection_AsciiString( theCopy ) + " )";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
 }
 
 //=======================================================================
@@ -1051,6 +1194,17 @@ void SMESH_MeshEditor_i::RotateObject(SMESH::SMESH_IDSource_ptr theObject,
 {
   SMESH::long_array_var anElementsId = theObject->GetIDs();
   Rotate(anElementsId, theAxis, theAngle, theCopy);
+
+  // Clear python line, created by Rotate()
+  SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
+  aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID());
+
+  // Update Python script
+  TCollection_AsciiString str ("mesh_editor.RotateObject(");
+  SMESH_Gen_i::AddObject( str, theObject ) += ", axis, ";
+  str += TCollection_AsciiString( theAngle ) + ", ";
+  str += TCollection_AsciiString( theCopy ) + " )";
+  SMESH_Gen_i::AddToCurrentPyScript( str );
 }
 
 //=======================================================================

diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 79ac885d2a9f9af305f800a81cc1ff1abbd28a87..518cc11fede8c0b840f6ad5d4dce797b5e44bf87 100644 (file)
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -1217,17 +1217,37 @@ SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditor()
 
 //=============================================================================
 /*!
- *  
+ *  Export in different formats
  */
 //=============================================================================
 
-void SMESH_Mesh_i::ExportToMED( const char* file, 
+void SMESH_Mesh_i::ExportToMED (const char* file, 
                                CORBA::Boolean auto_groups, 
-                               SMESH::MED_VERSION theVersion )
+                               SMESH::MED_VERSION theVersion)
   throw(SALOME::SALOME_Exception)
 {
   Unexpect aCatch(SALOME_SalomeException);
-  
+
+  // Update Python script
+  TCollection_AsciiString aStr;
+  SMESH_Gen_i::AddObject(aStr, _this()) += ".ExportToMED(\"";
+  aStr += TCollection_AsciiString((char*)file) + "\", ";
+  aStr += TCollection_AsciiString((int)auto_groups) + ", ";
+  switch (theVersion) {
+  case SMESH::MED_V2_1:
+    aStr += "SMESH.MED_V2_1)";
+    break;
+  case SMESH::MED_V2_2:
+    aStr += "SMESH.MED_V2_2)";
+    break;
+  default:
+    aStr += TCollection_AsciiString(theVersion) + ")";
+    break;
+  }
+
+  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+
+  // Perform Export
   char* aMeshName = "Mesh";
   SALOMEDS::Study_ptr aStudy = _gen_i->GetCurrentStudy();
   if ( !aStudy->_is_nil() ) {
@@ -1259,27 +1279,59 @@ void SMESH_Mesh_i::ExportToMED( const char* file,
   _impl->ExportMED( file, aMeshName, auto_groups, theVersion );
 }
 
-void SMESH_Mesh_i::ExportMED( const char* file, 
+void SMESH_Mesh_i::ExportMED (const char* file, 
                              CORBA::Boolean auto_groups)
   throw(SALOME::SALOME_Exception)
 {
   ExportToMED(file,auto_groups,SMESH::MED_V2_1);
 }
 
-void SMESH_Mesh_i::ExportDAT(const char *file) throw(SALOME::SALOME_Exception)
+void SMESH_Mesh_i::ExportDAT (const char *file)
+  throw(SALOME::SALOME_Exception)
 {
   Unexpect aCatch(SALOME_SalomeException);
+
+  // Update Python script
+  TCollection_AsciiString aStr;
+  SMESH_Gen_i::AddObject(aStr, _this()) += ".ExportDAT(\"";
+  aStr += TCollection_AsciiString((char*)file) + "\")";
+
+  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+
+  // Perform Export
   _impl->ExportDAT(file);
 }
-void SMESH_Mesh_i::ExportUNV(const char *file) throw(SALOME::SALOME_Exception)
+
+void SMESH_Mesh_i::ExportUNV (const char *file)
+  throw(SALOME::SALOME_Exception)
 {
   Unexpect aCatch(SALOME_SalomeException);
+
+  // Update Python script
+  TCollection_AsciiString aStr;
+  SMESH_Gen_i::AddObject(aStr, _this()) += ".ExportUNV(\"";
+  aStr += TCollection_AsciiString((char*)file) + "\")";
+
+  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+
+  // Perform Export
   _impl->ExportUNV(file);
 }
 
-void SMESH_Mesh_i::ExportSTL(const char *file, const bool isascii) throw(SALOME::SALOME_Exception)
+void SMESH_Mesh_i::ExportSTL (const char *file, const bool isascii)
+  throw(SALOME::SALOME_Exception)
 {
   Unexpect aCatch(SALOME_SalomeException);
+
+  // Update Python script
+  TCollection_AsciiString aStr;
+  SMESH_Gen_i::AddObject(aStr, _this()) += ".ExportToMED(\"";
+  aStr += TCollection_AsciiString((char*)file) + "\", ";
+  aStr += TCollection_AsciiString((int)isascii) + ")";
+
+  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+
+  // Perform Export
   _impl->ExportSTL(file, isascii);
 }