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/?p=modules%2Fgui.git;a=commitdiff_plain;h=d5d7a7ea728b883f5af1ef4fe69aa8cffc477b1f

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

d5d7a7ea728b883f5af1ef4fe69aa8cffc477b1f
diff --cc src/OCCViewer/OCCViewer_ViewWindow.h
index 69be9156c,ba1a6ddad..57165f3bf
--- a/src/OCCViewer/OCCViewer_ViewWindow.h
+++ b/src/OCCViewer/OCCViewer_ViewWindow.h
@@@ -273,9 -274,8 +273,11 @@@ public
  
    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();