ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 10:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Correct checking objects.

Browse Source
This commit is contained in:
akl 2014-06-02 17:30:05 +04:00
parent 1673cb51ce
commit d2cf8fc7f2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -3055,6 +3055,8 @@ SALOMEDS::TMPFile* GEOM_Gen_i::GetDependencyTree( SALOMEDS::Study_ptr theStudy,
for ( int i = 0; i < theObjectIORs.length(); i++ ) { for ( int i = 0; i < theObjectIORs.length(); i++ ) {
ior = theObjectIORs[i].in(); ior = theObjectIORs[i].in();
GEOM::GEOM_BaseObject_var anObj = GetObject( theStudy->StudyId(), ior.c_str() ); GEOM::GEOM_BaseObject_var anObj = GetObject( theStudy->StudyId(), ior.c_str() );
if ( anObj->_is_nil() )
continue;
GEOMUtils::LevelsList upLevelList; GEOMUtils::LevelsList upLevelList;
getUpwardDependency( anObj, upLevelList ); getUpwardDependency( anObj, upLevelList );
GEOMUtils::LevelsList downLevelList; GEOMUtils::LevelsList downLevelList;
@ -3073,6 +3075,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::GetDependencyTree( SALOMEDS::Study_ptr theStudy,
SALOMEDS::TMPFile_var aStream = new SALOMEDS::TMPFile(aBufferSize, aBufferSize, anOctetBuf, 1); SALOMEDS::TMPFile_var aStream = new SALOMEDS::TMPFile(aBufferSize, aBufferSize, anOctetBuf, 1);
//std::cout << "AKL: end of get" << endl;
return aStream._retn(); return aStream._retn();
} }
@ -3107,12 +3110,15 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo,
} }
GEOM::ListOfGBO_var depList = gbo->GetDependency(); GEOM::ListOfGBO_var depList = gbo->GetDependency();
for( int j = 0; j < depList->length(); j++ ) { for( int j = 0; j < depList->length(); j++ ) {
if ( depList[j]->_is_nil() )
continue;
if ( level > 0 ) { if ( level > 0 ) {
anIORs.push_back( depList[j]->GetEntry() ); anIORs.push_back( depList[j]->GetEntry() );
//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;
if ( !depList[j]->IsSame( gbo ) ) { //if ( !depList[j]->IsSame( gbo ) ) {
if ( !depList[j]->_is_equivalent( gbo ) ) {
getUpwardDependency(depList[j], upLevelList, level+1); getUpwardDependency(depList[j], upLevelList, level+1);
} }
//std::cout << "AKL: end next step >>>>>>>> : " << endl; //std::cout << "AKL: end next step >>>>>>>> : " << endl;
@ -3185,8 +3191,11 @@ void GEOM_Gen_i::getDownwardDependency( SALOMEDS::Study_ptr theStudy,
//cout << "check " << aGoIOR << endl; //cout << "check " << aGoIOR << endl;
for( int i = 0; i < depList->length(); i++ ) { for( int i = 0; i < depList->length(); i++ ) {
if ( depList[i]->_is_nil() )
continue;
//cout << "depends on " << depList[i]->GetEntry() << endl; //cout << "depends on " << depList[i]->GetEntry() << endl;
if ( depList[i]->IsSame( gbo ) ) { //if ( depList[i]->IsSame( gbo ) ) {
if ( depList[i]->_is_equivalent( gbo ) ) {
//cout << " the same! " << endl; //cout << " the same! " << endl;
//if ( level > 0 ) { //if ( level > 0 ) {
GEOMUtils::NodeLinks anIORs; GEOMUtils::NodeLinks anIORs;
@ -3205,7 +3214,8 @@ void GEOM_Gen_i::getDownwardDependency( SALOMEDS::Study_ptr theStudy,
aLevelMap.insert( std::pair<std::string, GEOMUtils::NodeLinks>(aGoIOR, anIORs) ); aLevelMap.insert( std::pair<std::string, GEOMUtils::NodeLinks>(aGoIOR, anIORs) );
downLevelList[level] = aLevelMap; downLevelList[level] = aLevelMap;
//} //}
if ( !depList[i]->IsSame( geomObj ) ) { //if ( !depList[i]->IsSame( geomObj ) ) {
if ( !depList[i]->_is_equivalent( geomObj ) ) {
//cout << " go on! " << endl; //cout << " go on! " << endl;
getDownwardDependency(theStudy, geomObj, downLevelList, level+1); getDownwardDependency(theStudy, geomObj, downLevelList, level+1);
} }