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

CCAR: problem with an endless loop in getAIS

Browse Source
This commit is contained in:
caremoli 2011-01-05 14:29:52 +00:00
parent 10e23ee67f
commit 08ccaeae90
2 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/GEOMBase/GEOMBase.cxx
View File

@ -395,7 +395,7 @@ Handle(AIS_InteractiveObject) GEOMBase::GetAIS( const Handle(SALOME_InteractiveO
anIC->ObjectsInCollector( displayed ); anIC->ObjectsInCollector( displayed );
AIS_ListIteratorOfListOfInteractive it( displayed ); AIS_ListIteratorOfListOfInteractive it( displayed );
while ( it.More() && aisObject.IsNull() ) { for ( ; it.More(); it.Next() ){
if ( onlyGeom && !it.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) ) if ( onlyGeom && !it.Value()->IsInstance( STANDARD_TYPE(GEOM_AISShape) ) )
continue; continue;
@ -403,7 +403,10 @@ Handle(AIS_InteractiveObject) GEOMBase::GetAIS( const Handle(SALOME_InteractiveO
Handle(SALOME_InteractiveObject)::DownCast( it.Value()->GetOwner() ); Handle(SALOME_InteractiveObject)::DownCast( it.Value()->GetOwner() );
if ( !obj.IsNull() && obj->isSame( IO ) ) if ( !obj.IsNull() && obj->isSame( IO ) )
{
aisObject = it.Value(); aisObject = it.Value();
break;
}
} }
} }
if ( !aisObject.IsNull() ) break; if ( !aisObject.IsNull() ) break;

2
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -383,8 +383,8 @@ void GEOMToolsGUI::OnColor()
anObject->SetColor( aSColor ); anObject->SetColor( aSColor );
anObject->SetAutoColor( false ); anObject->SetAutoColor( false );
} }
} // for
GeometryGUI::Modified(); GeometryGUI::Modified();
}
} // if c.isValid() } // if c.isValid()
} // first IO is not null } // first IO is not null
} // if ( isOCC ) } // if ( isOCC )