Merge modifications for HYDRO project (origin/hydro/imps_2017_salome_83 branch)

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

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.h b/src/OCCViewer/OCCViewer_ViewWindow.h
index ba1a6ddad55f5246d00c4c633eabb56d2055f83f..57165f3bff5cfb7df4a4968352e164fca3dbc966 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.h
+++ b/src/OCCViewer/OCCViewer_ViewWindow.h
@@ -39,7 +39,6 @@ class OCCViewer_SetRotationPointDlg;
 class OCCViewer_Viewer;
 class OCCViewer_CubeAxesDlg;
 class QtxAction;
-class gp_XYZ;
 
 struct viewAspect
 {
@@ -144,7 +143,7 @@ class OCCVIEWER_EXPORT OCCViewer_ViewWindow : public SUIT_ViewWindow
   Q_OBJECT
 
 public:
-  enum { DumpId, FitAllId, FitRectId, FitSelectionId, ZoomId, PanId, GlobalPanId,
+  enum ActionId { DumpId, FitAllId, FitRectId, FitSelectionId, ZoomId, PanId, GlobalPanId,
          ChangeRotationPointId, RotationId,
          FrontId, BackId, TopId, BottomId, LeftId, RightId, ClockWiseId, AntiClockWiseId,
         ResetId, CloneId, ClippingId, MemId, RestoreId,
@@ -274,6 +273,9 @@ public:
 
   virtual SUIT_CameraProperties   cameraProperties();
 
+  bool isActionVisible( ActionId theId ) const;
+  void setActionVisible( ActionId theId, bool isVisible );
+
   void resetState();
 
 public slots:
@@ -373,9 +375,7 @@ protected:
 
   bool computeGravityCenter( double& theX, double& theY, double& theZ );
 
-  bool computeGravityCenter1(gp_XYZ& gravityCenter);
-
-  void ProjAndPanToGravity(V3d_TypeOfOrientation CamOri);
+  void projAndPanToGravity(V3d_TypeOfOrientation CamOri);
 
   virtual void                          onSketchingStarted();
   virtual void                          onSketchingFinished();