From b3e4e10a49fdb63274e0fed03b8b1543178e406c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 6 Dec 2010 13:50:54 +0000 Subject: [PATCH] 0020938: EDF 1450 GEOM: center of zoom Additional fix (wrong OCC version fixed) --- src/LightApp/LightApp_Application.cxx | 2 +- src/OCCViewer/OCCViewer_ViewPort3d.cxx | 4 ++-- src/OCCViewer/OCCViewer_ViewWindow.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 7a2fb0fac..7da67202c 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -1998,7 +1998,7 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) pref->setItemProperty( "strings", aStyleModeList, occStyleMode ); pref->setItemProperty( "indexes", aModeIndexesList, occStyleMode ); -#if OCC_VERSION_LARGE > 0x06030010 // available only with OCC-6.3-sp11 and higher version +#if OCC_VERSION_LARGE > 0x0603000A // available only with OCC-6.3-sp11 and higher version int occZoomingStyleMode = pref->addPreference( tr( "PREF_ZOOMING" ), occGroup, LightApp_Preferences::Selector, "OCCViewer", "zooming_mode" ); QStringList anOCCZoomingStyleModeList; diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx index 34bad67d3..f6ea5109f 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx @@ -323,7 +323,7 @@ void OCCViewer_ViewPort3d::fitRect( const QRect& rect ) */ void OCCViewer_ViewPort3d::startZoomAtPoint( int x, int y ) { -#if OCC_VERSION_LARGE > 0x06030010 // available only with OCC-6.3-sp11 and higher version +#if OCC_VERSION_LARGE > 0x0603000A // available only with OCC-6.3-sp11 and higher version if ( !activeView().IsNull() && isAdvancedZoomingEnabled() ) activeView()->StartZoomAtPoint( x, y ); #endif @@ -338,7 +338,7 @@ void OCCViewer_ViewPort3d::zoom( int x0, int y0, int x, int y ) // as OCCT respects a sign of only dx, // but we want both signes to be taken into account //activeView()->Zoom( x0, y0, x, y ); -#if OCC_VERSION_LARGE > 0x06030010 // available only with OCC-6.3-sp11 and higher version +#if OCC_VERSION_LARGE > 0x0603000A // available only with OCC-6.3-sp11 and higher version if ( isAdvancedZoomingEnabled() ) activeView()->ZoomAtPoint( x0, y0, x, y ); else diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx index 06c1c0cef..a8977bc2e 100755 --- a/src/OCCViewer/OCCViewer_ViewWindow.cxx +++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx @@ -1228,7 +1228,7 @@ void OCCViewer_ViewWindow::createToolBar() toolMgr()->append( DumpId, tid ); toolMgr()->append( SwitchInteractionStyleId, tid ); -#if OCC_VERSION_LARGE > 0x06030010 // available only with OCC-6.3-sp11 and higher version +#if OCC_VERSION_LARGE > 0x0603000A // available only with OCC-6.3-sp11 and higher version toolMgr()->append( SwitchZoomingStyleId, tid ); #endif if( myModel->trihedronActivated() && (my2dMode == No2dMode) ) -- 2.39.2