0023124: EDF 11219 GEOM: Ray tracing in the OCC viewer

[modules/gui.git] / src / OCCViewer / OCCViewer_ViewPort3d.h

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h
index e4f3cd7245846853bd2023a9e3aa53856d8f2efe..1413b76e9eb1363d20ed3a0b47ea71d022ad4f5e 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,6 +23,8 @@
 #ifndef OCCVIEWER_VIEWPORT3D_H
 #define OCCVIEWER_VIEWPORT3D_H
 
+#include <Basics_OCCTVersion.hxx>
+
 #include "OCCViewer_ViewPort.h"
 #include "Qtx.h"
 
@@ -61,8 +63,6 @@ public:
   virtual int           getBgImgHeight(){return myBgImgHeight; };
   virtual int           getBgImgWidth() {return myBgImgWidth;  };
 
-  virtual void          updateStaticTriedronVisibility();
-
 //   void         setActive( V3d_TypeOfView );
   virtual bool          syncronize( const OCCViewer_ViewPort3d* );
 
@@ -92,10 +92,17 @@ public:
   void                  setAdvancedZoomingEnabled( const bool theState ) { myIsAdvancedZoomingEnabled = theState; }
   bool                  isAdvancedZoomingEnabled() const { return myIsAdvancedZoomingEnabled; }
 
+  void                  showStaticTrihedron( bool );
+
+  //void                  repaintViewAfterMove( );
+
+  void                  setDefaultCursor( Qt::CursorShape theCursorShape );
+  QCursor*              getDefaultCursor() const;
+
 signals:
   void                  vpChangeBackground( const Qtx::BackgroundData& );
-  void                  vpClosed();
-  void                  vpMapped();
+  void                  vpClosed(OCCViewer_ViewPort3d*);
+  void                  vpMapped(OCCViewer_ViewPort3d*);
 
 public slots:
   virtual bool          synchronize( OCCViewer_ViewPort* );
@@ -115,17 +122,21 @@ private:
   bool                  setWindow( const Handle(V3d_View)& );
   bool                  mapped( const Handle(V3d_View)& ) const;
   void                  updateBackground();
+  void                  setDefaultParams();
   
 private:
+  Handle(V3d_View)      myActiveView;
+#if OCC_VERSION_LARGE <= 0x06070100
   Handle(V3d_View)      myOrthoView;
   Handle(V3d_View)      myPerspView;
-  Handle(V3d_View)      myActiveView;
+#endif
   bool                  myBusy;
   double                myScale;
   bool                  myIsAdvancedZoomingEnabled;
   Qtx::BackgroundData   myBackground;
   int                   myBgImgHeight;
   int                   myBgImgWidth;
+  QCursor*              myCursor;
 };
 
 #ifdef WIN32