Merge branch 'master' of newgeom:newgeom

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

diff --git a/src/XGUI/XGUI_Viewer.cpp b/src/XGUI/XGUI_Viewer.cpp
index 0d93d6cc04f8eeee6f995deb253278f79ac49eb9..20436bfbd30681390e053b80b3ec287c44d053c1 100644 (file)
--- a/src/XGUI/XGUI_Viewer.cpp
+++ b/src/XGUI/XGUI_Viewer.cpp
@@ -190,6 +190,10 @@ QMdiSubWindow* XGUI_Viewer::createView(V3d_TypeOfView theType)
   return aWnd;
 }
 
+XGUI_ViewWindow* XGUI_Viewer::activeViewWindow() const
+{
+  return dynamic_cast<XGUI_ViewWindow*>(myActiveView->widget());
+}
 
 void XGUI_Viewer::getSelectedObjects(AIS_ListOfInteractive& theList)
 {
@@ -451,7 +455,6 @@ void XGUI_Viewer::addView(QMdiSubWindow* theView)
 
 //    connect(aWindow, SIGNAL(contextMenuRequested( QContextMenuEvent* )),
 //            this,    SLOT  (onContextMenuRequested( QContextMenuEvent* )));
-
     connect(aWindow, SIGNAL(mouseMoving(XGUI_ViewWindow*, QMouseEvent*)),
             this, SLOT(onMouseMove(XGUI_ViewWindow*, QMouseEvent*)));
 
@@ -494,16 +497,27 @@ void XGUI_Viewer::onWindowMinimized(QMdiSubWindow* theWnd)
   }
 }
 
+/*!
+  SLOT: called on mouse button press, stores current mouse position as start point for transformations
+*/
+void XGUI_Viewer::onMousePressed(XGUI_ViewWindow* theWindow, QMouseEvent* theEvent)
+{
+  myStartPnt.setX(theEvent->x()); myStartPnt.setY(theEvent->y());
+  emit mousePress(theWindow, theEvent);
+}
+
 /*!
   SLOT: called on mouse move, processes hilighting
 */
 void XGUI_Viewer::onMouseMove(XGUI_ViewWindow* theWindow, QMouseEvent* theEvent)
 {
-  XGUI_ViewPort* aViewPort = theWindow->viewPort();
-  Handle(V3d_View) aView3d = aViewPort->getView();
+  if (!mySelectionEnabled) return;
 
-  if ( !aView3d.IsNull() )
+  myCurPnt.setX(theEvent->x()); myCurPnt.setY(theEvent->y());
+  Handle(V3d_View) aView3d = theWindow->viewPort()->getView();
+  if ( !aView3d.IsNull() ) {
     myAISContext->MoveTo(theEvent->x(), theEvent->y(), aView3d);
+  }
 }
 
 /*!
@@ -511,7 +525,41 @@ void XGUI_Viewer::onMouseMove(XGUI_ViewWindow* theWindow, QMouseEvent* theEvent)
 */
 void XGUI_Viewer::onMouseReleased(XGUI_ViewWindow* theWindow, QMouseEvent* theEvent)
 {
-  myAISContext->Select();
+  if (!mySelectionEnabled) return;
+  if (theEvent->button() != Qt::LeftButton) return;
+
+  myEndPnt.setX(theEvent->x()); myEndPnt.setY(theEvent->y());
+  bool aHasShift = (theEvent->modifiers() & Qt::ShiftModifier);
+  
+  //if (!aHasShift) 
+  //  emit deselection();
+
+  if (myStartPnt == myEndPnt) {
+    if (aHasShift && myMultiSelectionEnabled)
+      myAISContext->ShiftSelect();
+    else
+      myAISContext->Select();
+  } else {
+    if (aHasShift && myMultiSelectionEnabled)
+      myAISContext->ShiftSelect(myStartPnt.x(), myStartPnt.y(),
+                                myEndPnt.x(), myEndPnt.y(),
+                                theWindow->viewPort()->getView(), false );
+    else
+      myAISContext->Select(myStartPnt.x(), myStartPnt.y(),
+                           myEndPnt.x(), myEndPnt.y(),
+                           theWindow->viewPort()->getView(), false );
+
+    int Nb = myAISContext->NbSelected();
+    if( Nb>1 && !myMultiSelectionEnabled ) {
+      myAISContext->InitSelected();
+      Handle( SelectMgr_EntityOwner ) anOwner = myAISContext->SelectedOwner();
+      if( !anOwner.IsNull() ) {
+        myAISContext->ClearSelected( Standard_False );
+        myAISContext->AddOrRemoveSelected( anOwner, Standard_False );
+      }
+    }
 
+    myAISContext->UpdateCurrentViewer();
+  }
   emit selectionChanged();
 }