#include <AppElements_ViewWindow.h>
#include <AppElements_Viewer.h>
+#include <QEvent>
+
XGUI_ViewerProxy::XGUI_ViewerProxy(XGUI_Workshop* theParent)
: ModuleBase_IViewer(theParent),
myWorkshop(theParent)
return myWorkshop->salomeConnector()->viewer()->activeView();
} else {
AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
- return (aViewer->activeViewWindow()) ? aViewer->activeViewWindow()->viewPort()->getView() :
+ return (aViewer->activeViewWindow()) ? aViewer->activeViewWindow()->viewPortApp()->getView() :
Handle(V3d_View)();
}
}
-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.);
}
} else {
AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer();
if (aViewer->activeViewWindow())
- aViewer->activeViewWindow()->viewPort()->fitAll();
+ aViewer->activeViewWindow()->viewPortApp()->fitAll();
}
}
this, SIGNAL(deleteView(ModuleBase_IViewWindow*)));
connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)),
- this, SIGNAL(viewCreated(ModuleBase_IViewWindow*)));
+ this, SLOT(onViewCreated(ModuleBase_IViewWindow*)));
connect(aViewer, SIGNAL(activated(ModuleBase_IViewWindow*)),
this, SIGNAL(activated(ModuleBase_IViewWindow*)));
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();
}
}
+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::onTryCloseView(AppElements_ViewWindow* theWnd)
{
void XGUI_ViewerProxy::onDeleteView(AppElements_ViewWindow* theWnd)
{
+ if (myWindowScale.contains(theWnd->v3dView()))
+ myWindowScale.remove (theWnd->v3dView());
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);
+
+ connect(theWnd, SIGNAL(vpTransformationFinished(AppElements_ViewWindow::OperationType)),
+ this, SLOT(onViewTransformed(AppElements_ViewWindow::OperationType)));
+
+ myWindowScale.insert (theWnd->v3dView(), theWnd->v3dView()->Camera()->Scale());
+
emit viewCreated(theWnd);
}
myWorkshop->displayer()->removeSelectionFilter(theFilter);
}
+//***************************************
+bool XGUI_ViewerProxy::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
+{
+ return myWorkshop->displayer()->hasSelectionFilter(theFilter);
+}
+
//***************************************
void XGUI_ViewerProxy::clearSelectionFilters()
{
} else {
return true;
}
+}
+
+//***************************************
+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