ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-12 12:17:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug IPAL8747. Move py name fixing to DumpPython_impl()

Browse Source
This commit is contained in:
eap 2005-05-06 10:20:30 +00:00
parent cfb5bbf72e
commit 98e9e947bd
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/SMESH_I/SMESH_DumpPython.cxx
View File

@ -292,17 +292,13 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy,
SALOMEDS::ChildIterator_var Itr = aStudy->NewChildIterator(aSO); SALOMEDS::ChildIterator_var Itr = aStudy->NewChildIterator(aSO);
for (Itr->InitEx(true); Itr->More(); Itr->Next()) { for (Itr->InitEx(true); Itr->More(); Itr->Next()) {
SALOMEDS::SObject_var aValue = Itr->Value(); SALOMEDS::SObject_var aValue = Itr->Value();
CORBA::String_var anID = aValue->GetID();
TCollection_AsciiString aName (aValue->GetName()); CORBA::String_var aName = aValue->GetName();
TCollection_AsciiString aGUIName (aName); TCollection_AsciiString aGUIName ( (char*) aName.in() );
if (aName.Length() > 0) { TCollection_AsciiString anEnrty ( (char*) anID.in() );
aMapNames.Bind(TCollection_AsciiString(aValue->GetID()), aGUIName); if (aGUIName.Length() > 0) {
int p, p2 = 1, e = aName.Length(); aMapNames.Bind( anEnrty, aGUIName );
while ((p = aName.FirstLocationNotInSet(s, p2, e))) { aMap.Bind( anEnrty, aGUIName );
aName.SetValue(p, '_');
p2 = p;
}
aMap.Bind(TCollection_AsciiString(aValue->GetID()), aName);
} }
} }
@ -524,7 +520,8 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
TColStd_SequenceOfAsciiString seqRemoved; TColStd_SequenceOfAsciiString seqRemoved;
Resource_DataMapOfAsciiStringAsciiString mapRemoved; Resource_DataMapOfAsciiStringAsciiString mapRemoved;
Standard_Integer objectCounter = 0, aStart = 1, aScriptLength = aScript.Length(); Standard_Integer objectCounter = 0, aStart = 1, aScriptLength = aScript.Length();
TCollection_AsciiString anUpdatedScript, anEntry, aName, aBaseName("smeshObj_"); TCollection_AsciiString anUpdatedScript, anEntry, aName, aBaseName("smeshObj_"),
allowedChars ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_");
// Collect names of GEOM objects to exclude same names for SMESH objects // Collect names of GEOM objects to exclude same names for SMESH objects
GEOM::string_array_var aGeomNames = geom->GetAllDumpNames(); GEOM::string_array_var aGeomNames = geom->GetAllDumpNames();
@ -545,18 +542,31 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
if (theObjectNames.IsBound(anEntry)) { if (theObjectNames.IsBound(anEntry)) {
// The Object is in Study // The Object is in Study
aName = theObjectNames.Find(anEntry); aName = theObjectNames.Find(anEntry);
if ( aName.IsIntegerValue() ) // aName must not start with a digit // check validity of aName
bool isValidName = true;
if ( aName.IsIntegerValue() ) { // aName must not start with a digit
aName.Insert( 1, 'a' ); aName.Insert( 1, 'a' );
isValidName = false;
}
int p, p2=1; // replace not allowed chars
while ((p = aName.FirstLocationNotInSet(allowedChars, p2, aName.Length()))) {
aName.SetValue(p, '_');
p2=p;
isValidName = false;
}
if (theObjectNames.IsBound(aName) && anEntry != theObjectNames(aName)) { if (theObjectNames.IsBound(aName) && anEntry != theObjectNames(aName)) {
// diff objects have same name - make a new name // diff objects have same name - make a new name by appending a digit
TCollection_AsciiString aName2; TCollection_AsciiString aName2;
Standard_Integer i = 0; Standard_Integer i = 0;
do { do {
aName2 = aName + "_" + ++i; aName2 = aName + "_" + ++i;
} while (theObjectNames.IsBound(aName2) && anEntry != theObjectNames(aName2)); } while (theObjectNames.IsBound(aName2) && anEntry != theObjectNames(aName2));
aName = aName2; aName = aName2;
theObjectNames(anEntry) = aName; isValidName = false;
} }
if ( !isValidName )
theObjectNames(anEntry) = aName;
} else { } else {
// Removed Object // Removed Object
do { do {