Escape OCCT 7.7+ subview API into macros d

Author: gkv311

occt-qopenglwidget/OcctQOpenGLWidgetViewer.cpp

@@ -332,6 +332,8 @@ void OcctQOpenGLWidgetViewer::wheelEvent(QWheelEvent* theEvent)
 #else
   const Graphic3d_Vec2i aPos(theEvent->pos().x(), theEvent->pos().y());
 #endif
+
+#if (OCC_VERSION_HEX >= 0x070700)
   if (!myView->Subviews().IsEmpty())
   {
     Handle(V3d_View) aPickedView = myView->PickSubview(aPos);
@@ -343,6 +345,7 @@ void OcctQOpenGLWidgetViewer::wheelEvent(QWheelEvent* theEvent)
       return;
     }
   }
+#endif
 
   if (UpdateZoom(Aspect_ScrollDelta(aPos, double(theEvent->angleDelta().y()) / 8.0)))
     updateView();
@@ -414,12 +417,14 @@ void OcctQOpenGLWidgetViewer::paintGL()
     myView->Invalidate();
     dumpGlInfo(true, false);
 
+#if (OCC_VERSION_HEX >= 0x070700)
     for (const Handle(V3d_View)& aSubviewIter : myView->Subviews())
     {
       aSubviewIter->MustBeResized();
       aSubviewIter->Invalidate();
       aDefaultFbo->SetupViewport(aGlCtx);
     }
+#endif
   }
 
   // flush pending input events and redraw the viewer
@@ -439,6 +444,7 @@ void OcctQOpenGLWidgetViewer::handleViewRedraw(const Handle(AIS_InteractiveConte
     updateView(); // ask more frames for animation
 }
 
+#if (OCC_VERSION_HEX >= 0x070700)
 // ================================================================
 // Function : OnSubviewChanged
 // ================================================================
@@ -448,3 +454,4 @@ void OcctQOpenGLWidgetViewer::OnSubviewChanged(const Handle(AIS_InteractiveConte
 {
   myFocusView = theNewView;
 }
+#endif

occt-qopenglwidget/OcctQOpenGLWidgetViewer.h

@@ -10,6 +10,7 @@
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_ViewController.hxx>
 #include <V3d_View.hxx>
+#include <Standard_Version.hxx>
 
 class AIS_ViewCube;
 
@@ -50,11 +51,12 @@ class OcctQOpenGLWidgetViewer : public QOpenGLWidget, public AIS_ViewController
   virtual QSize sizeHint() const override { return QSize(720, 480); }
 
 public:
+#if (OCC_VERSION_HEX >= 0x070700)
   //! Handle subview focus change.
   virtual void OnSubviewChanged(const Handle(AIS_InteractiveContext)&,
                                 const Handle(V3d_View)&,
                                 const Handle(V3d_View)& theNewView) override;
-
+#endif
 protected: // OpenGL events
   virtual void initializeGL() override;
   virtual void paintGL() override;

occt-qopenglwidget/main.cpp

@@ -44,12 +44,14 @@ class MyMainWindow : public QMainWindow
   {
     QMenuBar* aMenuBar    = new QMenuBar();
     QMenu*    aMenuWindow = aMenuBar->addMenu("&File");
+#if (OCC_VERSION_HEX >= 0x070700)
     {
       QAction* anActionSplit = new QAction(aMenuWindow);
       anActionSplit->setText("Split Views");
       aMenuWindow->addAction(anActionSplit);
       connect(anActionSplit, &QAction::triggered, [this]() { splitSubviews(); });
     }
+#endif
     {
       QAction* anActionQuit = new QAction(aMenuWindow);
       anActionQuit->setText("Quit");
@@ -104,12 +106,13 @@ class MyMainWindow : public QMainWindow
         connect(aSlider, &QSlider::valueChanged, [this](int theValue) {
           const float          aVal = theValue / 255.0f;
           const Quantity_Color aColor(aVal, aVal, aVal, Quantity_TOC_sRGB);
-
+#if (OCC_VERSION_HEX >= 0x070700)
           for (const Handle(V3d_View)& aSubviewIter : myViewer->View()->Subviews())
           {
             aSubviewIter->SetBgGradientColors(aColor, Quantity_NOC_BLACK, Aspect_GradientFillMethod_Elliptical);
             aSubviewIter->Invalidate();
           }
+#endif
           // myViewer->View()->SetBackgroundColor(aColor);
           myViewer->View()->SetBgGradientColors(aColor, Quantity_NOC_BLACK, Aspect_GradientFillMethod_Elliptical);
           myViewer->View()->Invalidate();
@@ -120,6 +123,7 @@ class MyMainWindow : public QMainWindow
     }
   }
 
+#if (OCC_VERSION_HEX >= 0x070700)
   //! Advanced method splitting 3D Viewer into sub-views.
   void splitSubviews()
   {
@@ -157,6 +161,7 @@ class MyMainWindow : public QMainWindow
     myViewer->View()->Invalidate();
     myViewer->update();
   }
+#endif
 };
 
 int main(int theNbArgs, char** theArgVec)