Changeset 1259

Timestamp:

May 26, 2010, 2:17:04 PM (14 years ago)

Author:

garnier

Message:

best auto rotation

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (6 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.49 2010/05/20 07:09:33 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.50 2010/05/20 08:13:37 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -114 +114 @@
   printf("G4OpenGLQtViewer::CreateMainWindow :: ++++++++++++++ add new TAB %s  W:%d H:%d SizeHinX:%d SizeHintY:%d\n",name.toStdString().c_str(),getWinWidth(),getWinHeight(),fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
 #endif
-  G4Qt* interactorManager = G4Qt::getInstance ();
+  //G4Qt* interactorManager = G4Qt::getInstance ();
 
   ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
@@ -208 +208 @@
   ,fWindow(0)
   ,fRecordFrameNumber(0)
-  ,fRotationAngleX(0)
-  ,fRotationAngleY(0)
-  ,fDeltaRotationAngleX(0)
-  ,fDeltaRotationAngleY(0)
   ,fContextMenu(0)
   ,fMouseAction(STYLE1)
@@ -231 +227 @@
   ,fRecordingStep(WAIT)
   ,fProcess(NULL)
+  ,fNbMaxFramesPerSec(100)
+  ,fNbMaxAnglePerSec(360)
   ,fLaunchSpinDelay(100)
 {
@@ -1478 +1476 @@
     lastMoveTime.start();
     // try to addapt speed move/rotate looking to drawing speed
-    int cycles = 4;
+    float correctionFactor = 5;
     while (fAutoMove) {
-      //      if ( lastMoveTime.elapsed() > (fSpinningDelay / (cycles/2))) {
+      if ( lastMoveTime.elapsed () >= (int)(1000/fNbMaxFramesPerSec)) {
+        float lTime = 1000/((float)lastMoveTime.elapsed ());
+        if (((((float)delta.x())/correctionFactor)*lTime > fNbMaxAnglePerSec) ||
+            ((((float)delta.x())/correctionFactor)*lTime < -fNbMaxAnglePerSec) ) {
+          correctionFactor = (float)delta.x()*(lTime/fNbMaxAnglePerSec);
+          if (delta.x() <0 ) {
+            correctionFactor = -correctionFactor;
+          }
+        }
+      if (((((float)delta.y())/correctionFactor)*lTime > fNbMaxAnglePerSec) ||
+          ((((float)delta.y())/correctionFactor)*lTime < -fNbMaxAnglePerSec) ) {
+          correctionFactor = (float)delta.y()*(lTime/fNbMaxAnglePerSec);
+          if (delta.y() <0 ) {
+            correctionFactor = -correctionFactor;
+          }
+        }
+
         if (fMouseAction == STYLE1) {  // rotate
-          rotateQtScene(((float)delta.x())/cycles,((float)delta.y())/cycles);
+          rotateQtScene(((float)delta.x())/correctionFactor,((float)delta.y())/correctionFactor);
         } else if (fMouseAction == STYLE2) {  // move
-          moveScene(-((float)delta.x())/cycles,-((float)delta.y())/cycles,0,true);
+          moveScene(-((float)delta.x())/correctionFactor,-((float)delta.y())/correctionFactor,0,true);
         }
+#ifdef G4DEBUG_VIS_OGL
+        printf("G4OpenGLQtViewer::G4MouseReleaseEvent Fps:%f x:%d y:%d cycle:%f\n",(float)1000/lastMoveTime.elapsed(),delta.x(),delta.y(),correctionFactor);
+#endif
         lastMoveTime.start();
-        cycles = 1 ;
+      }
       ((QApplication*)G4Qt::getInstance ())->processEvents();
-      cycles ++ ;
     }
   }
@@ -2694 +2710 @@
     fGLWindow = new QDialog();
 #ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLQtViewer::GetParentWidget fGLWindow:%d \n",fGLWindow);
+    printf("G4OpenGLQtViewer::GetParentWidget fGLWindow\n");
 #endif
   }