Merge branch 'vsr/make_test' into Dev_1.5.0

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

diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp
index e19cb39b0931dea06da0a13a45b93d5065b4c24c..955813a423b61bf8edfeb398ec3c4cb52bf60f51 100644 (file)
--- a/src/XGUI/XGUI_ViewerProxy.cpp
+++ b/src/XGUI/XGUI_ViewerProxy.cpp
@@ -47,13 +47,16 @@ Handle(V3d_View) XGUI_ViewerProxy::activeView() const
   }
 }
 
-void XGUI_ViewerProxy::setViewProjection(double theX, double theY, double theZ)
+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->SetTwist( theTwist );
     aView3d->FitAll(0.01, true);
     aView3d->SetZSize(0.);
+    if (aView3d->Depth() < 0.1)
+      aView3d->DepthFitAll();
   }
 }
 
@@ -272,6 +275,16 @@ bool XGUI_ViewerProxy::isMultiSelectionEnabled() const
   }
 }
 
+//***************************************
+bool XGUI_ViewerProxy::enableDrawMode(bool isEnabled)
+{
+  if (myWorkshop->isSalomeMode()) {
+    return myWorkshop->salomeConnector()->viewer()->enableDrawMode(isEnabled);
+  } else {
+    return myWorkshop->mainWindow()->viewer()->enableDrawMode(isEnabled);
+  }
+}
+
 //***************************************
 void XGUI_ViewerProxy::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
 {
@@ -328,7 +341,11 @@ void XGUI_ViewerProxy::Zfitall()
   } else {
     AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
     AppElements_ViewWindow* aView = aViewer->activeViewWindow();
-    if (aView)
-      aView->v3dView()->ZFitAll();
+    if (aView) {
+      Handle(V3d_View) aView3d = aView->v3dView();
+      aView3d->ZFitAll();
+      if (aView3d->Depth() < 0.1)
+        aView3d->DepthFitAll();
+    }
   }
 }
\ No newline at end of file