ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 10:08:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from BR_V5_DEV 17Feb09

Browse Source
This commit is contained in:
vsr 2009-02-17 12:10:20 +00:00
parent 392885c1a8
commit 1779c0f954
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/GEOM/GEOM_Engine.cxx
View File

@ -712,9 +712,7 @@ void ProcessFunction(Handle(GEOM_Function)& theFunction,
{ {
if (theFunction.IsNull()) return; if (theFunction.IsNull()) return;
// not to process twice
if (theProcessed.Contains(theFunction->GetEntry())) return; if (theProcessed.Contains(theFunction->GetEntry())) return;
theProcessed.Add(theFunction->GetEntry());
// pass functions, that depends on nonexisting ones // pass functions, that depends on nonexisting ones
bool doNotProcess = false; bool doNotProcess = false;
@ -753,6 +751,7 @@ void ProcessFunction(Handle(GEOM_Function)& theFunction,
theIgnoreObjs.insert(anObjEntry.ToCString()); theIgnoreObjs.insert(anObjEntry.ToCString());
return; return;
} }
theProcessed.Add(theFunction->GetEntry());
TCollection_AsciiString aDescr = theFunction->GetDescription(); TCollection_AsciiString aDescr = theFunction->GetDescription();
if(aDescr.Length() == 0) return; if(aDescr.Length() == 0) return;
@ -928,6 +927,8 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aStartPos++; aStartPos++;
if( aCommand.Value( aEndPos-1 ) == C_SQR_BRACKET ) if( aCommand.Value( aEndPos-1 ) == C_SQR_BRACKET )
aEndPos--; aEndPos--;
if ( aStartPos == aEndPos )
continue; // PAL20889: for "[]"
if(MYDEBUG) if(MYDEBUG)
cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl; cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl;