Changeset 1333 for trunk

Timestamp:

Aug 19, 2010, 5:33:35 PM (14 years ago)

Author:

garnier

Message:

shorcuts better implementation, Mouse move volume follow mouse position

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (1 diff)
• include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• src/G4OpenGLQtViewer.cc (modified) (14 diffs)

trunk/source/visualization/OpenGL/History

@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+19th August 2010  Laurent Garnier
+- Better way to hold Meta Keys and shortcuts
 
 23th June 2010  Laurent Garnier

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -120 +120 @@
   void moveScene(float, float, float,bool);
   void FinishView();
+#if QT_VERSION < 0x040000
+  void updateKeyModifierState(Qt::ButtonState);
+#else
+  void updateKeyModifierState(Qt::KeyboardModifiers);
+#endif
 
 
@@ -202 +207 @@
   G4double fXRot;
   G4double fYRot;
+  bool fNoKeyPress;
+  bool fAltKeyPress;
+  bool fControlKeyPress;
+  bool fShiftKeyPress;
 
 signals:

trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -244 +244 @@
   ,fXRot(0)
   ,fYRot(0)
+  ,fNoKeyPress(true)
+  ,fAltKeyPress(false)
+  ,fControlKeyPress(false)
+  ,fShiftKeyPress(false)
 {
 
@@ -950 +954 @@
  */
 void G4OpenGLQtViewer::showShortcuts() {
+  G4cout << "========= Mouse Shortcuts =========" << G4endl;
   if (fMouseAction == STYLE1) {  // rotate
     G4cout << "Click and move mouse to rotate volume " << G4endl;
+    G4cout << "ALT + Click and move mouse to rotate volume (View Direction)" << G4endl;
+    G4cout << "CTRL + Click and zoom mouse to zoom in/out" << G4endl;
+    G4cout << "SHIFT + Click and zoommove camera point of view" << G4endl;
   } else  if (fMouseAction == STYLE2) { //move
     G4cout << "Move camera point of view with mouse" << G4endl;
@@ -1228 +1236 @@
   SetNeedKernelVisit (true);
   updateQWidget();
-
 }
 
@@ -1446 +1453 @@
 {
 #if QT_VERSION < 0x040000
-  if ((event->button() & Qt::LeftButton)
-      && !((event->state() & Qt::ShiftButton)
-           || (event->state() & Qt::ControlButton)
-           || (event->state() & Qt::AltButton)
-           || (event->state() & Qt::MetaButton))) {
-#else
-  if ((event->buttons() & Qt::LeftButton)
-      && !((event->modifiers() & Qt::ShiftModifier)
-           || (event->modifiers() & Qt::ControlModifier)
-           || (event->modifiers() & Qt::AltModifier)
-           || (event->modifiers() & Qt::MetaModifier))) {
+  if (event->button() & Qt::LeftButton) {
+#else
+  if (event->buttons() & Qt::LeftButton) {
 #endif
     fWindow->setMouseTracking(true);
@@ -1495 +1494 @@
           }
         }
-      if (((((float)delta.y())/correctionFactor)*lTime > fNbMaxAnglePerSec) ||
-          ((((float)delta.y())/correctionFactor)*lTime < -fNbMaxAnglePerSec) ) {
+        if (((((float)delta.y())/correctionFactor)*lTime > fNbMaxAnglePerSec) ||
+            ((((float)delta.y())/correctionFactor)*lTime < -fNbMaxAnglePerSec) ) {
           correctionFactor = (float)delta.y()*(lTime/fNbMaxAnglePerSec);
           if (delta.y() <0 ) {
@@ -1502 +1501 @@
           }
         }
+                
+        // Check Qt Versions for META Keys
+                
+        // Click and move mouse to rotate volume
+        // ALT + Click and move mouse to rotate volume (View Direction)
+        // SHIFT + Click and move camera point of view
+        // CTRL + Click and zoom mouse to zoom in/out
 
         if (fMouseAction == STYLE1) {  // rotate
-          rotateQtScene(((float)delta.x())/correctionFactor,((float)delta.y())/correctionFactor);
+#ifdef G4DEBUG_VIS_OGL
+          printf("G4OpenGLQtViewer:: ___________________________________\n");
+          printf("G4OpenGLQtViewer:: mouse move\n");
+#endif
+          if (fNoKeyPress) {
+#ifdef G4DEBUG_VIS_OGL
+            printf("G4OpenGLQtViewer:: rotate normal\n");
+#endif
+            rotateQtScene(((float)delta.x())/correctionFactor,((float)delta.y())/correctionFactor);
+          } else if (fAltKeyPress) {
+#ifdef G4DEBUG_VIS_OGL
+            printf("G4OpenGLQtViewer:: rotate view\n");
+#endif
+            rotateQtSceneInViewDirection(((float)delta.x())/correctionFactor,((float)delta.y())/correctionFactor);
+          }
+          
         } else if (fMouseAction == STYLE2) {  // move
           moveScene(-((float)delta.x())/correctionFactor,-((float)delta.y())/correctionFactor,0,true);
@@ -1543 +1564 @@
 #endif
 
+#if QT_VERSION < 0x040000
+  updateKeyModifierState(event->state());
+#else
+  updateKeyModifierState(event->modifiers());
+#endif
+
   if (fAutoMove) {
     return;
@@ -1556 +1583 @@
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
-      rotateQtScene(deltaX,deltaY);
+#ifdef G4DEBUG_VIS_OGL
+      printf("G4OpenGLQtViewer:: ___________________________________\n");
+      printf("G4OpenGLQtViewer:: mouse move %f %f\n",((float)deltaX),((float)deltaY));
+#endif
+      if (fNoKeyPress) {
+#ifdef G4DEBUG_VIS_OGL
+        printf("G4OpenGLQtViewer:: rotate normal\n");
+#endif
+        rotateQtScene(((float)deltaX),((float)deltaY));
+      } else if (fAltKeyPress) {
+#ifdef G4DEBUG_VIS_OGL
+        printf("G4OpenGLQtViewer:: rotate view\n");
+#endif
+        rotateQtSceneInViewDirection(((float)deltaX),((float)deltaY));
+      } else if (fShiftKeyPress) {
+        unsigned int sizeWin;
+        sizeWin = getWinWidth();
+        if (getWinHeight() < getWinWidth()) {
+          sizeWin = getWinHeight();
+        }
+
+        // L.Garnier : 08/2010 100 is the good value, but don't ask me why !
+        float factor = ((float)100/(float)sizeWin) ;
+        moveScene(-(float)deltaX*factor,-(float)deltaY*factor,0,false);
+      } else if (fControlKeyPress) {
+#ifdef G4DEBUG_VIS_OGL
+        printf("G4OpenGLQtViewer:: zoom\n");
+#endif
+        fVP.SetZoomFactor(fVP.GetZoomFactor()*(1+((float)deltaY))); 
+      }
     }
   } else if (fMouseAction == STYLE2) {  // move
@@ -1814 +1870 @@
 
 
-void G4OpenGLQtViewer::G4keyPressEvent (QKeyEvent * event) 
+ void G4OpenGLQtViewer::G4keyPressEvent (QKeyEvent * event) 
 {
   if (fHoldKeyEvent)
@@ -1821 +1877 @@
   fHoldKeyEvent = true;
 
-  bool NothingPress = false;
-  bool AltPress = false;
-  bool ControlPress = false;
-  bool ShiftPress = false;
-
-  // Check Qt Versions for META Keys
-
-#if QT_VERSION < 0x040000
-  if (event->state() & Qt::NoButton ) {
-        NothingPress = true;
-  }
-  if (event->state() & Qt::AltButton ) {
-        AltPress = true;
-  }
-  if (event->state() & Qt::ShiftButton ) {
-        ShiftPress = true;
-  }
-  if (event->state() & Qt::ControlButton ) {
-        ControlPress = true;
-  }
-#else
-  if (event->modifiers() & Qt::NoModifier ) {
-    NothingPress = true;
-  }
-  if (event->modifiers() & Qt::AltModifier ) {
-    AltPress = true;
-  }
-  if (event->modifiers() & Qt::ShiftModifier ) {
-    ShiftPress = true;
-  }
-  if (event->modifiers() & Qt::ControlModifier ) {
-    ControlPress = true;
-  }
-#endif
-
+  
   // with no modifiers
 #if QT_VERSION < 0x040000
-  if (NothingPress) {
-#else
-  if ((NothingPress) || (event->modifiers() == Qt::KeypadModifier )) {
+  updateKeyModifierState(event->state());
+  if (fNoKeyPress) {
+#else
+  updateKeyModifierState(event->modifiers());
+  if ((fNoKeyPress) || (event->modifiers() == Qt::KeypadModifier )) {
 #endif
     if (event->key() == Qt::Key_Down) { // go down
@@ -1917 +1941 @@
 
   // Shift Modifier
-  if (ShiftPress) {
+  if (fShiftKeyPress) {
     if (event->key() == Qt::Key_Down) { // rotate phi
       rotateQtScene(0,-fDeltaRotation);
@@ -1933 +1957 @@
   // Alt Modifier
   }
-  if ((AltPress)) {
+  if ((fAltKeyPress)) {
     if (event->key() == Qt::Key_Down) { // rotate phi
       rotateQtSceneInViewDirection(0,-fDeltaRotation);
@@ -1959 +1983 @@
   // Control Modifier OR Command on MAC
   }
-  if ((ControlPress)) {
+  if ((fControlKeyPress)) {
     if (event->key() == Qt::Key_Plus) {
       fVP.SetZoomFactor(fVP.GetZoomFactor()*(1+fDeltaZoom)); 
@@ -1973 +1997 @@
 }
   
+
+#if QT_VERSION < 0x040000
+void  G4OpenGLQtViewer::updateKeyModifierState(Qt::ButtonState modifier) {
+#else
+void  G4OpenGLQtViewer::updateKeyModifierState(Qt::KeyboardModifiers modifier) {
+#endif
+  // Check Qt Versions for META Keys
+    
+  fNoKeyPress = true;
+  fAltKeyPress = false;
+  fShiftKeyPress = false;
+  fControlKeyPress = false;
+  
+#if QT_VERSION < 0x040000
+  if (modifier & Qt::AltButton ) {
+    fAltKeyPress = true;
+    fNoKeyPress = false;
+  }
+  if (modifier & Qt::ShiftButton ) {
+    fShiftKeyPress = true;
+    fNoKeyPress = false;
+  }
+  if (modifier & Qt::ControlButton ) {
+    fControlKeyPress = true;
+    fNoKeyPress = false;
+  }
+#else
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLQtViewer:: ________________Key Press\n");
+#endif
+  if (modifier & Qt::AltModifier ) {
+    fAltKeyPress = true;
+    fNoKeyPress = false;
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer:: ________________ALT\n");
+#endif
+  }
+  if (modifier & Qt::ShiftModifier ) {
+    fShiftKeyPress = true;
+    fNoKeyPress = false;
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer:: ________________Shift\n");
+#endif
+  }
+  if (modifier & Qt::ControlModifier ) {
+    fControlKeyPress = true;
+    fNoKeyPress = false;
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer:: ________________Control\n");
+#endif
+  }
+#endif
+}
+
 
 /** Stop the video. Check all parameters and enable encoder button if all is ok.