Proper conditional compilation: a way OCCT dev version is detected has been modified...

diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
index 36b7615b12f47ad93d4c42f2d75c3573a00f8b44..195d81485f8273d82c0d132ac0e809c1ed16f9ed 100755 (executable)
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
@@ -157,7 +157,7 @@ void OCCViewer_CreateRestoreViewDlg::changeImage( QListWidgetItem* curItem )
     
     Standard_Boolean prev = aView3d->SetImmediateUpdate( Standard_False );
     aView3d->SetScale( myCurrentItem.scale );
-#if OCC_VERSION_LARGE <= 0x06070000
+#if OCC_VERSION_LARGE <= 0x06070100
     aView3d->SetCenter( myCurrentItem.centerX, myCurrentItem.centerY );
 #endif
     aView3d->SetProj( myCurrentItem.projX, myCurrentItem.projY, myCurrentItem.projZ );

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index 6a0e713c45cf16ecb63fdfb05ef625cdd77b07f9..3f546a855b9a2eef241d2355c185b85273e522e9 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -40,7 +40,7 @@
 #include <Visual3d_View.hxx>
 #include <V3d_Viewer.hxx>
 
-#if OCC_VERSION_LARGE > 0x06070000
+#if OCC_VERSION_LARGE > 0x06070100
 #include <V3d_View.hxx>
 #else
 #include <V3d_PerspectiveView.hxx>
@@ -75,7 +75,7 @@ OCCViewer_ViewPort3d::OCCViewer_ViewPort3d( QWidget* parent, const Handle( V3d_V
   // VSR: 01/07/2010 commented to avoid SIGSEGV at SALOME exit
   //selectVisualId();
 
-#if OCC_VERSION_LARGE > 0x06070000
+#if OCC_VERSION_LARGE > 0x06070100
   myActiveView = new V3d_View( viewer, type );
 #else
   if ( type == V3d_ORTHOGRAPHIC ) {
@@ -234,7 +234,7 @@ bool OCCViewer_ViewPort3d::syncronize( const OCCViewer_ViewPort3d* ref )
   refView->Up( x, y, z ); tgtView->SetUp( x, y, z );
   refView->Eye( x, y, z ); tgtView->SetEye( x, y, z );
   refView->Proj( x, y, z ); tgtView->SetProj( x, y, z );
-#if OCC_VERSION_LARGE <= 0x06070000
+#if OCC_VERSION_LARGE <= 0x06070100
   refView->Center( x, y ); tgtView->SetCenter( x, y );
 #endif
   tgtView->SetScale( refView->Scale() );
@@ -623,7 +623,7 @@ void OCCViewer_ViewPort3d::endRotation()
 {
   if ( !activeView().IsNull() ) {
     activeView()->ZFitAll( 1.0 );
-#if OCC_VERSION_LARGE <= 0x06070000
+#if OCC_VERSION_LARGE <= 0x06070100
     activeView()->SetZSize( 0.0 );
 #endif
     activeView()->Update();
@@ -679,7 +679,7 @@ void OCCViewer_ViewPort3d::fitAll( bool keepScale, bool withZ, bool upd )
 
   Standard_Real margin = 0.01;
   
-#if OCC_VERSION_LARGE > 0x06070000
+#if OCC_VERSION_LARGE > 0x06070100
   activeView()->FitAll( margin, upd );
   if(withZ)
     activeView()->ZFitAll();
@@ -794,7 +794,7 @@ bool OCCViewer_ViewPort3d::synchronize( OCCViewer_ViewPort* view )
     Handle(V3d_View) aView3d = getView();
     Handle(V3d_View) aRefView3d = vp3d->getView();
     aView3d->SetImmediateUpdate( Standard_False );
-#if OCC_VERSION_LARGE > 0x06070000
+#if OCC_VERSION_LARGE > 0x06070100
     aView3d->Camera()->Copy( aRefView3d->Camera() );
 #else
     aView3d->SetViewMapping( aRefView3d->ViewMapping() );

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h
index f50a7bfc2dab596d8b7ce6a8b8d96d8fb423cfe4..cd8b1c9e1c945603967a4f1af48ef0fb92d294d9 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.h
@@ -120,7 +120,7 @@ private:
   
 private:
   Handle(V3d_View)      myActiveView;
-#if OCC_VERSION_LARGE <= 0x06070000
+#if OCC_VERSION_LARGE <= 0x06070100
   Handle(V3d_View)      myOrthoView;
   Handle(V3d_View)      myPerspView;
 #endif

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 0e2505507d907d1055cdb74e291fe3c40e59ec5c..8b965a462cdeb38bb275197a9b64eb656737bda9 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -619,7 +619,7 @@ bool OCCViewer_ViewWindow::computeGravityCenter( double& theX, double& theY, dou
   // the ones which lie within the screen limits\r
   Standard_Real aScreenLimits[4] = { 0.0, 0.0, 0.0, 0.0 };\r
 \r
-#if OCC_VERSION_LARGE > 0x06070000\r
+#if OCC_VERSION_LARGE > 0x06070100\r
   // NDC space screen limits\r
   aScreenLimits[0] = -1.0;\r
   aScreenLimits[1] =  1.0;\r
@@ -670,7 +670,7 @@ bool OCCViewer_ViewWindow::computeGravityCenter( double& theX, double& theY, dou
     for ( Standard_Integer aPointIt = 0; aPointIt < 8; ++aPointIt ) {\r
       const gp_Pnt& aBBPoint = aPoints[aPointIt];
 
-#if OCC_VERSION_LARGE > 0x06070000
+#if OCC_VERSION_LARGE > 0x06070100
       gp_Pnt aProjected = aView3d->Camera()->Project( aBBPoint );
       const Standard_Real& U = aProjected.X();
       const Standard_Real& V = aProjected.Y();
@@ -1693,7 +1693,7 @@ void OCCViewer_ViewWindow::performRestoring( const viewAspect& anItem, bool base
   aView3d->SetProj( anItem.projX, anItem.projY, anItem.projZ );\r
   aView3d->SetAxialScale( anItem.scaleX, anItem.scaleY, anItem.scaleZ );\r
 \r
-#if OCC_VERSION_LARGE > 0x06070000\r
+#if OCC_VERSION_LARGE > 0x06070100\r
   if ( anItem.centerX != 0.0 || anItem.centerY != 0.0 )\r
   {\r
     double anUpX = 0.0, anUpY = 0.0, anUpZ = 0.0;\r
@@ -2102,7 +2102,7 @@ viewAspect OCCViewer_ViewWindow::getViewParams() const
   params.isVisible= isShown;\r
   params.size     = size;\r
 \r
-#if OCC_VERSION_LARGE <= 0x06070000 // the property is deprecated in OCCT 6.7.1\r
+#if OCC_VERSION_LARGE <= 0x06070100 // the property is deprecated after OCCT 6.7.1\r
   aView3d->Center( params.centerX, params.centerY );\r
 #endif\r
 \r
@@ -2168,7 +2168,7 @@ QString OCCViewer_ViewWindow::getVisualParameters()
   QStringList data;\r
 \r
   data << QString( "scale=%1" )    .arg( params.scale,   0, 'e', 12 );\r
-#if OCC_VERSION_LARGE <= 0x06070000 // the property is deprecated in OCCT 6.7.1\r
+#if OCC_VERSION_LARGE <= 0x06070100 // the property is deprecated after OCCT 6.7.1\r
   data << QString( "centerX=%1" )  .arg( params.centerX, 0, 'e', 12 );\r
   data << QString( "centerY=%1" )  .arg( params.centerY, 0, 'e', 12 );\r
 #endif\r
@@ -2784,7 +2784,7 @@ SUIT_CameraProperties OCCViewer_ViewWindow::cameraProperties()
   aProps.setAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] );\r
   aProps.setViewUp( anUp[0], anUp[1], anUp[2] );\r
 \r
-#if OCC_VERSION_LARGE > 0x06070000\r
+#if OCC_VERSION_LARGE > 0x06070100\r
   aSourceView->Eye( anEye[0], anEye[1], anEye[2] );\r
 \r
   // store camera properties "as is": it is up to synchronized\r
@@ -2882,7 +2882,7 @@ void OCCViewer_ViewWindow::synchronize( SUIT_ViewWindow* theView )
   aProps.getViewUp( anUpDir[0], anUpDir[1], anUpDir[2] );\r
   aProps.getAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] );\r
 \r
-#if OCC_VERSION_LARGE > 0x06070000\r
+#if OCC_VERSION_LARGE > 0x06070100\r
   aDestView->SetAt( aFocalPoint[0], aFocalPoint[1], aFocalPoint[2] );\r
   aDestView->SetEye( aPosition[0], aPosition[1], aPosition[2] );\r
   aDestView->SetUp( anUpDir[0], anUpDir[1], anUpDir[2] );\r