Changeset 720 for trunk

Timestamp:

Feb 11, 2008, 2:49:22 PM (16 years ago)

Author:

garnier

Message:

ajout de rotation et deplacement automatiques

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (4 diffs)
• src/G4OpenGLQtViewer.cc (modified) (15 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (3 diffs)

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

@@ -76 +76 @@
   virtual void CreateMainWindow (QGLWidget*);
   void manageContextMenuEvent(QContextMenuEvent *e);
-  void G4MousePressEvent(QPoint);
-  void G4MouseReleaseEvent(QPoint p);
+#if QT_VERSION < 0x040000
+  void G4MousePressEvent(QPoint, Qt::ButtonState);
+#else
+  void G4MousePressEvent(QPoint, Qt::MouseButtons);
+#endif
   void G4MouseDoubleClickEvent(QPoint p);
 #if QT_VERSION < 0x040000
-  void G4MouseEvent(int, int, Qt::ButtonState);
+  void G4MouseMoveEvent(int, int, Qt::ButtonState,bool mAutoMove = false);
 #else
-  void G4MouseEvent(int, int, Qt::MouseButtons);
+  void G4MouseMoveEvent(int, int, Qt::MouseButtons,bool mAutoMove = false);
 #endif
-  void G4MouseRotateEvent(G4double, G4double);
-  void G4MouseMoveEvent(G4double, G4double, G4double);
   void G4keyPressEvent (QKeyEvent * event); 
+  void rotateScene(G4double, G4double);
+  void moveScene(G4double, G4double, G4double,bool);
 
 
@@ -94 +97 @@
   QGLWidget* fWindow;
   QDialog* GLWindow;
+  bool hasPendingEvents();
 
 private:
@@ -111 +115 @@
   mouseActions fMouseAction; // 1: rotate 2:move 3:pick 4:shortcuts 
   QPoint fLastPos;
+  /** delta of move event */
+  QPoint fDeltaPos;
   /** delta of scene rotation. This delta is put in degree */
   G4double fDeltaRotation;
@@ -121 +127 @@
   /** To ensure key event are keep one by one */
   bool holdKeyEvent;
+  bool fAutoMove;
   QAction *fRotateAction;
   QAction *fMoveAction;

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

@@ -66 +66 @@
 #endif
 
+#include <qapplication.h>
 #include <qmessagebox.h>
 #include <qfiledialog.h>
@@ -292 +293 @@
   ,fDeltaZoom(0.1)
   ,holdKeyEvent(false)
+  ,fAutoMove(false)
 {
 #ifdef GEANT4_QT_DEBUG
@@ -985 +987 @@
   } else  if (aAction == STYLE4) {  // display shortcuts
 #if QT_VERSION < 0x040000
-    fShortcutsAction->setOn (true);
-#else
-    fShortcutsAction->setChecked (true);
+    //    fShortcutsAction->setOn (true);
+#else
+    //    fShortcutsAction->setChecked (true);
 #endif
 
@@ -1414 +1416 @@
    @param p mouse click point
 */
-void G4OpenGLQtViewer::G4MousePressEvent(QPoint p)
+#if QT_VERSION < 0x040000
+void G4OpenGLQtViewer::G4MousePressEvent(QPoint p,Qt::ButtonState mButtons)
+#else
+void G4OpenGLQtViewer::G4MousePressEvent(QPoint p,Qt::MouseButtons mButtons)
+#endif
 {
+  fAutoMove = false; // stop automove
   fLastPos = p;
   if (fMouseAction == STYLE2){  // pick
@@ -1427 +1434 @@
    @param pos_y mouse y position
    @param mButtons mouse button active
-*/
-
-#if QT_VERSION < 0x040000
-void G4OpenGLQtViewer::G4MouseEvent(int pos_x, int pos_y,Qt::ButtonState mButtons)
-#else
-void G4OpenGLQtViewer::G4MouseEvent(int pos_x, int pos_y,Qt::MouseButtons mButtons)
+   @param mAutoMove true: apply this move till another evnt came, false :one time move
+*/
+
+#if QT_VERSION < 0x040000
+void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::ButtonState mButtons,bool mAutoMove)
+#else
+  void G4OpenGLQtViewer::G4MouseMoveEvent(int pos_x, int pos_y,Qt::MouseButtons mButtons,bool mAutoMove)
 #endif
 {
-
-  int dx = fLastPos.x() - pos_x;
-  int dy = fLastPos.y() - pos_y;
-
+  fAutoMove = mAutoMove;
+#ifdef GEANT4_QT_DEBUG
+  printf("                   mouse move event %d %d\n",pos_x,pos_y);
+#endif
+
+  if (!fAutoMove) {  // keep old delta if automove
+    fDeltaPos = QPoint(fLastPos.x() - pos_x, fLastPos.y() - pos_y);
+  }
+
+  if ((fDeltaPos.x() == 0) && (fDeltaPos.y() == 0)) {
+    fAutoMove = false;
+  }
 
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
-      G4MouseRotateEvent(dx,dy);
+      if (fAutoMove) {
+        while (fAutoMove) {
+          rotateScene(fDeltaPos.x(),fDeltaPos.y());
+#ifdef GEANT4_QT_DEBUG
+          printf("                   Processiongevent %d %d\n",fDeltaPos.x(),fDeltaPos.y());
+#endif
+          ((QApplication*)G4Qt::getInstance ())->processEvents();
+        }
+      } else {
+        rotateScene(fDeltaPos.x(),fDeltaPos.y());
+      }
     }
   } else if (fMouseAction == STYLE2) {  // move
     if (mButtons & Qt::LeftButton) {
-      G4double coef = ((G4double)getSceneNearWidth())/((G4double)WinSize_x);
-      if (WinSize_y <WinSize_x) {
-        coef = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
+      if (fAutoMove) {
+        while (fAutoMove) {
+          moveScene(-fDeltaPos.x(),-fDeltaPos.y(),0,true);
+        }
+      } else {
+        moveScene(-fDeltaPos.x(),-fDeltaPos.y(),0,true);
       }
-      fVP.IncrementPan(dx*coef,-dy*coef);
-      updateQWidget();
     }
   }
   fLastPos = QPoint(pos_x, pos_y);
-}
+#ifdef GEANT4_QT_DEBUG
+  if (mButtons & Qt::LeftButton) {
+    printf("                  end of  mouse move event %d %d delta:%d %d\n",pos_x,pos_y,fDeltaPos.x(),fDeltaPos.y());
+  } else {
+    printf("                  end of  mouse move event %d %d delta:%d %d --------------NO BUTTON\n",pos_x,pos_y,fDeltaPos.x(),fDeltaPos.y());
+  }
+#endif
+}
+
 
 /**
@@ -1461 +1496 @@
    @param dx delta mouse x position
    @param dy delta mouse y position
-*/
-
-void G4OpenGLQtViewer::G4MouseMoveEvent(G4double dx,G4double dy, G4double dz)
+   @param mouseMove : true if even comes froma mouse move, false if even comes from key action
+*/
+
+void G4OpenGLQtViewer::moveScene(G4double dx,G4double dy, G4double dz,bool mouseMove)
 {
-  GLdouble coefTrans = getSceneNearWidth()*fDeltaSceneTranslation;
-  GLdouble coefDepth = getSceneDepth()*fDeltaDepth;
-
+  G4double coefTrans = 0;
+  GLdouble coefDepth = 0;
+  if(mouseMove) {
+    coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_x);
+    if (WinSize_y <WinSize_x) {
+      coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
+    }
+  } else {
+    coefTrans = getSceneNearWidth()*fDeltaSceneTranslation;
+    coefDepth = getSceneDepth()*fDeltaDepth;
+  }
   fVP.IncrementPan(-dx*coefTrans,dy*coefTrans,dz*coefDepth);
  
@@ -1479 +1523 @@
 */
 
-void G4OpenGLQtViewer::G4MouseRotateEvent(G4double dx, G4double dy)
+void G4OpenGLQtViewer::rotateScene(G4double dx, G4double dy)
 {
   dx = dx * fDeltaRotation;
@@ -1827 +1871 @@
 
 
+
 void G4OpenGLQtViewer::G4keyPressEvent (QKeyEvent * event) 
 {
@@ -1840 +1885 @@
 #endif
     
-    G4MouseMoveEvent(0,0,1);
+    moveScene(0,0,1,false);
   }
 #if QT_VERSION < 0x040000
@@ -1847 +1892 @@
   else if ((event->key() == Qt::Key_Up) && (event->modifiers() & Qt::AltModifier)) { // go forward
 #endif
-    G4MouseMoveEvent(0,0,-1);
+    moveScene(0,0,-1,false);
   }
 #if QT_VERSION < 0x040000
@@ -1854 +1899 @@
   if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi
 #endif
-    G4MouseRotateEvent(0,-1);
+    rotateScene(0,-1);
   }
 #if QT_VERSION < 0x040000
@@ -1861 +1906 @@
   else if ((event->key() == Qt::Key_Up) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi
 #endif
-    G4MouseRotateEvent(0,1);
+    rotateScene(0,1);
   }
 #if QT_VERSION < 0x040000
@@ -1868 +1913 @@
   if ((event->key() == Qt::Key_Left) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
 #endif
-    G4MouseRotateEvent(1,0);
+    rotateScene(1,0);
   }
 #if QT_VERSION < 0x040000
@@ -1875 +1920 @@
   else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
 #endif
-    G4MouseRotateEvent(-1,0);
+    rotateScene(-1,0);
   }
   if (event->key() == Qt::Key_Escape) { // escaped from full screen
@@ -1903 +1948 @@
 #endif
     if (event->key() == Qt::Key_Down) { // go down
-      G4MouseMoveEvent(0,1,0);
+      moveScene(0,-1,0,false);
     }
     else if (event->key() == Qt::Key_Up) {  // go up
-      G4MouseMoveEvent(0,-1,0);
+      moveScene(0,1,0,false);
     }
     if (event->key() == Qt::Key_Left) { // go left
-      G4MouseMoveEvent(-1,0,0);
+      moveScene(-1,0,0,false);
     }
     else if (event->key() == Qt::Key_Right) { // go right
-      G4MouseMoveEvent(1,0,0);
+      moveScene(1,0,0,false);
     }
   }
   holdKeyEvent = false;
 }
+
+
+bool G4OpenGLQtViewer::hasPendingEvents () {
+  return ((QApplication*)G4Qt::getInstance ())->hasPendingEvents ();
+}
+
 
 /*

trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

@@ -319 +319 @@
 #endif
     setMouseTracking(true);
-    G4MousePressEvent(event->pos());
+    G4MousePressEvent(event->pos(),Qt::LeftButton);
   }
 }
@@ -337 +337 @@
   printf("G4OpenGLStoredQtViewer::mouseDoubleClickEvent\n");
 #endif
-  //   setMouseTracking(true);
+  setMouseTracking(true);
   //   glBufferImage = grabFrameBuffer().convertToFormat(QImage::Format_ARGB32);//_Premultiplied);  
 }
@@ -346 +346 @@
   printf("G4OpenGLStoredQtViewer::mouseReleaseEvent\n");
 #endif
-  //   setMouseTracking(false);
+  setMouseTracking(false);
 }
 
 void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
 {
-
+  
 #if QT_VERSION < 0x040000
-  G4MouseEvent(event->x(),event->y(),event->state());
+  G4MouseMoveEvent(event->x(),event->y(),event->state());
 #else
-  G4MouseEvent(event->x(),event->y(),event->buttons());
+  G4MouseMoveEvent(event->x(),event->y(),event->buttons());
+#endif
+#ifdef GEANT4_QT_DEBUG
+  if (hasPendingEvents ())
+    G4MouseMoveEvent(event->x(),event->y(),event->buttons(),true);
 #endif
 }