ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix upward cycling if two objects depend on each other.

Browse Source
This commit is contained in:
akl 2014-06-05 15:17:59 +04:00
parent 6076f118e7
commit bd9c3283e5
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -3057,12 +3057,14 @@ SALOMEDS::TMPFile* GEOM_Gen_i::GetDependencyTree( SALOMEDS::Study_ptr theStudy,
GEOM::GEOM_BaseObject_var anObj = GetObject( theStudy->StudyId(), entry.c_str() ); GEOM::GEOM_BaseObject_var anObj = GetObject( theStudy->StudyId(), entry.c_str() );
if ( anObj->_is_nil() ) if ( anObj->_is_nil() )
continue; continue;
std::set<std::string> passedEntries;
passedEntries.insert( entry );
GEOMUtils::LevelsList upLevelList; GEOMUtils::LevelsList upLevelList;
// get objects from which current one depends on recursively // get objects from which current one depends on recursively
getUpwardDependency( anObj, upLevelList ); getUpwardDependency( anObj, upLevelList, passedEntries );
GEOMUtils::LevelsList downLevelList; GEOMUtils::LevelsList downLevelList;
// get objects that depends on current one recursively // get objects that depends on current one recursively
getDownwardDependency( anObj, downLevelList ); //getDownwardDependency( anObj, downLevelList, passedEntries );
tree.insert( std::pair<std::string, std::pair<GEOMUtils::LevelsList,GEOMUtils::LevelsList> >(entry, std::pair<GEOMUtils::LevelsList,GEOMUtils::LevelsList>( upLevelList, downLevelList ) ) ); tree.insert( std::pair<std::string, std::pair<GEOMUtils::LevelsList,GEOMUtils::LevelsList> >(entry, std::pair<GEOMUtils::LevelsList,GEOMUtils::LevelsList>( upLevelList, downLevelList ) ) );
} }
@ -3087,14 +3089,18 @@ SALOMEDS::TMPFile* GEOM_Gen_i::GetDependencyTree( SALOMEDS::Study_ptr theStudy,
//======================================================================= //=======================================================================
void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo, void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
GEOMUtils::LevelsList &upLevelList, GEOMUtils::LevelsList &upLevelList,
std::set<std::string> &passedEntries,
int level ) { int level ) {
std::string aGboEntry = gbo->GetEntry(); std::string aGboEntry = gbo->GetEntry();
passedEntries.insert( aGboEntry );
/*
for (int i=0; i < upLevelList.size(); i++ ) { for (int i=0; i < upLevelList.size(); i++ ) {
GEOMUtils::LevelInfo aMap = upLevelList.at(i); GEOMUtils::LevelInfo aMap = upLevelList.at(i);
if ( aMap.count( aGboEntry ) > 0 ) if ( aMap.count( aGboEntry ) > 0 )
// this object has been processed earlier // this object has been processed earlier
return; return;
} }
*/
GEOMUtils::NodeLinks anEntries; GEOMUtils::NodeLinks anEntries;
GEOMUtils::LevelInfo aLevelMap; GEOMUtils::LevelInfo aLevelMap;
if ( level > 0 ) { if ( level > 0 ) {
@ -3118,8 +3124,9 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
anEntries.push_back( depList[j]->GetEntry() ); anEntries.push_back( depList[j]->GetEntry() );
} }
// get dependencies recursively // get dependencies recursively
if ( !depList[j]->_is_equivalent( gbo ) ) { // avoid self-recursion if ( !depList[j]->_is_equivalent( gbo ) && /*avoid self-recursion*/
getUpwardDependency(depList[j], upLevelList, level+1); passedEntries.count( depList[j]->GetEntry() ) == 0 /*avoid checking the passed objects*/ ) {
getUpwardDependency(depList[j], upLevelList, passedEntries, level+1);
} }
} }
if ( level > 0 ) { if ( level > 0 ) {
@ -3134,6 +3141,7 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
//======================================================================= //=======================================================================
void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
GEOMUtils::LevelsList &downLevelList, GEOMUtils::LevelsList &downLevelList,
std::set<std::string> &passedEntries,
int level ) { int level ) {
Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(gbo->GetStudyID()); Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(gbo->GetStudyID());
Handle(TDataStd_TreeNode) aNode, aRoot; Handle(TDataStd_TreeNode) aNode, aRoot;
@ -3180,7 +3188,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
downLevelList[level] = aLevelMap; downLevelList[level] = aLevelMap;
// get dependencies of the current object recursively // get dependencies of the current object recursively
if ( !depList[i]->_is_equivalent( geomObj ) ) { // avoid self-recursion if ( !depList[i]->_is_equivalent( geomObj ) ) { // avoid self-recursion
getDownwardDependency(geomObj, downLevelList, level+1); getDownwardDependency(geomObj, downLevelList, passedEntries, level+1);
} }
break; break;
} }

2
src/GEOM_I/GEOM_Gen_i.hh
View File

@ -374,10 +374,12 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
void getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo, void getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
GEOMUtils::LevelsList &upLevelList, GEOMUtils::LevelsList &upLevelList,
std::set<std::string> &passedEntries,
int level = 0 ); int level = 0 );
void getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, void getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
GEOMUtils::LevelsList &downLevelList, GEOMUtils::LevelsList &downLevelList,
std::set<std::string> &passedEntries,
int level = 0 ); int level = 0 );
private: private: