Changeset 799 for trunk/geant4/visualization/OpenGL/src

Timestamp:

May 15, 2008, 6:49:02 PM (16 years ago)

Author:

garnier

Message:

r836@wl-72126: garnier | 2008-05-15 14:34:32 +0200
en test

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtViewer.cc (modified) (4 diffs)
• G4OpenGLStoredQtViewer.cc (modified) (1 diff)
• G4OpenGLViewer.cc (modified) (2 diffs)

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

@@ -88 +88 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::SetView ++++++++++++++++++++\n");
-#endif
   //   if(!fHDC) return;
   //   if(!fHGLRC) return;
@@ -96 +93 @@
   //  fWindow->makeCurrent();
   G4OpenGLViewer::SetView ();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::SetView --------------------\n");
-#endif
 }
 
@@ -1551 +1545 @@
     int cycles = 4;
     while (fAutoMove) {
-      if ( lastMoveTime.elapsed() > (fLaunchSpinDelay / (cycles/2))) {
+      if ( lastMoveTime.elapsed() > (fSpinningDelay / (cycles/2))) {
         if (fMouseAction == STYLE1) {  // rotate
           rotateQtScene(((float)delta.x())/cycles,((float)delta.y())/cycles);
@@ -1648 +1642 @@
   fHoldRotateEvent = true;
 
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::rotateQtScene %f %f\n",dx,dy);
-#endif
-  rotateScene(dx,dy,fDeltaRotation);
+  rotateScene(dx,0,fDeltaRotation);
+  rotateScene(0,dy,fDeltaRotation);
   updateQWidget();
   

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

@@ -34 +34 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
-#define GEANT4_QT_DEBUG
+//#define GEANT4_QT_DEBUG
 
 #include "G4OpenGLStoredQtViewer.hh"

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

@@ -33 +33 @@
 
 #ifdef G4VIS_BUILD_OPENGL_DRIVER
+
+#define GEANT4_QT_DEBUG
 
 #include "G4ios.hh"
@@ -931 +933 @@
     }
   } else {
+#ifdef GEANT4_QT_DEBUG
+    printf("G4OpenGLViewer:: %f %f %f - %f %f %f \n",up.x(),up.y(),up.z(),new_vp.x(),new_vp.y(),new_vp.z());
+#endif
     new_up = up;
     if (new_vp.z()*vp.z() <0) {
+#ifdef GEANT4_QT_DEBUG
+      printf("G4OpenGLViewer:: ***********************************************************\n");
+#endif
       new_up.set(new_up.x(),-new_up.y(),new_up.z());
+      //      new_vp.set(-new_vp.x(),new_vp.y(),new_vp.z());
     }
   }