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

Fix of self depending case.

Browse Source
This commit is contained in:
akl 2014-05-23 15:55:57 +04:00
parent e39d0de8bc
commit 30c1376c61
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -3105,7 +3105,9 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
//std::cout << "AKL: add link ior: " << depList[j]->GetEntry() << endl; //std::cout << "AKL: add link ior: " << depList[j]->GetEntry() << endl;
} }
//std::cout << "AKL: <<<<<<<< start next step: " << endl; //std::cout << "AKL: <<<<<<<< start next step: " << endl;
getUpwardDependency(depList[j], upLevelList, level+1); if ( !depList[j]->IsSame( gbo ) ) {
getUpwardDependency(depList[j], upLevelList, level+1);
}
//std::cout << "AKL: end next step >>>>>>>> : " << endl; //std::cout << "AKL: end next step >>>>>>>> : " << endl;
} }
if ( level > 0 ) { if ( level > 0 ) {
@ -3128,21 +3130,20 @@ void GEOM_Gen_i::getDownwardDependency( SALOMEDS::Study_ptr theStudy,
if ( !comp ) if ( !comp )
return; return;
GEOMUtils::NodeLinks anIORs;
GEOMUtils::LevelInfo aLevelMap;
std::string aGboIOR = gbo->GetEntry(); std::string aGboIOR = gbo->GetEntry();
if ( level > 0 ) { cout << "for " << aGboIOR << " at level " << level << endl;
if ( level-1 >= downLevelList.size() ) { /*if ( level > 0 ) {
if ( level >= downLevelList.size() ) {
downLevelList.push_back( aLevelMap ); downLevelList.push_back( aLevelMap );
//std::cout << "AKL: new map" << endl; //std::cout << "AKL: new map" << endl;
} else { } else {
aLevelMap = downLevelList.at(level-1); aLevelMap = downLevelList.at(level);
if ( aLevelMap.count( aGboIOR ) > 0 ) { if ( aLevelMap.count( aGboIOR ) > 0 ) {
anIORs = aLevelMap[ aGboIOR ]; anIORs = aLevelMap[ aGboIOR ];
//std::cout << "AKL: get already added iors list: " << endl; //std::cout << "AKL: get already added iors list: " << endl;
} }
} }
} }*/
SALOMEDS::ChildIterator_var it = theStudy->NewChildIterator( comp ); SALOMEDS::ChildIterator_var it = theStudy->NewChildIterator( comp );
for ( it->InitEx( true ); it->More(); it->Next() ) { for ( it->InitEx( true ); it->More(); it->Next() ) {
SALOMEDS::SObject_var child = it->Value(); SALOMEDS::SObject_var child = it->Value();
@ -3155,20 +3156,40 @@ void GEOM_Gen_i::getDownwardDependency( SALOMEDS::Study_ptr theStudy,
if( depList->length() == 0 ) if( depList->length() == 0 )
continue; continue;
std::string aGoIOR = geomObj->GetEntry(); std::string aGoIOR = geomObj->GetEntry();
//cout << "check " << aGoIOR << endl;
for( int i = 0; i < depList->length(); i++ ) { for( int i = 0; i < depList->length(); i++ ) {
//cout << "depends on " << depList[i]->GetEntry() << endl;
if ( depList[i]->IsSame( gbo ) ) { if ( depList[i]->IsSame( gbo ) ) {
if ( level > 0 ) { //cout << " the same! " << endl;
anIORs.push_back( geomObj->GetEntry()); //if ( level > 0 ) {
GEOMUtils::NodeLinks anIORs;
GEOMUtils::LevelInfo aLevelMap;
anIORs.push_back( gbo->GetEntry());
if ( level >= downLevelList.size() ) {
downLevelList.push_back( aLevelMap );
//std::cout << "AKL: new map" << endl;
} else {
aLevelMap = downLevelList.at(level);
if ( aLevelMap.count( aGoIOR ) > 0 ) {
anIORs = aLevelMap[ aGoIOR ];
//std::cout << "AKL: get already added iors list: " << endl;
}
}
aLevelMap.insert( std::pair<std::string, GEOMUtils::NodeLinks>(aGoIOR, anIORs) );
downLevelList[level] = aLevelMap;
//}
if ( !depList[i]->IsSame( geomObj ) ) {
//cout << " go on! " << endl;
getDownwardDependency(theStudy, geomObj, downLevelList, level+1);
} }
getDownwardDependency(theStudy, geomObj, downLevelList, level+1);
} }
} }
} }
if ( level > 0 ) { /*if ( level > 0 ) {
aLevelMap.insert( std::pair<std::string, GEOMUtils::NodeLinks>(aGboIOR, anIORs) ); aLevelMap.insert( std::pair<std::string, GEOMUtils::NodeLinks>(aGboIOR, anIORs) );
downLevelList[level-1] = aLevelMap; downLevelList[level-1] = aLevelMap;
} }*/
} }
//===================================================================================== //=====================================================================================