From: rnv <rnv@opencascade.com>
Date: Fri, 16 Mar 2018 13:59:26 +0000 (+0300)
Subject: Merge modifications for HYDRO project (origin/hydro/imps_2017_salome_83 branch)
X-Git-Tag: V8_5_0a2~3^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d5d7a7ea728b883f5af1ef4fe69aa8cffc477b1f;hp=-c;p=modules%2Fgui.git

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

d5d7a7ea728b883f5af1ef4fe69aa8cffc477b1f
diff --combined src/OCCViewer/OCCViewer_ViewWindow.h
index 69be9156c,ba1a6ddad..57165f3bf
--- a/src/OCCViewer/OCCViewer_ViewWindow.h
+++ b/src/OCCViewer/OCCViewer_ViewWindow.h
@@@ -39,6 -39,7 +39,6 @@@ class OCCViewer_SetRotationPointDlg
  class OCCViewer_Viewer;
  class OCCViewer_CubeAxesDlg;
  class QtxAction;
 -class gp_XYZ;
  
  struct viewAspect
  {
@@@ -143,7 -144,7 +143,7 @@@ class OCCVIEWER_EXPORT OCCViewer_ViewWi
    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,
@@@ -273,9 -274,8 +273,11 @@@
  
    virtual SUIT_CameraProperties   cameraProperties();
  
 +  bool isActionVisible( ActionId theId ) const;
 +  void setActionVisible( ActionId theId, bool isVisible );
 +
+   void resetState();
+ 
  public slots:
    virtual void onFrontView();
    virtual void onViewFitAll();
@@@ -361,7 -361,6 +363,6 @@@ protected
    void vpMouseReleaseEvent(QMouseEvent* theEvent);
    void vpMouseMoveEvent(QMouseEvent* theEvent);
  
-   void resetState();
    void drawRect();
    void endDrawRect();
  
@@@ -374,7 -373,9 +375,7 @@@
  
    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();