X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ViewerProxy.h;h=bf578c424bd8f46e172b137be242d178168401f1;hb=220bd2b37119be1c65abf88a88792445cb9d99f8;hp=f7c40d4c101830d9d7642bc0218655e0af6d2274;hpb=a63f4aea8cf064bae8339c926584316f218d98d5;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ViewerProxy.h b/src/XGUI/XGUI_ViewerProxy.h
index f7c40d4c1..bf578c424 100644
--- a/src/XGUI/XGUI_ViewerProxy.h
+++ b/src/XGUI/XGUI_ViewerProxy.h
@@ -5,7 +5,12 @@
 
 #include "XGUI.h"
 #include <ModuleBase_IViewer.h>
-#include <AppElements_ViewWindow.h>
+
+#include <AIS_Trihedron.hxx>
+
+#ifndef HAVE_SALOME
+  #include <AppElements_ViewWindow.h>
+#endif
 
 class XGUI_Workshop;
 /**
@@ -23,15 +28,23 @@ Q_OBJECT
    /// \param theParent a parent object
   XGUI_ViewerProxy(XGUI_Workshop* theParent);
 
+  /// Connects some signals to the viewer from the module connector
+  void connectViewProxy();
+
   //! Returns AIS_InteractiveContext from current OCCViewer
   virtual Handle(AIS_InteractiveContext) AISContext() const;
 
+  //! Trihedron 3d object shown in the viewer
+  virtual Handle(AIS_Trihedron) trihedron() const;
+
   //! Retrurns V3d_Vioewer from current viewer
   virtual Handle(V3d_Viewer) v3dViewer() const;
 
   //! Returns Vsd_View object from currently active view window
   virtual Handle(V3d_View) activeView() const;
 
+  virtual QWidget* activeViewPort() const;
+
   //! Enable or disable selection in the viewer
   virtual void enableSelection(bool isEnabled);
 
@@ -44,11 +57,16 @@ Q_OBJECT
   //! Returns true if multiselection is enabled
   virtual bool isMultiSelectionEnabled() const;
 
+  //! Enable or disable draw mode in the viewer
+  virtual bool enableDrawMode(bool isEnabled);
+
   //! Sets the view projection
   /// \param theX the X projection value
   /// \param theY the Y projection value
   /// \param theZ the Z projection value
-  virtual void setViewProjection(double theX, double theY, double theZ);
+  /// \param theTwist the twist angle in radians
+  virtual void setViewProjection( double theX, double theY, double theZ,
+                                  double theTwist );
 
   //! Sets the view fitted all
   virtual void fitAll();
@@ -62,6 +80,10 @@ Q_OBJECT
   /// Remove selection filter from the viewer
   virtual void removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter);
 
+  /// Returns true if the selection filter is set to the viewer
+  /// \param theFilter a selection filter
+  virtual bool hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter);
+
   /// Remove all selection filters from the viewer
   virtual void clearSelectionFilters();
 
@@ -89,9 +111,11 @@ protected:
   bool eventFilter(QObject *theObject, QEvent *theEvent);
 
 private slots:
+  void onViewCreated(ModuleBase_IViewWindow* theWnd);
+
+#ifndef HAVE_SALOME
   void onTryCloseView(AppElements_ViewWindow*);
   void onDeleteView(AppElements_ViewWindow*);
-  void onViewCreated(ModuleBase_IViewWindow* theWnd);
   void onViewCreated(AppElements_ViewWindow*);
   void onActivated(AppElements_ViewWindow*);
 
@@ -104,6 +128,7 @@ private slots:
   void onKeyRelease(AppElements_ViewWindow*, QKeyEvent*);
 
   void onViewTransformed(AppElements_ViewWindow::OperationType);
+#endif
 
  private:
   XGUI_Workshop* myWorkshop;