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

Porting on the OCCT-6.9.0

Browse Source
This commit is contained in:
rnv 2015-04-08 16:07:00 +03:00
parent 2960cb2164
commit 3275e00630
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CurveCreator/CurveCreator_Utils.cxx
View File

@ -22,6 +22,8 @@
#include "CurveCreator_Curve.hxx" #include "CurveCreator_Curve.hxx"
#include "CurveCreator_UtilsICurve.hxx" #include "CurveCreator_UtilsICurve.hxx"
#include <Basics_OCCTVersion.hxx>
#include <GEOMUtils.hxx> #include <GEOMUtils.hxx>
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
@ -579,7 +581,15 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
for( aSelection->Init(); aSelection->More(); aSelection->Next() ) for( aSelection->Init(); aSelection->More(); aSelection->Next() )
{ {
#if OCC_VERSION_LARGE > 0x06080100
const SelectMgr_HSensitiveEntity aHSenEntity = aSelection->Sensitive();
if( aHSenEntity.IsNull() )
continue;
Handle_SelectBasics_SensitiveEntity aSenEntity = aHSenEntity->BaseSensitive();
#else
Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive(); Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive();
#endif
Handle_Select3D_SensitivePoint aSenPnt = Handle_Select3D_SensitivePoint::DownCast( aSenEntity ); Handle_Select3D_SensitivePoint aSenPnt = Handle_Select3D_SensitivePoint::DownCast( aSenEntity );
gp_Pnt anOwnerPnt = aSenPnt->Point(); gp_Pnt anOwnerPnt = aSenPnt->Point();

10
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
View File

@ -25,6 +25,8 @@
// //
#include "GEOMGUI_OCCSelector.h" #include "GEOMGUI_OCCSelector.h"
#include <Basics_OCCTVersion.hxx>
#include <LightApp_DataSubOwner.h> #include <LightApp_DataSubOwner.h>
#include <OCCViewer_ViewModel.h> #include <OCCViewer_ViewModel.h>
@ -176,7 +178,15 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
Handle(SelectMgr_Selection) sel = theObj->Selection( m ); Handle(SelectMgr_Selection) sel = theObj->Selection( m );
for ( sel->Init(); sel->More(); sel->Next() ) { for ( sel->Init(); sel->More(); sel->Next() ) {
#if OCC_VERSION_LARGE > 0x06080100
const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive();
if( aHSenEntity.IsNull() )
continue;
Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive();
#else
Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive(); Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive();
#endif
if ( entity.IsNull() ) if ( entity.IsNull() )
continue; continue;

11
src/OBJECT/GEOM_AISShape.cxx
View File

@ -108,10 +108,17 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
Handle(SelectMgr_Selection) sel = theObj->Selection( m ); Handle(SelectMgr_Selection) sel = theObj->Selection( m );
for ( sel->Init(); sel->More(); sel->Next() ) { for ( sel->Init(); sel->More(); sel->Next() ) {
Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive(); #if OCC_VERSION_LARGE > 0x06080100
if ( entity.IsNull() ) const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive();
if( aHSenEntity.IsNull() )
continue; continue;
Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive();
#else
Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive();
#endif
if ( entity.IsNull() )
continue;
Handle(SelectMgr_EntityOwner) owner = Handle(SelectMgr_EntityOwner) owner =
Handle(SelectMgr_EntityOwner)::DownCast(entity->OwnerId()); Handle(SelectMgr_EntityOwner)::DownCast(entity->OwnerId());
if ( !owner.IsNull() ) if ( !owner.IsNull() )