ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 09:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix mixed Python dump of a new and a closed study

Browse Source
This commit is contained in:
eap 2018-08-01 18:41:11 +03:00
parent a8d98187a5
commit 35012b0a3d
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -4971,6 +4971,9 @@ void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
// remove the tmp files meshes are loaded from // remove the tmp files meshes are loaded from
SMESH_PreMeshInfo::RemoveStudyFiles_TMP_METHOD( theComponent ); SMESH_PreMeshInfo::RemoveStudyFiles_TMP_METHOD( theComponent );
// Clean trace of API methods calls
CleanPythonTrace();
return; return;
} }

11
src/SMESH_I/SMESH_PythonDump.cxx
View File

@ -678,14 +678,13 @@ namespace SMESH
cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << endl; cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << endl;
#endif #endif
} }
}
//======================================================================= //=======================================================================
//function : RemoveTabulation //function : RemoveTabulation
//purpose : //purpose :
//======================================================================= //=======================================================================
void RemoveTabulation( TCollection_AsciiString& theScript ) void RemoveTabulation( TCollection_AsciiString& theScript )
{ {
std::string aString( theScript.ToCString() ); std::string aString( theScript.ToCString() );
std::string::size_type aPos = 0; std::string::size_type aPos = 0;
while( aPos < aString.length() ) while( aPos < aString.length() )
@ -697,6 +696,7 @@ void RemoveTabulation( TCollection_AsciiString& theScript )
aPos++; aPos++;
} }
theScript = aString.c_str(); theScript = aString.c_str();
}
} }
//======================================================================= //=======================================================================
@ -995,10 +995,9 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
std::list< TCollection_AsciiString > lines; // lines of a script std::list< TCollection_AsciiString > lines; // lines of a script
std::list< TCollection_AsciiString >::iterator linesIt; std::list< TCollection_AsciiString >::iterator linesIt;
if ( isPublished )
lines.push_back( aSMESHGen + " = smeshBuilder.New()" ); lines.push_back( aSMESHGen + " = smeshBuilder.New()" );
else if ( !isPublished )
lines.push_back( aSMESHGen + " = smeshBuilder.New(False)" ); lines.push_back( aSMESHGen + ".SetEnablePublish( False )" );
lines.push_back( helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()" ); lines.push_back( helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()" );
lines.push_back( helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()" ); lines.push_back( helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()" );