Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

[modules/shaper.git] / src / XGUI / XGUI_Viewer.cpp

diff --git a/src/XGUI/XGUI_Viewer.cpp b/src/XGUI/XGUI_Viewer.cpp
index 12eae6e4a4e550a648a410585fedb08536ae2803..734a1a469e48ab9ff6bbed1d29a8302e6c63ab13 100644 (file)
--- a/src/XGUI/XGUI_Viewer.cpp
+++ b/src/XGUI/XGUI_Viewer.cpp
@@ -6,6 +6,8 @@
 #include <QMdiArea>
 #include <QMdiSubWindow>
 #include <QApplication>
+#include <QMouseEvent>
+#include <QMenu>
 
 #include <V3d_View.hxx>
 
@@ -22,7 +24,6 @@
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <AIS_Shape.hxx>
 
-#include <QMouseEvent>
 
 #ifdef WIN32
 #include <WNT_Window.hxx>
@@ -443,8 +444,8 @@ void XGUI_Viewer::addView(QMdiSubWindow* theView)
     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*) ) );
 
@@ -519,8 +520,10 @@ void XGUI_Viewer::onMouseMove(XGUI_ViewWindow* theWindow, QMouseEvent* theEvent)
 */
 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);
@@ -529,6 +532,11 @@ void XGUI_Viewer::onMouseReleased(XGUI_ViewWindow* theWindow, QMouseEvent* theEv
   //  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
@@ -581,3 +589,31 @@ void XGUI_Viewer::updateViewsDrawMode() const
     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