22360: EDF SMESH: Body Fitting algorithm: incorporate edges

  Fix an invalid dump

diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index b7b5b5f0fcd8e35589fb3017531b78b390a0c8ae..9a7550d18df6329718a2f52b363544b225973896 100644 (file)
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -3163,23 +3163,28 @@ void _pyComplexParamHypo::Process( const Handle(_pyCommand)& theCommand)
 
 void _pyComplexParamHypo::Flush()
 {
 
 void _pyComplexParamHypo::Flush()
 {

+  list < Handle(_pyCommand) >::iterator cmd;

   if ( IsWrapped() )
   {
   if ( IsWrapped() )
   {

-    list < Handle(_pyCommand) >::iterator cmd = myUnusedCommands.begin();
-    for ( ; cmd != myUnusedCommands.end(); ++cmd )
+    for ( cmd = myUnusedCommands.begin(); cmd != myUnusedCommands.end(); ++cmd )

       if ((*cmd)->GetMethod() == "SetObjectEntry" )
         (*cmd)->Clear();
       if ((*cmd)->GetMethod() == "SetObjectEntry" )
         (*cmd)->Clear();

-
-    if ( GetAlgoType() == "Cartesian_3D" )
-    {
-      _pyID algo = myCreationCmd->GetObject();
-      for ( cmd = myProcessedCmds.begin(); cmd != myProcessedCmds.end(); ++cmd )
-      {
-        StructToList( *cmd, /*checkMethod=*/false );
-        (*cmd)->SetObject( algo );
-      }
-    }

   }
   }

+
+  // if ( GetAlgoType() == "Cartesian_3D" )
+  // {
+  //   _pyID algo = myCreationCmd->GetObject();
+  //   for ( cmd = myProcessedCmds.begin(); cmd != myProcessedCmds.end(); ++cmd )
+  //   {
+  //     if ( IsWrapped() )
+  //     {
+  //       StructToList( *cmd, /*checkMethod=*/false );
+  //       const _AString & method = (*cmd)->GetMethod();
+  //       if ( method == "SetFixedPoint" )
+  //         (*cmd)->SetObject( algo );
+  //     }
+  //   }
+  // }

 }
 
 //================================================================================
 }
 
 //================================================================================

diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx
index 494722b8aee4837c73bfe0e7c9939e93aede4662..4289342dc1b83065d3918c7a358e7ab42a9ff9ea 100644 (file)
--- a/src/SMESH_I/SMESH_DumpPython.cxx
+++ b/src/SMESH_I/SMESH_DumpPython.cxx
@@ -1209,6 +1209,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
     if ( theNames.IsBound( anEntry ))
     {
       aGUIName = theNames.Find(anEntry);
     if ( theNames.IsBound( anEntry ))
     {
       aGUIName = theNames.Find(anEntry);

+      aGUIName.RemoveAll('\''); // remove a quote from a name (issue 22360)

       setNamePart += nt + aSMESHGen + ".SetName(" + aName;
       if ( anEntry2AccessorMethod.IsBound( anEntry ) )
         setNamePart += helper + "." + anEntry2AccessorMethod( anEntry );
       setNamePart += nt + aSMESHGen + ".SetName(" + aName;
       if ( anEntry2AccessorMethod.IsBound( anEntry ) )
         setNamePart += helper + "." + anEntry2AccessorMethod( anEntry );