ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-13 02:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022318: [CEA] Problems with study dump in SMESH

Browse Source 
Memory needed for SMESH_2smeshpy::ConvertScript() reduced by 3 times
This commit is contained in:
eap 2013-09-12 11:11:52 +00:00
parent 1940817a98
commit ab30aac8c8
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -455,14 +455,35 @@ namespace {
*/
//================================================================================
TCollection_AsciiString
SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScript,
void
SMESH_2smeshpy::ConvertScript(TCollection_AsciiString& theScript,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
std::set< TCollection_AsciiString >& theRemovedObjIDs,
SALOMEDS::Study_ptr& theStudy,
const bool theToKeepAllCommands)
{
// process notebook variables
{
SMESH_NoteBook aNoteBook;
int from = 1, end = theScript.Length(), to;
while ( from < end && ( to = theScript.Location( "\n", from, end )))
{
if ( to != from )
// cut out and store a command
aNoteBook.AddCommand( theScript.SubString( from, to - 1 ));
from = to + 1;
}
theScript.Clear();
aNoteBook.ReplaceVariables();
theScript = aNoteBook.GetResultScript();
}
// convert to smeshBuilder.py API
theGen = new _pyGen( theEntry2AccessorMethod,
theObjectNames,
theRemovedObjIDs,
@ -470,33 +491,15 @@ SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScrip
theToKeepAllCommands );
// split theScript into separate commands
SMESH_NoteBook * aNoteBook = new SMESH_NoteBook();
int from = 1, end = theScript.Length(), to;
while ( from < end && ( to = theScript.Location( "\n", from, end )))
{
if ( to != from )
// cut out and store a command
aNoteBook->AddCommand( theScript.SubString( from, to - 1 ));
from = to + 1;
}
aNoteBook->ReplaceVariables();
TCollection_AsciiString aNoteScript = aNoteBook->GetResultScript();
delete aNoteBook;
aNoteBook = 0;
// split theScript into separate commands
from = 1, end = aNoteScript.Length();
while ( from < end && ( to = aNoteScript.Location( "\n", from, end )))
{
if ( to != from )
// cut out and store a command
theGen->AddCommand( aNoteScript.SubString( from, to - 1 ));
theGen->AddCommand( theScript.SubString( from, to - 1 ));
from = to + 1;
}
theScript.Clear();
// finish conversion
theGen->Flush();
@ -518,7 +521,7 @@ SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScrip
} while ( orderChanges );
// concat commands back into a script
TCollection_AsciiString aScript, aPrevCmd;
TCollection_AsciiString aPrevCmd;
set<_pyID> createdObjects;
createdObjects.insert( "smeshBuilder" );
createdObjects.insert( "smesh" );
@ -532,17 +535,15 @@ SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScrip
CheckObjectPresence( *cmd, createdObjects );
if ( !(*cmd)->IsEmpty() ) {
aPrevCmd = (*cmd)->GetString();
aScript += "\n";
aScript += aPrevCmd;
theScript += "\n";
theScript += aPrevCmd;
}
}
}
aScript += "\n";
theScript += "\n";
theGen->Free();
theGen.Nullify();
return aScript;
}
//================================================================================

6
src/SMESH_I/SMESH_DumpPython.cxx
View File

@ -984,9 +984,9 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
Resource_DataMapOfAsciiStringAsciiString anEntry2AccessorMethod;
std::set< TCollection_AsciiString > aRemovedObjIDs;
if ( !getenv("NO_2smeshpy_conversion"))
aScript = SMESH_2smeshpy::ConvertScript( aScript, anEntry2AccessorMethod,
theObjectNames, aRemovedObjIDs,
theStudy, isHistoricalDump );
SMESH_2smeshpy::ConvertScript( aScript, anEntry2AccessorMethod,
theObjectNames, aRemovedObjIDs,
theStudy, isHistoricalDump );
// Replace characters used instead of quote marks to quote notebook variables
{

9
src/SMESH_I/SMESH_PythonDump.hxx
View File

@ -46,12 +46,11 @@ class Resource_DataMapOfAsciiStringAsciiString;
*/
// ===========================================================================================
class SMESH_2smeshpy
namespace SMESH_2smeshpy
{
public:
/*!
* \brief Convert a python script using commands of smeshBuilder.py
* \param theScript - Input script
* \param theScript - the Input script to convert
* \param theEntry2AccessorMethod - returns method names to access to
* objects wrapped with python class
* \param theObjectNames - names of objects
@ -60,8 +59,8 @@ public:
* to exclude commands relating to objects removed from study
* \retval TCollection_AsciiString - Convertion result
*/
static TCollection_AsciiString
ConvertScript(const TCollection_AsciiString& theScript,
void
ConvertScript(TCollection_AsciiString& theScript,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
std::set< TCollection_AsciiString >& theRemovedObjIDs,