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

Adapting for OCCT dev (7.5)

Browse Source
This commit is contained in:
vsr 2020-03-19 14:25:13 +03:00
parent 43c219aae9
commit 54a5d9072f
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CurveCreator/CurveCreator_Utils.cxx
View File

@ -620,15 +620,17 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
theContext->SetAutomaticHilight( Standard_False ); theContext->SetAutomaticHilight( Standard_False );
Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
const NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>& selected = aSelection->Entities();
CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
aLast = thePoints.end(); aLast = thePoints.end();
bool isFound = false; bool isFound = false;
for( int i=0; i<aSize; i++ ) for( int i=0; i<aSize; i++ )
{ {
for( aSelection->Init(); aSelection->More(); aSelection->Next() ) for ( NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator selIter( selected );
selIter.More(); selIter.Next() )
{ {
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive(); const Handle(SelectMgr_SensitiveEntity) aHSenEntity = selIter.Value();
if( aHSenEntity.IsNull() ) if( aHSenEntity.IsNull() )
continue; continue;
Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive(); Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive();

7
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
View File

@ -178,9 +178,10 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
continue; continue;
Handle(SelectMgr_Selection) sel = theObj->Selection( m ); Handle(SelectMgr_Selection) sel = theObj->Selection( m );
const NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>& selected = sel->Entities();
for ( sel->Init(); sel->More(); sel->Next() ) { for ( NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator selIter( selected );
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); selIter.More(); selIter.Next() ) {
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = selIter.Value();
if( aHSenEntity.IsNull() ) if( aHSenEntity.IsNull() )
continue; continue;

7
src/OBJECT/GEOM_AISShape.cxx
View File

@ -99,9 +99,10 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
continue; continue;
Handle(SelectMgr_Selection) sel = theObj->Selection( m ); Handle(SelectMgr_Selection) sel = theObj->Selection( m );
const NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>& selected = sel->Entities();
for ( sel->Init(); sel->More(); sel->Next() ) { for ( NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator selIter( selected );
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); selIter.More(); selIter.Next() ) {
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = selIter.Value();
if( aHSenEntity.IsNull() ) if( aHSenEntity.IsNull() )
continue; continue;