Changeset 728 for trunk/geant4/visualization/OpenGL

Timestamp:

Feb 18, 2008, 7:19:24 PM (16 years ago)

Author:

garnier

Message:

correction partielle du #120 par l empechement de rentrer recursivement dans les fonctions move et rotate

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (9 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (1 diff)

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

@@ -135 +135 @@
   /** To ensure key event are keep one by one */
   bool fHoldKeyEvent;
+  /** To ensure move event are keep one by one */
+  bool fHoldMoveEvent;
+  /** To ensure rotate event are keep one by one */
+  bool fHoldRotateEvent;
   bool fAutoMove;
   QAction *fRotateAction;

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

@@ -291 +291 @@
   ,fContextMenu(0)
   ,fMouseAction(STYLE1)
-  ,fDeltaRotation(0.5)
+  ,fDeltaRotation(1)
   ,fDeltaSceneTranslation(0.01)
   ,fDeltaDepth(0.01)
@@ -297 +297 @@
   ,fDeltaMove(0.05)
   ,fHoldKeyEvent(false)
+  ,fHoldMoveEvent(false)
+  ,fHoldRotateEvent(false)
   ,fAutoMove(false)
 {
@@ -1522 +1524 @@
 void G4OpenGLQtViewer::moveScene(G4double dx,G4double dy, G4double dz,bool mouseMove,bool mAutoMove)
 {
+  if (fHoldMoveEvent)
+    return;
+  fHoldMoveEvent = true;
+
   if( mAutoMove == false) {
     fAutoMove = true;
@@ -1536 +1542 @@
         coefTrans = ((G4double)getSceneNearWidth())/((G4double)WinSize_y);
       }
+#ifdef GEANT4_QT_DEBUG
+      printf("Coef trans %f\n",coefTrans);
+#endif
     } else {
       coefTrans = getSceneNearWidth()*fDeltaSceneTranslation;
@@ -1545 +1554 @@
     ((QApplication*)G4Qt::getInstance ())->processEvents();
   }
+
+  fHoldMoveEvent = false;
 }
 
@@ -1555 +1566 @@
 void G4OpenGLQtViewer::rotateScene(G4double dx, G4double dy,bool mAutoRotate)
 {
+  if (fHoldRotateEvent)
+    return;
+  fHoldRotateEvent = true;
+
   if( mAutoRotate == false) {
     fAutoMove = true;
   }
-  dx = dx * fDeltaRotation;
-  dy = dy * fDeltaRotation;
   G4Vector3D vp;
   G4Vector3D up;
@@ -1595 +1608 @@
   
     if (fVP.GetLightsMoveWithCamera()) {
-      delta_alpha = dy;
-      delta_theta = -dx;
+      delta_alpha = dy * fDeltaRotation;
+      delta_theta = -dx * fDeltaRotation;
     } else {
-      delta_alpha = -dy;
-      delta_theta = dx;
+      delta_alpha = -dy * fDeltaRotation;
+      delta_theta = dx * fDeltaRotation;
     }    
   
@@ -1649 +1662 @@
     ((QApplication*)G4Qt::getInstance ())->processEvents();
   }
+
+  fHoldRotateEvent = false;
 }
 
@@ -1999 +2014 @@
 #endif
     if (event->key() == Qt::Key_Plus) {
-      fDeltaPosX =fDeltaPosX*(1+fDeltaRotation);
-      fDeltaPosY =fDeltaPosY*(1+fDeltaRotation);
-      printf("rotate + %f %f\n",fDeltaPosX,fDeltaPosY);
+      fDeltaRotation = fDeltaRotation/0.7;
     }
     else if (event->key() == Qt::Key_Minus) {
-      fDeltaPosX =fDeltaPosX*(1-fDeltaRotation);
-      fDeltaPosY =fDeltaPosY*(1-fDeltaRotation);
-      printf("rotate - %f %f\n",fDeltaPosX,fDeltaPosY);
+      fDeltaRotation = fDeltaRotation*0.7;
     }
   } else {

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

@@ -364 +364 @@
   G4MouseMoveEvent(event->x(),event->y(),event->buttons());
 #endif
-#ifdef GEANT4_QT_DEBUG
   if (hasPendingEvents ())
     G4MouseMoveEvent(event->x(),event->y(),event->buttons(),true);
-#endif
 }