X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FXGUI%2FXGUI_ViewerProxy.cpp;h=788a0d906ec07a474aaa51c330f69b53264117e3;hb=57199135053dfe0636ff8ff29eb6c75a6df6f08d;hp=b18cff14aec60199dbfc2dd097653f174c83ba1b;hpb=0a906e22a06cca8064975af0b14fcff711d5fa4a;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ViewerProxy.cpp b/src/XGUI/XGUI_ViewerProxy.cpp index b18cff14a..788a0d906 100644 --- a/src/XGUI/XGUI_ViewerProxy.cpp +++ b/src/XGUI/XGUI_ViewerProxy.cpp @@ -1,14 +1,36 @@ -// 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 +// #include "XGUI_ViewerProxy.h" #include "XGUI_Workshop.h" #include "XGUI_SalomeConnector.h" #include "XGUI_Displayer.h" -#include -#include -#include -#include +#ifndef HAVE_SALOME + #include + #include + #include + #include +#endif + +#include #include @@ -18,33 +40,67 @@ 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 + 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 { - AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer(); - return (aViewer->activeViewWindow()) ? aViewer->activeViewWindow()->viewPortApp()->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 +} + +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) @@ -53,104 +109,113 @@ void XGUI_ViewerProxy::setViewProjection(double theX, double theY, double theZ, if (!aView3d.IsNull()) { aView3d->SetProj(theX, theY, theZ); aView3d->SetTwist( theTwist ); - aView3d->FitAll(0.01, true); + aView3d->FitAll(0.01, false); aView3d->SetZSize(0.); - aView3d->DepthFitAll(); + if (aView3d->Depth() < 0.1) + aView3d->DepthFitAll(); } } void XGUI_ViewerProxy::fitAll() { - if (myWorkshop->isSalomeMode()) { - myWorkshop->salomeConnector()->viewer()->fitAll(); - } else { - AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer(); - if (aViewer->activeViewWindow()) - aViewer->activeViewWindow()->viewPortApp()->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::eraseAll() +{ +#ifdef HAVE_SALOME + myWorkshop->salomeConnector()->viewer()->eraseAll(); +#else +#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(ModuleBase_IViewWindow*)), - this, SIGNAL(tryCloseView(ModuleBase_IViewWindow*))); + connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed())); + connect(aViewer, SIGNAL(tryCloseView(ModuleBase_IViewWindow*)), + this, SIGNAL(tryCloseView(ModuleBase_IViewWindow*))); - connect(aViewer, SIGNAL(deleteView(ModuleBase_IViewWindow*)), - this, SIGNAL(deleteView(ModuleBase_IViewWindow*))); + connect(aViewer, SIGNAL(deleteView(ModuleBase_IViewWindow*)), + this, SIGNAL(deleteView(ModuleBase_IViewWindow*))); - connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)), - this, SLOT(onViewCreated(ModuleBase_IViewWindow*))); + connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)), + this, SLOT(onViewCreated(ModuleBase_IViewWindow*))); - connect(aViewer, SIGNAL(activated(ModuleBase_IViewWindow*)), - this, SIGNAL(activated(ModuleBase_IViewWindow*))); + connect(aViewer, SIGNAL(activated(ModuleBase_IViewWindow*)), + this, SIGNAL(activated(ModuleBase_IViewWindow*))); - connect(aViewer, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)), - this, 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*)), - this, 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(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*)), this, + SIGNAL(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*))); - connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)), - this, 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*)), - this, 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*)), - this, 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(selectionChanged()), this, SIGNAL(selectionChanged())); - connect(aViewer, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this, - SIGNAL(contextMenuRequested(QContextMenuEvent*))); - } else { - AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer(); + connect(aViewer, SIGNAL(viewTransformed(int)), this, SIGNAL(viewTransformed(int))); - connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed())); + connect(aViewer, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this, + SIGNAL(contextMenuRequested(QContextMenuEvent*))); +#else + AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer(); - connect(aViewer, SIGNAL(tryCloseView(AppElements_ViewWindow*)), - this, SLOT(onTryCloseView(AppElements_ViewWindow*))); + connect(aViewer, SIGNAL(lastViewClosed()), this, SIGNAL(lastViewClosed())); - connect(aViewer, SIGNAL(deleteView(AppElements_ViewWindow*)), - this, SLOT(onDeleteView(AppElements_ViewWindow*))); + connect(aViewer, SIGNAL(tryCloseView(AppElements_ViewWindow*)), + this, SLOT(onTryCloseView(AppElements_ViewWindow*))); - connect(aViewer, SIGNAL(viewCreated(AppElements_ViewWindow*)), - this, SLOT(onViewCreated(AppElements_ViewWindow*))); + connect(aViewer, SIGNAL(deleteView(AppElements_ViewWindow*)), + this, SLOT(onDeleteView(AppElements_ViewWindow*))); - connect(aViewer, SIGNAL(activated(AppElements_ViewWindow*)), - this, SLOT(onActivated(AppElements_ViewWindow*))); + connect(aViewer, SIGNAL(viewCreated(AppElements_ViewWindow*)), + this, SLOT(onViewCreated(AppElements_ViewWindow*))); - connect(aViewer, SIGNAL(mousePress(AppElements_ViewWindow*, QMouseEvent*)), this, - SLOT(onMousePress(AppElements_ViewWindow*, QMouseEvent*))); + connect(aViewer, SIGNAL(activated(AppElements_ViewWindow*)), + this, SLOT(onActivated(AppElements_ViewWindow*))); - connect(aViewer, SIGNAL(mouseRelease(AppElements_ViewWindow*, QMouseEvent*)), this, - SLOT(onMouseRelease(AppElements_ViewWindow*, QMouseEvent*))); + connect(aViewer, SIGNAL(mousePress(AppElements_ViewWindow*, QMouseEvent*)), this, + SLOT(onMousePress(AppElements_ViewWindow*, QMouseEvent*))); - connect(aViewer, SIGNAL(mouseDoubleClick(AppElements_ViewWindow*, QMouseEvent*)), this, - SLOT(onMouseDoubleClick(AppElements_ViewWindow*, QMouseEvent*))); + connect(aViewer, SIGNAL(mouseRelease(AppElements_ViewWindow*, QMouseEvent*)), this, + SLOT(onMouseRelease(AppElements_ViewWindow*, QMouseEvent*))); - connect(aViewer, SIGNAL(mouseMove(AppElements_ViewWindow*, QMouseEvent*)), this, - SLOT(onMouseMove(AppElements_ViewWindow*, QMouseEvent*))); + connect(aViewer, SIGNAL(mouseDoubleClick(AppElements_ViewWindow*, QMouseEvent*)), this, + SLOT(onMouseDoubleClick(AppElements_ViewWindow*, QMouseEvent*))); - connect(aViewer, SIGNAL(keyPress(AppElements_ViewWindow*, QKeyEvent*)), this, - SLOT(onKeyPress(AppElements_ViewWindow*, QKeyEvent*))); + connect(aViewer, SIGNAL(mouseMove(AppElements_ViewWindow*, QMouseEvent*)), this, + SLOT(onMouseMove(AppElements_ViewWindow*, QMouseEvent*))); - connect(aViewer, SIGNAL(keyRelease(AppElements_ViewWindow*, QKeyEvent*)), this, - SLOT(onKeyRelease(AppElements_ViewWindow*, QKeyEvent*))); + connect(aViewer, SIGNAL(keyPress(AppElements_ViewWindow*, QKeyEvent*)), this, + SLOT(onKeyPress(AppElements_ViewWindow*, QKeyEvent*))); - connect(aViewer, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged())); - connect(aViewer, SIGNAL(contextMenuRequested(QContextMenuEvent*)), this, - SIGNAL(contextMenuRequested(QContextMenuEvent*))); - } + 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) @@ -164,6 +229,16 @@ bool XGUI_ViewerProxy::eventFilter(QObject *theObject, QEvent *theEvent) return ModuleBase_IViewer::eventFilter(theObject, theEvent); } +void XGUI_ViewerProxy::onViewCreated(ModuleBase_IViewWindow* theWnd) +{ + 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); @@ -176,15 +251,6 @@ void XGUI_ViewerProxy::onDeleteView(AppElements_ViewWindow* theWnd) emit deleteView(theWnd); } -void XGUI_ViewerProxy::onViewCreated(ModuleBase_IViewWindow* theWnd) -{ - theWnd->viewPort()->installEventFilter(this); - - myWindowScale.insert (theWnd->v3dView(), theWnd->v3dView()->Camera()->Scale()); - - emit viewCreated(theWnd); -} - void XGUI_ViewerProxy::onViewCreated(AppElements_ViewWindow* theWnd) { theWnd->viewPort()->installEventFilter(this); @@ -232,46 +298,62 @@ void XGUI_ViewerProxy::onKeyRelease(AppElements_ViewWindow* theWnd, QKeyEvent* t 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 { - if (myWorkshop->isSalomeMode()) { - return myWorkshop->salomeConnector()->viewer()->isMultiSelectionEnabled(); - } else { - return myWorkshop->mainWindow()->viewer()->isMultiSelectionEnabled(); - } +#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 } //*************************************** @@ -315,24 +397,20 @@ 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(); - aView->v3dView()->DepthFitAll(); - } - } -} \ 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