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

OCCT 6.9.0 (IR-2015-05-23) compatibility

Browse Source
This commit is contained in:
vsr 2015-05-07 19:01:50 +03:00
parent 8d74e7ed1f
commit 5b22346fc5
6 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CurveCreator/CMakeLists.txt
View File

@ -39,6 +39,11 @@ ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}
) )
# VSR: TEMPORARY, to be removed
IF(OCCT_690BETA_COMPAT)
ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT)
ENDIF(OCCT_690BETA_COMPAT)
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
GEOMUtils GEOMUtils

4
src/CurveCreator/CurveCreator_Utils.cxx
View File

@ -582,7 +582,11 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
for( aSelection->Init(); aSelection->More(); aSelection->Next() ) for( aSelection->Init(); aSelection->More(); aSelection->Next() )
{ {
#if OCC_VERSION_LARGE > 0x06080100 #if OCC_VERSION_LARGE > 0x06080100
#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive();
#else // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
const SelectMgr_HSensitiveEntity aHSenEntity = aSelection->Sensitive(); const SelectMgr_HSensitiveEntity aHSenEntity = aSelection->Sensitive();
#endif // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
if( aHSenEntity.IsNull() ) if( aHSenEntity.IsNull() )
continue; continue;
Handle_SelectBasics_SensitiveEntity aSenEntity = aHSenEntity->BaseSensitive(); Handle_SelectBasics_SensitiveEntity aSenEntity = aHSenEntity->BaseSensitive();

5
src/GEOMGUI/CMakeLists.txt
View File

@ -50,6 +50,11 @@ ADD_DEFINITIONS(
${OPENCV_DEFINITIONS} ${OPENCV_DEFINITIONS}
) )
# VSR: TEMPORARY, to be removed
IF(OCCT_690BETA_COMPAT)
ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT)
ENDIF(OCCT_690BETA_COMPAT)
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
GEOMObject GEOMObject

4
src/GEOMGUI/GEOMGUI_OCCSelector.cxx
View File

@ -179,7 +179,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
for ( sel->Init(); sel->More(); sel->Next() ) { for ( sel->Init(); sel->More(); sel->Next() ) {
#if OCC_VERSION_LARGE > 0x06080100 #if OCC_VERSION_LARGE > 0x06080100
#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
#else // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive(); const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive();
#endif // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
if( aHSenEntity.IsNull() ) if( aHSenEntity.IsNull() )
continue; continue;

5
src/OBJECT/CMakeLists.txt
View File

@ -45,6 +45,11 @@ ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}
) )
# VSR: TEMPORARY, to be removed
IF(OCCT_690BETA_COMPAT)
ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT)
ENDIF(OCCT_690BETA_COMPAT)
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
OCC2VTK OCC2VTK

4
src/OBJECT/GEOM_AISShape.cxx
View File

@ -109,7 +109,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj,
for ( sel->Init(); sel->More(); sel->Next() ) { for ( sel->Init(); sel->More(); sel->Next() ) {
#if OCC_VERSION_LARGE > 0x06080100 #if OCC_VERSION_LARGE > 0x06080100
#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation
const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive();
#else // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive(); const SelectMgr_HSensitiveEntity aHSenEntity = sel->Sensitive();
#endif // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation
if( aHSenEntity.IsNull() ) if( aHSenEntity.IsNull() )
continue; continue;