X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ViewerProxy.cpp;h=345efbe077f98fcf03dbc081845174c29d42bb80;hb=64fc7e4fdd63997ec7a502b233ef5f88186d5bbb;hp=c32ceab8a045bdd84474e6a1ee69623944c680eb;hpb=8014834da0821ddfaa8b19e3d9bd651fa4392ad9;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp
index c32ceab8a..345efbe07 100644
--- a/src/XGUI/XGUI_ViewerProxy.cpp
+++ b/src/XGUI/XGUI_ViewerProxy.cpp
@@ -47,11 +47,12 @@ 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.);
   }
@@ -105,10 +106,11 @@ void XGUI_ViewerProxy::connectToViewer()
       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*)));
-
-    // TODO: Connect to ViewTransformation signal
   } else {
     AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
 
@@ -168,6 +170,8 @@ void XGUI_ViewerProxy::onTryCloseView(AppElements_ViewWindow* theWnd)
 
 void XGUI_ViewerProxy::onDeleteView(AppElements_ViewWindow* theWnd)
 {
+  if (myWindowScale.contains(theWnd->v3dView()))
+    myWindowScale.remove (theWnd->v3dView());
   emit deleteView(theWnd);
 }
 
@@ -175,6 +179,8 @@ void XGUI_ViewerProxy::onViewCreated(ModuleBase_IViewWindow* theWnd)
 {
   theWnd->viewPort()->installEventFilter(this);
 
+  myWindowScale.insert (theWnd->v3dView(), theWnd->v3dView()->Camera()->Scale());
+
   emit viewCreated(theWnd);
 }
 
@@ -185,6 +191,8 @@ void XGUI_ViewerProxy::onViewCreated(AppElements_ViewWindow* theWnd)
   connect(theWnd, SIGNAL(vpTransformationFinished(AppElements_ViewWindow::OperationType)),
     this, SLOT(onViewTransformed(AppElements_ViewWindow::OperationType)));
 
+  myWindowScale.insert (theWnd->v3dView(), theWnd->v3dView()->Camera()->Scale());
+
   emit viewCreated(theWnd);
 }
 
@@ -277,6 +285,12 @@ void XGUI_ViewerProxy::removeSelectionFilter(const Handle(SelectMgr_Filter)& the
   myWorkshop->displayer()->removeSelectionFilter(theFilter);
 }
 
+//***************************************
+bool XGUI_ViewerProxy::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+{
+  return myWorkshop->displayer()->hasSelectionFilter(theFilter);
+}
+
 //***************************************
 void XGUI_ViewerProxy::clearSelectionFilters()
 {
@@ -300,7 +314,22 @@ bool XGUI_ViewerProxy::canDragByMouse() const
   }
 }
 
+//***************************************
 void XGUI_ViewerProxy::onViewTransformed(AppElements_ViewWindow::OperationType theType)
 {
   emit viewTransformed((int) theType);
+}
+
+
+//***************************************
+void XGUI_ViewerProxy::Zfitall()
+{
+  if (myWorkshop->isSalomeMode()) {
+    myWorkshop->salomeConnector()->viewer()->Zfitall();
+  } else {
+    AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
+    AppElements_ViewWindow* aView = aViewer->activeViewWindow();
+    if (aView)
+      aView->v3dView()->ZFitAll();
+  }
 }
\ No newline at end of file