-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
#include "XGUI_ViewerProxy.h"
#include "XGUI_Workshop.h"
#include <AppElements_ViewWindow.h>
#include <AppElements_Viewer.h>
#endif
-
+
#include <ModuleBase_IViewWindow.h>
#include <QEvent>
SIGNAL(trihedronVisibilityChanged(bool)));
#else
connect(myWorkshop->mainWindow()->viewer(), SIGNAL(trihedronVisibilityChanged(bool)),
- SLOT(trihedronVisibilityChanged(bool)));
+ SIGNAL(trihedronVisibilityChanged(bool)));
#endif
}
Handle(AIS_InteractiveContext) XGUI_ViewerProxy::AISContext() const
{
+ Handle(AIS_InteractiveContext) aContext;
#ifdef HAVE_SALOME
- return myWorkshop->salomeConnector()->viewer()->AISContext();
+ aContext = myWorkshop->salomeConnector()->viewer()->AISContext();
#else
- return myWorkshop->mainWindow()->viewer()->AISContext();
+ aContext = myWorkshop->mainWindow()->viewer()->AISContext();
#endif
+ return aContext;
}
Handle(AIS_Trihedron) XGUI_ViewerProxy::trihedron() const
return myWorkshop->salomeConnector()->viewer()->activeView();
#else
AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
- return (aViewer->activeViewWindow()) ?
+ return (aViewer->activeViewWindow()) ?
aViewer->activeViewWindow()->viewPortApp()->getView() :
Handle(V3d_View)();
#endif
return myWorkshop->salomeConnector()->viewer()->activeViewPort();
#else
AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
- return (aViewer->activeViewWindow()) ?
+ return (aViewer->activeViewWindow()) ?
aViewer->activeViewWindow()->viewPortApp(): 0;
#endif
}
#endif
}
+void XGUI_ViewerProxy::eraseAll()
+{
+#ifdef HAVE_SALOME
+ myWorkshop->salomeConnector()->viewer()->eraseAll();
+#else
+#endif
+}
+
void XGUI_ViewerProxy::connectToViewer()
{
#ifdef HAVE_SALOME
ModuleBase_IViewer* aViewer = myWorkshop->salomeConnector()->viewer();
connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed()));
- connect(aViewer, SIGNAL(tryCloseView(ModuleBase_IViewWindow*)),
+ connect(aViewer, SIGNAL(tryCloseView(ModuleBase_IViewWindow*)),
this, SIGNAL(tryCloseView(ModuleBase_IViewWindow*)));
- connect(aViewer, SIGNAL(deleteView(ModuleBase_IViewWindow*)),
+ connect(aViewer, SIGNAL(deleteView(ModuleBase_IViewWindow*)),
this, SIGNAL(deleteView(ModuleBase_IViewWindow*)));
- connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)),
+ connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)),
this, SLOT(onViewCreated(ModuleBase_IViewWindow*)));
- connect(aViewer, SIGNAL(activated(ModuleBase_IViewWindow*)),
+ connect(aViewer, SIGNAL(activated(ModuleBase_IViewWindow*)),
this, SIGNAL(activated(ModuleBase_IViewWindow*)));
- connect(aViewer, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)),
+ connect(aViewer, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)));
- connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
+ connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)));
connect(aViewer, SIGNAL(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*)), this,
SIGNAL(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*)));
- connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
+ connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)),
this, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)));
- connect(aViewer, SIGNAL(keyPress(ModuleBase_IViewWindow*, QKeyEvent*)),
+ connect(aViewer, SIGNAL(keyPress(ModuleBase_IViewWindow*, QKeyEvent*)),
this, SIGNAL(keyPress(ModuleBase_IViewWindow*, QKeyEvent*)));
- connect(aViewer, SIGNAL(keyRelease(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,
connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed()));
- connect(aViewer, SIGNAL(tryCloseView(AppElements_ViewWindow*)),
+ connect(aViewer, SIGNAL(tryCloseView(AppElements_ViewWindow*)),
this, SLOT(onTryCloseView(AppElements_ViewWindow*)));
- connect(aViewer, SIGNAL(deleteView(AppElements_ViewWindow*)),
+ connect(aViewer, SIGNAL(deleteView(AppElements_ViewWindow*)),
this, SLOT(onDeleteView(AppElements_ViewWindow*)));
- connect(aViewer, SIGNAL(viewCreated(AppElements_ViewWindow*)),
+ connect(aViewer, SIGNAL(viewCreated(AppElements_ViewWindow*)),
this, SLOT(onViewCreated(AppElements_ViewWindow*)));
- connect(aViewer, SIGNAL(activated(AppElements_ViewWindow*)),
+ connect(aViewer, SIGNAL(activated(AppElements_ViewWindow*)),
this, SLOT(onActivated(AppElements_ViewWindow*)));
connect(aViewer, SIGNAL(mousePress(AppElements_ViewWindow*, QMouseEvent*)), this,
//***************************************
-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
+//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