X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ViewerProxy.cpp;h=a504708cf4fb4363b8e8ed45866cce1a245b2d16;hb=0cb3c0f823f35b3a268fbe032550deb2403780e8;hp=fee0419ddd6dfb31fbd19fce786d7fceee121325;hpb=b5d86ab8997bb4c6c486da17593633ff803f667a;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp
index fee0419dd..a504708cf 100644
--- a/src/XGUI/XGUI_ViewerProxy.cpp
+++ b/src/XGUI/XGUI_ViewerProxy.cpp
@@ -1,10 +1,28 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 #include "XGUI_ViewerProxy.h"
 #include "XGUI_Workshop.h"
-#include "XGUI_MainWindow.h"
-#include "XGUI_ViewPort.h"
-#include "XGUI_ViewWindow.h"
-#include "XGUI_Viewer.h"
 #include "XGUI_SalomeConnector.h"
+#include "XGUI_Displayer.h"
+
+#ifndef HAVE_SALOME
+  #include <AppElements_MainWindow.h>
+  #include <AppElements_ViewPort.h>
+  #include <AppElements_ViewWindow.h>
+  #include <AppElements_Viewer.h>
+#endif
+
+#ifdef VINSPECTOR
+#include <VInspectorAPI_PluginMgr.h>
+#include <VInspectorAPI_Communicator.h>
+
+static bool FirstCall = true;
+
+#endif
+
+#include <ModuleBase_IViewWindow.h>
+
+#include <QEvent>
 
 XGUI_ViewerProxy::XGUI_ViewerProxy(XGUI_Workshop* theParent)
     : ModuleBase_IViewer(theParent),
@@ -12,178 +30,378 @@ 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
 {
-  if (myWorkshop->isSalomeMode()) {
-    return myWorkshop->salomeConnector()->viewer()->AISContext();
-  } else {
-    return myWorkshop->mainWindow()->viewer()->AISContext();
+  Handle(AIS_InteractiveContext) aContext;
+#ifdef HAVE_SALOME
+  aContext = myWorkshop->salomeConnector()->viewer()->AISContext();
+#else
+  aContext = myWorkshop->mainWindow()->viewer()->AISContext();
+#endif
+
+#ifdef VINSPECTOR
+  if (FirstCall) {
+    VInspectorAPI_PluginMgr::activateVInspector("VInspector.dll", aContext);
+    FirstCall = false;
   }
+#endif
+
+
+  return aContext;
+}
+
+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
 {
-  if (myWorkshop->isSalomeMode()) {
-    return myWorkshop->salomeConnector()->viewer()->v3dViewer();
-  } else {
-    return myWorkshop->mainWindow()->viewer()->v3dViewer();
-  }
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->viewer()->v3dViewer();
+#else
+  return myWorkshop->mainWindow()->viewer()->v3dViewer();
+#endif
 }
 
 Handle(V3d_View) XGUI_ViewerProxy::activeView() const
 {
-  if (myWorkshop->isSalomeMode()) {
-    return myWorkshop->salomeConnector()->viewer()->activeView();
-  } else {
-    XGUI_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
-    return (aViewer->activeViewWindow()) ? aViewer->activeViewWindow()->viewPort()->getView() :
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->viewer()->activeView();
+#else
+  AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
+  return (aViewer->activeViewWindow()) ?
+    aViewer->activeViewWindow()->viewPortApp()->getView() :
     Handle(V3d_View)();
-  }
+#endif
 }
 
-void XGUI_ViewerProxy::setViewProjection(double theX, double theY, double theZ)
+QWidget* XGUI_ViewerProxy::activeViewPort() const
+{
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->viewer()->activeViewPort();
+#else
+  AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
+  return (aViewer->activeViewWindow()) ?
+         aViewer->activeViewWindow()->viewPortApp(): 0;
+#endif
+}
+
+void XGUI_ViewerProxy::setViewProjection(double theX, double theY, double theZ, double theTwist)
 {
   Handle(V3d_View) aView3d = activeView();
   if (!aView3d.IsNull()) {
     aView3d->SetProj(theX, theY, theZ);
-    aView3d->FitAll(0.01, true, true);
+    aView3d->SetTwist( theTwist );
+    aView3d->FitAll(0.01, false);
     aView3d->SetZSize(0.);
+    if (aView3d->Depth() < 0.1)
+      aView3d->DepthFitAll();
   }
 }
 
 void XGUI_ViewerProxy::fitAll()
 {
-  if (myWorkshop->isSalomeMode()) {
-    myWorkshop->salomeConnector()->viewer()->fitAll();
-  } else {
-    XGUI_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
-    if (aViewer->activeViewWindow())
-      aViewer->activeViewWindow()->viewPort()->fitAll();
-  }
+#ifdef HAVE_SALOME
+  myWorkshop->salomeConnector()->viewer()->fitAll();
+#else
+  AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
+  if (aViewer->activeViewWindow())
+    aViewer->activeViewWindow()->viewPortApp()->fitAll();
+#endif
 }
 
 void XGUI_ViewerProxy::connectToViewer()
 {
-  if (myWorkshop->isSalomeMode()) {
-    ModuleBase_IViewer* aViewer = myWorkshop->salomeConnector()->viewer();
+#ifdef HAVE_SALOME
+  ModuleBase_IViewer* aViewer = myWorkshop->salomeConnector()->viewer();
 
-    connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed()));
-    connect(aViewer, SIGNAL(tryCloseView()), this, SIGNAL(tryCloseView()));
-    connect(aViewer, SIGNAL(deleteView()), this, SIGNAL(deleteView()));
-    connect(aViewer, SIGNAL(viewCreated()), this, SIGNAL(viewCreated()));
-    connect(aViewer, SIGNAL(activated()), this, SIGNAL(activated()));
+  connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed()));
+  connect(aViewer, SIGNAL(tryCloseView(ModuleBase_IViewWindow*)),
+    this, SIGNAL(tryCloseView(ModuleBase_IViewWindow*)));
 
-    connect(aViewer, SIGNAL(mousePress(QMouseEvent*)), this, SIGNAL(mousePress(QMouseEvent*)));
+  connect(aViewer, SIGNAL(deleteView(ModuleBase_IViewWindow*)),
+    this, SIGNAL(deleteView(ModuleBase_IViewWindow*)));
 
-    connect(aViewer, SIGNAL(mouseRelease(QMouseEvent*)), this, SIGNAL(mouseRelease(QMouseEvent*)));
+  connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)),
+    this, SLOT(onViewCreated(ModuleBase_IViewWindow*)));
 
-    connect(aViewer, SIGNAL(mouseDoubleClick(QMouseEvent*)), this,
-            SIGNAL(mouseDoubleClick(QMouseEvent*)));
+  connect(aViewer, SIGNAL(activated(ModuleBase_IViewWindow*)),
+    this, SIGNAL(activated(ModuleBase_IViewWindow*)));
 
-    connect(aViewer, SIGNAL(mouseMove(QMouseEvent*)), this, SIGNAL(mouseMove(QMouseEvent*)));
+  connect(aViewer, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)),
+    this, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)));
 
-    connect(aViewer, SIGNAL(keyPress(QKeyEvent*)), this, SIGNAL(keyPress(QKeyEvent*)));
+  connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
+    this, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
 
-    connect(aViewer, SIGNAL(keyRelease(QKeyEvent*)), this, SIGNAL(keyRelease(QKeyEvent*)));
+  connect(aViewer, SIGNAL(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*)), this,
+          SIGNAL(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*)));
 
-    connect(aViewer, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
-    connect(aViewer, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this,
-            SIGNAL(contextMenuRequested(QContextMenuEvent*)));
+  connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
+    this, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
 
-  } else {
-    XGUI_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
-
-    connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed()));
-    connect(aViewer, SIGNAL(tryCloseView(XGUI_ViewWindow*)), this, SIGNAL(tryCloseView()));
-    connect(aViewer, SIGNAL(deleteView(XGUI_ViewWindow*)), this, SIGNAL(deleteView()));
-    connect(aViewer, SIGNAL(viewCreated(XGUI_ViewWindow*)), this, SIGNAL(viewCreated()));
-    connect(aViewer, SIGNAL(activated(XGUI_ViewWindow*)), this, SIGNAL(activated()));
-
-    connect(aViewer, SIGNAL(mousePress(XGUI_ViewWindow*, QMouseEvent*)), this,
-            SLOT(onMousePress(XGUI_ViewWindow*, QMouseEvent*)));
-    connect(aViewer, SIGNAL(mouseRelease(XGUI_ViewWindow*, QMouseEvent*)), this,
-            SLOT(onMouseRelease(XGUI_ViewWindow*, QMouseEvent*)));
-    connect(aViewer, SIGNAL(mouseDoubleClick(XGUI_ViewWindow*, QMouseEvent*)), this,
-            SLOT(onMouseDoubleClick(XGUI_ViewWindow*, QMouseEvent*)));
-    connect(aViewer, SIGNAL(mouseMove(XGUI_ViewWindow*, QMouseEvent*)), this,
-            SLOT(onMouseMove(XGUI_ViewWindow*, QMouseEvent*)));
-    connect(aViewer, SIGNAL(keyPress(XGUI_ViewWindow*, QKeyEvent*)), this,
-            SLOT(onKeyPress(XGUI_ViewWindow*, QKeyEvent*)));
-    connect(aViewer, SIGNAL(keyRelease(XGUI_ViewWindow*, QKeyEvent*)), this,
-            SLOT(onKeyRelease(XGUI_ViewWindow*, QKeyEvent*)));
-
-    connect(aViewer, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
-    connect(aViewer, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this,
-            SIGNAL(contextMenuRequested(QContextMenuEvent*)));
+  connect(aViewer, SIGNAL(keyPress(ModuleBase_IViewWindow*, QKeyEvent*)),
+    this, SIGNAL(keyPress(ModuleBase_IViewWindow*, QKeyEvent*)));
+
+  connect(aViewer, SIGNAL(keyRelease(ModuleBase_IViewWindow*, QKeyEvent*)),
+    this, SIGNAL(keyRelease(ModuleBase_IViewWindow*, QKeyEvent*)));
+
+  connect(aViewer, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
+
+  connect(aViewer, SIGNAL(viewTransformed(int)), this, SIGNAL(viewTransformed(int)));
+
+  connect(aViewer, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this,
+          SIGNAL(contextMenuRequested(QContextMenuEvent*)));
+#else
+  AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
+
+  connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed()));
+
+  connect(aViewer, SIGNAL(tryCloseView(AppElements_ViewWindow*)),
+          this, SLOT(onTryCloseView(AppElements_ViewWindow*)));
+
+  connect(aViewer, SIGNAL(deleteView(AppElements_ViewWindow*)),
+          this, SLOT(onDeleteView(AppElements_ViewWindow*)));
+
+  connect(aViewer, SIGNAL(viewCreated(AppElements_ViewWindow*)),
+          this, SLOT(onViewCreated(AppElements_ViewWindow*)));
+
+  connect(aViewer, SIGNAL(activated(AppElements_ViewWindow*)),
+          this, SLOT(onActivated(AppElements_ViewWindow*)));
+
+  connect(aViewer, SIGNAL(mousePress(AppElements_ViewWindow*, QMouseEvent*)), this,
+          SLOT(onMousePress(AppElements_ViewWindow*, QMouseEvent*)));
+
+  connect(aViewer, SIGNAL(mouseRelease(AppElements_ViewWindow*, QMouseEvent*)), this,
+          SLOT(onMouseRelease(AppElements_ViewWindow*, QMouseEvent*)));
+
+  connect(aViewer, SIGNAL(mouseDoubleClick(AppElements_ViewWindow*, QMouseEvent*)), this,
+          SLOT(onMouseDoubleClick(AppElements_ViewWindow*, QMouseEvent*)));
+
+  connect(aViewer, SIGNAL(mouseMove(AppElements_ViewWindow*, QMouseEvent*)), this,
+          SLOT(onMouseMove(AppElements_ViewWindow*, QMouseEvent*)));
+
+  connect(aViewer, SIGNAL(keyPress(AppElements_ViewWindow*, QKeyEvent*)), this,
+          SLOT(onKeyPress(AppElements_ViewWindow*, QKeyEvent*)));
+
+  connect(aViewer, SIGNAL(keyRelease(AppElements_ViewWindow*, QKeyEvent*)), this,
+          SLOT(onKeyRelease(AppElements_ViewWindow*, QKeyEvent*)));
+
+  connect(aViewer, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged()));
+  connect(aViewer, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this,
+          SIGNAL(contextMenuRequested(QContextMenuEvent*)));
+#endif
+}
+
+bool XGUI_ViewerProxy::eventFilter(QObject *theObject, QEvent *theEvent)
+{
+  if (theEvent->type() == QEvent::Enter) {
+    emit enterViewPort();
   }
+  else if (theEvent->type() == QEvent::Leave) {
+    emit leaveViewPort();
+  }
+  return ModuleBase_IViewer::eventFilter(theObject, theEvent);
 }
 
-void XGUI_ViewerProxy::onMousePress(XGUI_ViewWindow*, QMouseEvent* theEvent)
+void XGUI_ViewerProxy::onViewCreated(ModuleBase_IViewWindow* theWnd)
 {
-  emit mousePress(theEvent);
+  theWnd->viewPort()->installEventFilter(this);
+
+  myWindowScale.insert (theWnd->v3dView(), theWnd->v3dView()->Camera()->Scale());
+
+  emit viewCreated(theWnd);
+}
+
+#ifndef HAVE_SALOME
+void XGUI_ViewerProxy::onTryCloseView(AppElements_ViewWindow* theWnd)
+{
+  emit tryCloseView(theWnd);
 }
 
-void XGUI_ViewerProxy::onMouseRelease(XGUI_ViewWindow*, QMouseEvent* theEvent)
+void XGUI_ViewerProxy::onDeleteView(AppElements_ViewWindow* theWnd)
 {
-  emit mouseRelease(theEvent);
+  if (myWindowScale.contains(theWnd->v3dView()))
+    myWindowScale.remove (theWnd->v3dView());
+  emit deleteView(theWnd);
 }
 
-void XGUI_ViewerProxy::onMouseDoubleClick(XGUI_ViewWindow*, QMouseEvent* theEvent)
+void XGUI_ViewerProxy::onViewCreated(AppElements_ViewWindow* theWnd)
 {
-  emit mouseDoubleClick(theEvent);
+  theWnd->viewPort()->installEventFilter(this);
+
+  connect(theWnd, SIGNAL(vpTransformationFinished(AppElements_ViewWindow::OperationType)),
+    this, SLOT(onViewTransformed(AppElements_ViewWindow::OperationType)));
+
+  myWindowScale.insert (theWnd->v3dView(), theWnd->v3dView()->Camera()->Scale());
+
+  emit viewCreated(theWnd);
 }
 
-void XGUI_ViewerProxy::onMouseMove(XGUI_ViewWindow*, QMouseEvent* theEvent)
+void XGUI_ViewerProxy::onActivated(AppElements_ViewWindow* theWnd)
 {
-  emit mouseMove(theEvent);
+  emit activated(theWnd);
 }
 
-void XGUI_ViewerProxy::onKeyPress(XGUI_ViewWindow*, QKeyEvent* theEvent)
+void XGUI_ViewerProxy::onMousePress(AppElements_ViewWindow* theWnd, QMouseEvent* theEvent)
 {
-  emit keyPress(theEvent);
+  emit mousePress(theWnd, theEvent);
 }
 
-void XGUI_ViewerProxy::onKeyRelease(XGUI_ViewWindow*, QKeyEvent* theEvent)
+void XGUI_ViewerProxy::onMouseRelease(AppElements_ViewWindow* theWnd, QMouseEvent* theEvent)
 {
-  emit keyRelease(theEvent);
+  emit mouseRelease(theWnd, theEvent);
 }
 
+void XGUI_ViewerProxy::onMouseDoubleClick(AppElements_ViewWindow* theWnd, QMouseEvent* theEvent)
+{
+  emit mouseDoubleClick(theWnd, theEvent);
+}
+
+void XGUI_ViewerProxy::onMouseMove(AppElements_ViewWindow* theWnd, QMouseEvent* theEvent)
+{
+  emit mouseMove(theWnd, theEvent);
+}
+
+void XGUI_ViewerProxy::onKeyPress(AppElements_ViewWindow* theWnd, QKeyEvent* theEvent)
+{
+  emit keyPress(theWnd, theEvent);
+}
+
+void XGUI_ViewerProxy::onKeyRelease(AppElements_ViewWindow* theWnd, QKeyEvent* theEvent)
+{
+  emit keyRelease(theWnd, theEvent);
+}
+
+void XGUI_ViewerProxy::onViewTransformed(AppElements_ViewWindow::OperationType theType)
+{
+  emit viewTransformed((int) theType);
+}
+
+#endif
+
+
 //***************************************
 void XGUI_ViewerProxy::enableSelection(bool isEnabled)
 {
-  if (myWorkshop->isSalomeMode()) {
-    myWorkshop->salomeConnector()->viewer()->enableSelection(isEnabled);
-  } else {
-    myWorkshop->mainWindow()->viewer()->setSelectionEnabled(isEnabled);
-  }
+#ifdef HAVE_SALOME
+  myWorkshop->salomeConnector()->viewer()->enableSelection(isEnabled);
+#else
+  myWorkshop->mainWindow()->viewer()->setSelectionEnabled(isEnabled);
+#endif
 }
 
 //***************************************
 bool XGUI_ViewerProxy::isSelectionEnabled() const
 {
-  if (myWorkshop->isSalomeMode()) {
-    return myWorkshop->salomeConnector()->viewer()->isSelectionEnabled();
-  } else {
-    return myWorkshop->mainWindow()->viewer()->isSelectionEnabled();
-  }
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->viewer()->isSelectionEnabled();
+#else
+  return myWorkshop->mainWindow()->viewer()->isSelectionEnabled();
+#endif
 }
 
 //***************************************
 void XGUI_ViewerProxy::enableMultiselection(bool isEnable)
 {
-  if (myWorkshop->isSalomeMode()) {
-    myWorkshop->salomeConnector()->viewer()->enableMultiselection(isEnable);
-  } else {
-    myWorkshop->mainWindow()->viewer()->setMultiSelectionEnabled(isEnable);
-  }
+#ifdef HAVE_SALOME
+  myWorkshop->salomeConnector()->viewer()->enableMultiselection(isEnable);
+#else
+  myWorkshop->mainWindow()->viewer()->setMultiSelectionEnabled(isEnable);
+#endif
 }
 
 //***************************************
 bool XGUI_ViewerProxy::isMultiSelectionEnabled() const
+{
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->viewer()->isMultiSelectionEnabled();
+#else
+  return myWorkshop->mainWindow()->viewer()->isMultiSelectionEnabled();
+#endif
+}
+
+//***************************************
+bool XGUI_ViewerProxy::enableDrawMode(bool isEnabled)
+{
+#ifdef HAVE_SALOME
+  return myWorkshop->salomeConnector()->viewer()->enableDrawMode(isEnabled);
+#else
+  return myWorkshop->mainWindow()->viewer()->enableDrawMode(isEnabled);
+#endif
+}
+
+//***************************************
+void XGUI_ViewerProxy::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+{
+  myWorkshop->displayer()->addSelectionFilter(theFilter);
+}
+
+//***************************************
+void XGUI_ViewerProxy::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+{
+  myWorkshop->displayer()->removeSelectionFilter(theFilter);
+}
+
+//***************************************
+bool XGUI_ViewerProxy::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+{
+  return myWorkshop->displayer()->hasSelectionFilter(theFilter);
+}
+
+//***************************************
+void XGUI_ViewerProxy::clearSelectionFilters()
+{
+  myWorkshop->displayer()->removeFilters();
+}
+
+//***************************************
+void XGUI_ViewerProxy::update()
+{
+  myWorkshop->displayer()->updateViewer();
+}
+
+//***************************************
+bool XGUI_ViewerProxy::canDragByMouse() const
 {
   if (myWorkshop->isSalomeMode()) {
-    return myWorkshop->salomeConnector()->viewer()->isMultiSelectionEnabled();
+    ModuleBase_IViewer* aViewer = myWorkshop->salomeConnector()->viewer();
+    return aViewer->canDragByMouse();
   } else {
-    return myWorkshop->mainWindow()->viewer()->isMultiSelectionEnabled();
+    return true;
   }
 }
+
+
+//***************************************
+void XGUI_ViewerProxy::Zfitall()
+{
+#ifdef HAVE_SALOME
+  myWorkshop->salomeConnector()->viewer()->Zfitall();
+#else
+  AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
+  AppElements_ViewWindow* aView = aViewer->activeViewWindow();
+  if (aView) {
+    Handle(V3d_View) aView3d = aView->v3dView();
+    aView3d->ZFitAll();
+    if (aView3d->Depth() < 0.1)
+      aView3d->DepthFitAll();
+  }
+#endif
+}
\ No newline at end of file