#1189 Tab - Cancel - Enter validate not cancel: In case of disabled Apply button...

[modules/shaper.git] / src / XGUI / XGUI_ViewerProxy.cpp

diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp
index 54dc14670143a4886ebefd7afde87cdae7ed223c..6233d28ff80940973c70c6920d1df3752944f42e 100644 (file)
--- a/src/XGUI/XGUI_ViewerProxy.cpp
+++ b/src/XGUI/XGUI_ViewerProxy.cpp
@@ -22,6 +22,17 @@ XGUI_ViewerProxy::XGUI_ViewerProxy(XGUI_Workshop* theParent)
 {
 }
 
+void XGUI_ViewerProxy::connectViewProxy()
+{
+#ifdef HAVE_SALOME
+  connect(myWorkshop->salomeConnector()->viewer(), SIGNAL(trihedronVisibilityChanged(bool)),
+         SIGNAL(trihedronVisibilityChanged(bool)));
+#else
+  connect(myWorkshop->mainWindow()->viewer(), SIGNAL(trihedronVisibilityChanged(bool)),
+         SIGNAL(trihedronVisibilityChanged(bool)));
+#endif
+}
+
 Handle(AIS_InteractiveContext) XGUI_ViewerProxy::AISContext() const
 {
 #ifdef HAVE_SALOME
@@ -31,6 +42,15 @@ Handle(AIS_InteractiveContext) XGUI_ViewerProxy::AISContext() const
 #endif
 }
 
+Handle(AIS_Trihedron) XGUI_ViewerProxy::trihedron() const
+{
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->viewer()->trihedron();
+#else
+  return myWorkshop->mainWindow()->viewer()->trihedron();
+#endif
+}
+
 Handle(V3d_Viewer) XGUI_ViewerProxy::v3dViewer() const
 {
 #ifdef HAVE_SALOME
@@ -55,7 +75,7 @@ Handle(V3d_View) XGUI_ViewerProxy::activeView() const
 QWidget* XGUI_ViewerProxy::activeViewPort() const
 {
 #ifdef HAVE_SALOME
-  return myWorkshop->salomeConnector()->viewer()->activeView();
+  return myWorkshop->salomeConnector()->viewer()->activeViewPort();
 #else
   AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
   return (aViewer->activeViewWindow()) ?