Changeset 798

Timestamp:

May 14, 2008, 6:44:55 PM (16 years ago)

Author:

garnier

Message:

r834@wl-72126: garnier | 2008-05-14 18:44:52 +0200
SPINNING ok

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (3 diffs)
• include/G4OpenGLViewer.hh (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (14 diffs)
• src/G4OpenGLViewer.cc (modified) (1 diff)
• src/G4OpenGLXmRotationCallbacks.cc (modified) (4 diffs)

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

@@ -105 +105 @@
 #endif
   void G4keyPressEvent (QKeyEvent * event); 
-  void rotateScene(int, int);
-  void moveScene(int, int, int,bool);
+  void rotateQtScene(float, float);
+  void rotateQtCamera(float, float);
+  void moveScene(float, float, float,bool);
 
 
@@ -146 +147 @@
 
   mouseActions fMouseAction; // 1: rotate 2:move 3:pick 4:shortcuts 
-  QPoint fLastPos;
-  /** delta X of move event */
-  G4double fDeltaPosX;
-  /** delta Y of move event */
-  G4double fDeltaPosY;
+  QPoint fLastPos1;
+  QPoint fLastPos2;
+  QPoint fLastPos3;
   /** delta of scene rotation. This delta is put in degree */
   G4double fDeltaRotation;
@@ -187 +186 @@
   QTime *fLastEventTime;
   int fSpinningDelay;
+  int fLaunchSpinDelay;
 
 private slots :

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

@@ -67 +67 @@
   virtual void CreateFontLists () {}
   virtual void print();
+  void rotateScene (G4double dx, G4double dy,G4double delta);
 //////////////////////////////Vectored PostScript production functions///
   void printBuffer(GLint, GLfloat*);

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

@@ -295 +295 @@
   ,fDeltaSceneTranslation(0.01)
   ,fDeltaDepth(0.01)
-  ,fDeltaZoom(0.1)
+  ,fDeltaZoom(0.05)
   ,fDeltaMove(0.05)
   ,fHoldKeyEvent(false)
@@ -309 +309 @@
   ,fRecordingStep(WAIT)
   ,fProcess(NULL)
+  ,fLaunchSpinDelay(100)
 {
 
@@ -314 +315 @@
   G4Qt* interactorManager = G4Qt::getInstance ();
 
+  fLastPos3 = QPoint(-1,-1);    
+  fLastPos2 = QPoint(-1,-1);    
+  fLastPos1 = QPoint(-1,-1);    
+  
   initMovieParameters();
 
@@ -1515 +1520 @@
 {
   fAutoMove = false; // stop automove
-  fLastPos = p;
+  fLastPos1 = p;
+  fLastPos2 = fLastPos1;
+  fLastPos3 = fLastPos2;
   fLastEventTime->start();
   if (fMouseAction == STYLE2){  // pick
@@ -1526 +1533 @@
 void G4OpenGLQtViewer::G4MouseReleaseEvent()
 {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::mouseRealease() %d,%d  %d,%d  %d,%d\n",fLastPos1.x(),fLastPos1.y(),fLastPos2.x(),fLastPos2.y(),fLastPos3.x(),fLastPos3.y());
+#endif
   fSpinningDelay = fLastEventTime->elapsed();
+  QPoint delta = (fLastPos3-fLastPos1);
+  if ((delta.x() == 0) && (delta.y() == 0)) {
 #ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::G4MouseReleaseEvent delay %d\n",fSpinningDelay);
-#endif
-  if ((fDeltaPosX == 0) && (fDeltaPosY == 0)) {
+  printf("G4OpenGLQtViewer::mouseRealease() EXIT 1 \n");
+#endif
     return;
   }
-  if (fSpinningDelay < 100 ) {
+  if (fSpinningDelay < fLaunchSpinDelay ) {
     fAutoMove = true;
-
     QTime lastMoveTime;
     lastMoveTime.start();
@@ -1541 +1551 @@
     int cycles = 4;
     while (fAutoMove) {
-      if ( lastMoveTime.elapsed() > (100 / (cycles/2))) {
+      if ( lastMoveTime.elapsed() > (fLaunchSpinDelay / (cycles/2))) {
         if (fMouseAction == STYLE1) {  // rotate
-          rotateScene(fDeltaPosX,fDeltaPosY);
+          rotateQtScene(((float)delta.x())/cycles,((float)delta.y())/cycles);
         } else if (fMouseAction == STYLE2) {  // move
-          moveScene(-fDeltaPosX,-fDeltaPosY,0,true);
+          moveScene(-((float)delta.x())/cycles,-((float)delta.y())/cycles,0,true);
         }
         lastMoveTime.start();
@@ -1553 +1563 @@
       cycles ++ ;
     }
-    fDeltaPosX = 0;
-    fDeltaPosY = 0;
-    
   }
 }
@@ -1578 +1585 @@
   }
 
-  fDeltaPosX = fLastPos.x() - pos_x;
-  fDeltaPosY = fLastPos.y() - pos_y;
+  fLastPos3 = fLastPos2;
+  fLastPos2 = fLastPos1;
+  fLastPos1 = QPoint(pos_x, pos_y);
   
   if (fMouseAction == STYLE1) {  // rotate
     if (mButtons & Qt::LeftButton) {
-      rotateScene(fDeltaPosX,fDeltaPosY);
+      rotateQtScene(fLastPos2.x()-fLastPos1.x(),fLastPos2.y()-fLastPos1.y());
     }
   } else if (fMouseAction == STYLE2) {  // move
     if (mButtons & Qt::LeftButton) {
-      moveScene(-fDeltaPosX,-fDeltaPosY,0,true);
+      moveScene(fLastPos1.x()-fLastPos2.x(),fLastPos1.y()-fLastPos2.y(),0,true);
     }
   }
-  fLastPos = QPoint(pos_x, pos_y);
+
   fLastEventTime->start();
 }
@@ -1599 +1607 @@
    @param dx delta mouse x position
    @param dy delta mouse y position
-   @param mouseMove : true if even comes froma mouse move, false if even comes from key action
-*/
-
-void G4OpenGLQtViewer::moveScene(int dx,int dy, int dz,bool mouseMove)
+   @param mouseMove : true if even comes from a mouse move, false if even comes from key action
+*/
+
+void G4OpenGLQtViewer::moveScene(float dx,float dy, float dz,bool mouseMove)
 {
   if (fHoldMoveEvent)
@@ -1634 +1642 @@
 */
 
-void G4OpenGLQtViewer::rotateScene(int dx, int dy)
+void G4OpenGLQtViewer::rotateQtScene(float dx, float dy)
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::rotateScene %d %d\n",dx,dy);
-#endif
-
   if (fHoldRotateEvent)
     return;
   fHoldRotateEvent = true;
 
-  G4Vector3D vp;
-  G4Vector3D up;
-  
-  G4Vector3D xprime;
-  G4Vector3D yprime;
-  G4Vector3D zprime;
-  
-  G4double delta_alpha;
-  G4double delta_theta;
-  
-  G4Vector3D new_vp;
-  G4Vector3D new_up;
-  
-  G4double cosalpha;
-  G4double sinalpha;
-  
-  G4Vector3D a1;
-  G4Vector3D a2;
-  G4Vector3D delta;
-  G4Vector3D viewPoint;
-
-    
-  //phi spin stuff here
-  
-  vp = fVP.GetViewpointDirection ().unit ();
-  up = fVP.GetUpVector ().unit ();
-  
-  yprime = (up.cross(vp)).unit();
-  zprime = (vp.cross(yprime)).unit();
-  
-  if (fVP.GetLightsMoveWithCamera()) {
-    delta_alpha = dy * fDeltaRotation;
-    delta_theta = -dx * fDeltaRotation;
-  } else {
-    delta_alpha = -dy * fDeltaRotation;
-    delta_theta = dx * fDeltaRotation;
-  }    
-  
-  delta_alpha *= deg;
-  delta_theta *= deg;
-  
-  new_vp = std::cos(delta_alpha) * vp + std::sin(delta_alpha) * zprime;
-  
-  // to avoid z rotation flipping
-  // to allow more than 360° rotation
-  if (fVP.GetLightsMoveWithCamera()) {
-    new_up = (new_vp.cross(yprime)).unit();
-    if (new_vp.z()*vp.z() <0) {
-      new_up.set(new_up.x(),-new_up.y(),new_up.z());
-    }
-  } else {
-    new_up = up;
-    if (new_vp.z()*vp.z() <0) {
-      new_up.set(new_up.x(),-new_up.y(),new_up.z());
-    }
-  }
-  fVP.SetUpVector(new_up);
-  ////////////////
-  // Rotates by fixed azimuthal angle delta_theta.
-  
-  cosalpha = new_up.dot (new_vp.unit());
-  sinalpha = std::sqrt (1. - std::pow (cosalpha, 2));
-  yprime = (new_up.cross (new_vp.unit())).unit ();
-  xprime = yprime.cross (new_up);
-  // Projection of vp on plane perpendicular to up...
-  a1 = sinalpha * xprime;
-  // Required new projection...
-  a2 = sinalpha * (std::cos (delta_theta) * xprime + std::sin (delta_theta) * yprime);
-  // Required Increment vector...
-  delta = a2 - a1;
-  // So new viewpoint is...
-  viewPoint = new_vp.unit() + delta;
-  
 #ifdef GEANT4_QT_DEBUG
-  //      printf("vp Vector : %f %f %f delta_alpha:%f delta_theta:%f cosalpha:%f sinalpha:%f\n",viewPoint.x(),viewPoint.y(),viewPoint.z(),delta_alpha,delta_theta,cosalpha,sinalpha);
-  //      printf("up : %f %f %f\n",up.x(),up.y(),up.z());
-  //      printf("new up : %f %f %f\n",new_up.x(),new_up.y(),new_up.z());
-  //      printf("vp : %f %f %f\n",vp.x(),vp.y(),vp.z());
-  //      printf("new_vp : %f %f %f\n",new_vp.x(),new_vp.y(),new_vp.z());
-#endif
-  fVP.SetViewAndLights (viewPoint);
+  printf("G4OpenGLQtViewer::rotateQtScene %f %f\n",dx,dy);
+#endif
+  rotateScene(dx,dy,fDeltaRotation);
   updateQWidget();
   
   fHoldRotateEvent = false;
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::Rotate END\n");
-#endif
+}
+
+/**
+   @param dx delta mouse x position
+   @param dy delta mouse y position
+*/
+
+void G4OpenGLQtViewer::rotateQtCamera(float dx, float dy)
+{
+  if (fHoldRotateEvent)
+    return;
+  fHoldRotateEvent = true;
+
+  rotateScene(dx,dy,fDeltaRotation);
+  updateQWidget();
+  
+  fHoldRotateEvent = false;
 }
 
@@ -2051 +1992 @@
   if ((event->key() == Qt::Key_Down) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi
 #endif
-    rotateScene(0,-1);
+    rotateQtCamera(0,-1);
   }
 #if QT_VERSION < 0x040000
@@ -2058 +1999 @@
   else if ((event->key() == Qt::Key_Up) && (event->modifiers() & Qt::ShiftModifier)) { // rotate phi
 #endif
-    rotateScene(0,1);
+    rotateQtCamera(0,1);
   }
 #if QT_VERSION < 0x040000
@@ -2065 +2006 @@
   if ((event->key() == Qt::Key_Left) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
 #endif
-    rotateScene(1,0);
+    rotateQtCamera(1,0);
   }
 #if QT_VERSION < 0x040000
@@ -2072 +2013 @@
   else if ((event->key() == Qt::Key_Right) && (event->modifiers() & Qt::ShiftModifier)) { // rotate theta
 #endif
-    rotateScene(-1,0);
+    rotateQtCamera(-1,0);
   }
 

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

@@ -877 +877 @@
 }
 
+void G4OpenGLViewer::rotateScene(G4double dx, G4double dy,G4double deltaRotation)
+{
+
+  G4Vector3D vp;
+  G4Vector3D up;
+  
+  G4Vector3D xprime;
+  G4Vector3D yprime;
+  G4Vector3D zprime;
+  
+  G4double delta_alpha;
+  G4double delta_theta;
+  
+  G4Vector3D new_vp;
+  G4Vector3D new_up;
+  
+  G4double cosalpha;
+  G4double sinalpha;
+  
+  G4Vector3D a1;
+  G4Vector3D a2;
+  G4Vector3D delta;
+  G4Vector3D viewPoint;
+
+    
+  //phi spin stuff here
+  
+  vp = fVP.GetViewpointDirection ().unit ();
+  up = fVP.GetUpVector ().unit ();
+  
+  yprime = (up.cross(vp)).unit();
+  zprime = (vp.cross(yprime)).unit();
+  
+  if (fVP.GetLightsMoveWithCamera()) {
+    delta_alpha = dy * deltaRotation;
+    delta_theta = -dx * deltaRotation;
+  } else {
+    delta_alpha = -dy * deltaRotation;
+    delta_theta = dx * deltaRotation;
+  }    
+  
+  delta_alpha *= deg;
+  delta_theta *= deg;
+  
+  new_vp = std::cos(delta_alpha) * vp + std::sin(delta_alpha) * zprime;
+  
+  // to avoid z rotation flipping
+  // to allow more than 360° rotation
+  if (fVP.GetLightsMoveWithCamera()) {
+    new_up = (new_vp.cross(yprime)).unit();
+    if (new_vp.z()*vp.z() <0) {
+      new_up.set(new_up.x(),-new_up.y(),new_up.z());
+    }
+  } else {
+    new_up = up;
+    if (new_vp.z()*vp.z() <0) {
+      new_up.set(new_up.x(),-new_up.y(),new_up.z());
+    }
+  }
+  fVP.SetUpVector(new_up);
+  ////////////////
+  // Rotates by fixed azimuthal angle delta_theta.
+  
+  cosalpha = new_up.dot (new_vp.unit());
+  sinalpha = std::sqrt (1. - std::pow (cosalpha, 2));
+  yprime = (new_up.cross (new_vp.unit())).unit ();
+  xprime = yprime.cross (new_up);
+  // Projection of vp on plane perpendicular to up...
+  a1 = sinalpha * xprime;
+  // Required new projection...
+  a2 = sinalpha * (std::cos (delta_theta) * xprime + std::sin (delta_theta) * yprime);
+  // Required Increment vector...
+  delta = a2 - a1;
+  // So new viewpoint is...
+  viewPoint = new_vp.unit() + delta;
+  
+  fVP.SetViewAndLights (viewPoint);
+}
+
 #endif

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

@@ -64 +64 @@
   //theta spin stuff here
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
+
+  pView->rotateScene((G4double)pView->rot_sens,0,1);
+
+  /*
   G4double delta_theta;
 
@@ -100 +104 @@
 
   pView->fVP.SetViewAndLights (viewPoint);  
+  */
 
   pView->SetView ();
@@ -135 +140 @@
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
 
+  pView->rotateScene(0,(G4double)pView->rot_sens,1);
+
+  /*
   if (pView->fVP.GetLightsMoveWithCamera()) {
     if (pView -> rotate_up) {
@@ -167 +175 @@
   }
 
+  */
   pView->SetView ();
   pView->ClearView ();