#include <QMdiArea>
#include <QMdiSubWindow>
#include <QApplication>
+#include <QMouseEvent>
+#include <QMenu>
#include <V3d_View.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <AIS_Shape.hxx>
-#include <QMouseEvent>
#ifdef WIN32
#include <WNT_Window.hxx>
connect(aWindow, SIGNAL(keyReleased(XGUI_ViewWindow*, QKeyEvent*)),
this, SIGNAL(keyRelease(XGUI_ViewWindow*, QKeyEvent*)));
- //connect(aWindow, SIGNAL(contextMenuRequested( QContextMenuEvent* )),
- // this, SLOT (onContextMenuRequested( QContextMenuEvent* )));
+ connect(aWindow, SIGNAL(contextMenuRequested( QContextMenuEvent* )),
+ this, SLOT (onContextMenuRequested( QContextMenuEvent* )));
//connect(aWindow, SIGNAL( contextMenuRequested(QContextMenuEvent*) ),
// this, SIGNAL( contextMenuRequested(QContextMenuEvent*) ) );
*/
void XGUI_Viewer::onMouseReleased(XGUI_ViewWindow* theWindow, QMouseEvent* theEvent)
{
- if (!mySelectionEnabled) return;
- if (theEvent->button() != Qt::LeftButton) return;
+ if (!mySelectionEnabled || theEvent->button() != Qt::LeftButton) {
+ emit mouseRelease(theWindow, theEvent);
+ return;
+ }
myEndPnt.setX(theEvent->x()); myEndPnt.setY(theEvent->y());
bool aHasShift = (theEvent->modifiers() & Qt::ShiftModifier);
// emit deselection();
if (myStartPnt == myEndPnt) {
+ // the MoveTo is necessary for the second click in the same point. Otherwise the selection is lost.
+ Handle(V3d_View) aView3d = theWindow->viewPort()->getView();
+ if ( !aView3d.IsNull() ) {
+ myAISContext->MoveTo(theEvent->x(), theEvent->y(), aView3d);
+ }
if (aHasShift && myMultiSelectionEnabled)
myAISContext->ShiftSelect();
else
aView->updateEnabledDrawMode();
}
}
+
+//******************************************************
+void XGUI_Viewer::onContextMenuRequested(QContextMenuEvent* theEvent)
+{
+ XGUI_ViewWindow* aWnd = dynamic_cast<XGUI_ViewWindow*>(sender());
+ if (!aWnd) return;
+
+ QMenu aMenu;
+
+ // Include Viewer actions
+ if (myActions.size() > 0) {
+ aMenu.addActions(myActions);
+ aMenu.addSeparator();
+ }
+ if (aWnd->actions().size() > 0) {
+ aMenu.addActions(aWnd->actions());
+ aMenu.addSeparator();
+ }
+
+ QMdiArea* aMDI = myMainWindow->mdiArea();
+ if (aMenu.actions().size() > 0) {
+ QMenu* aSubMenu = aMenu.addMenu(tr("Windows"));
+ aSubMenu->addActions(aMDI->actions());
+ } else {
+ aMenu.addActions(aMDI->actions());
+ }
+ aMenu.exec(theEvent->globalPos());
+}
\ No newline at end of file