ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-12 08:23:06 +05:00
Code Issues Packages Projects Releases Wiki Activity

0020159: EDF GEOM: Dump study with exploded geom object is not complete

Browse Source
This commit is contained in:
eap 2009-02-13 08:27:24 +00:00
parent f8c92e177c
commit b47f0f377c
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/GEOM/GEOM_Engine.cxx
View File

@ -104,12 +104,12 @@ static Standard_Integer ExtractDocID(TCollection_AsciiString& theID)
void ProcessFunction(Handle(GEOM_Function)& theFunction, void ProcessFunction(Handle(GEOM_Function)& theFunction,
TCollection_AsciiString& theScript, TCollection_AsciiString& theScript,
TVariablesList theVariables, const TVariablesList& theVariables,
TDF_LabelMap& theProcessed, TDF_LabelMap& theProcessed,
std::set<std::string>& theDumpedObjs); std::set<std::string>& theDumpedObjs);
void ReplaceVariables(TCollection_AsciiString& theCommand, void ReplaceVariables(TCollection_AsciiString& theCommand,
TVariablesList theVariables); const TVariablesList& theVariables);
@ -467,8 +467,8 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
Handle(TDataStd_TreeNode) aNode, aRoot; Handle(TDataStd_TreeNode) aNode, aRoot;
Handle(GEOM_Function) aFunction; Handle(GEOM_Function) aFunction;
TDF_LabelMap aFuncMap; TDF_LabelMap aCheckedFuncMap;
std::set<std::string> anObjMap; std::set<std::string> anIgnoreObjMap;
if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) {
TDataStd_ChildNodeIterator Itr(aRoot); TDataStd_ChildNodeIterator Itr(aRoot);
@ -479,7 +479,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
MESSAGE ( "Null function !!!!" ); MESSAGE ( "Null function !!!!" );
continue; continue;
} }
ProcessFunction(aFunction, aScript, theVariables, aFuncMap, anObjMap); ProcessFunction(aFunction, aScript, theVariables, aCheckedFuncMap, anIgnoreObjMap);
} }
} }
@ -606,8 +606,8 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
{ {
const TCollection_AsciiString& aEntry = anEntryToNameIt.Key(); const TCollection_AsciiString& aEntry = anEntryToNameIt.Key();
const TCollection_AsciiString& aName = anEntryToNameIt.Value(); const TCollection_AsciiString& aName = anEntryToNameIt.Value();
if (!anObjMap.count(aEntry.ToCString())) if (anIgnoreObjMap.count(aEntry.ToCString()))
continue; // was not dumped continue; // should not be dumped
if ( !aEntry2StEntry.IsBound( aEntry )) if ( !aEntry2StEntry.IsBound( aEntry ))
continue; // was not published continue; // was not published
TCollection_AsciiString aCommand("\n\tgeompy."), aFatherEntry; TCollection_AsciiString aCommand("\n\tgeompy."), aFatherEntry;
@ -706,23 +706,15 @@ Handle(TColStd_HSequenceOfAsciiString) GEOM_Engine::GetAllDumpNames() const
//=========================================================================== //===========================================================================
void ProcessFunction(Handle(GEOM_Function)& theFunction, void ProcessFunction(Handle(GEOM_Function)& theFunction,
TCollection_AsciiString& theScript, TCollection_AsciiString& theScript,
TVariablesList theVariables, const TVariablesList& theVariables,
TDF_LabelMap& theProcessed, TDF_LabelMap& theProcessed,
std::set<std::string>& theDumpedObjs) std::set<std::string>& theIgnoreObjs)
{ {
if (theFunction.IsNull()) return; if (theFunction.IsNull()) return;
if (theProcessed.Contains(theFunction->GetEntry())) return;
/* // not to process twice
TDF_LabelSequence aSeq; if (theProcessed.Contains(theFunction->GetEntry())) return;
theFunction->GetDependency(aSeq); theProcessed.Add(theFunction->GetEntry());
Standard_Integer aLen = aSeq.Length();
for(Standard_Integer i = 1; i <= aLen; i++) {
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(aSeq.Value(i));
if(aFunction.IsNull()) continue;
ProcessFunction(aFunction, theScript, theProcessed);
}
*/
// pass functions, that depends on nonexisting ones // pass functions, that depends on nonexisting ones
bool doNotProcess = false; bool doNotProcess = false;
@ -755,14 +747,16 @@ void ProcessFunction(Handle(GEOM_Function)& theFunction,
} }
} }
if (doNotProcess) return; if (doNotProcess) {
TCollection_AsciiString anObjEntry;
TCollection_AsciiString aDescr = theFunction->GetDescription(); TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry);
if(aDescr.Length() == 0) { theIgnoreObjs.insert(anObjEntry.ToCString());
//cout << "Warning: the function has no description" << endl;
return; return;
} }
TCollection_AsciiString aDescr = theFunction->GetDescription();
if(aDescr.Length() == 0) return;
//Check if its internal function which doesn't requires dumping //Check if its internal function which doesn't requires dumping
if(aDescr == "None") return; if(aDescr == "None") return;
@ -770,12 +764,6 @@ void ProcessFunction(Handle(GEOM_Function)& theFunction,
ReplaceVariables(aDescr,theVariables); ReplaceVariables(aDescr,theVariables);
theScript += "\n\t"; theScript += "\n\t";
theScript += aDescr; theScript += aDescr;
theProcessed.Add(theFunction->GetEntry());
TCollection_AsciiString anObjEntry;
TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry);
theDumpedObjs.insert(anObjEntry.ToCString());
} }
//============================================================================= //=============================================================================
@ -822,7 +810,7 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin
*/ */
//============================================================================= //=============================================================================
void ReplaceVariables(TCollection_AsciiString& theCommand, void ReplaceVariables(TCollection_AsciiString& theCommand,
TVariablesList theVariables) const TVariablesList& theVariables)
{ {
if (MYDEBUG) if (MYDEBUG)
cout<<"Command : "<<theCommand<<endl; cout<<"Command : "<<theCommand<<endl;