Changeset 797 for trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

Timestamp:

May 13, 2008, 6:30:22 PM (16 years ago)

Author:

garnier

Message:

r832@wl-72126: garnier | 2008-05-13 18:30:21 +0200
mise a jour du SPINNING

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (8 diffs)

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"
@@ -158 +158 @@
 
   } else {
-#ifdef GEANT4_QT_DEBUG
-    printf("***************************  CASE 1 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
-#endif
      
     // If kernel visit was needed, drawing and FinishView will already
@@ -166 +163 @@
     if (!kernelVisitWasNeeded) {
 #ifdef GEANT4_QT_DEBUG
-      printf("***************************  CASE 2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+      printf("**************************  G4OpenGLStoredQtViewer::DrawView Don't need kernel Visit \n");
 #endif
       DrawDisplayLists ();
@@ -172 +169 @@
     } else {
 #ifdef GEANT4_QT_DEBUG
-      printf("***************************  CASE 3 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+      printf("**************************  G4OpenGLStoredQtViewer::DrawView need kernel Visit \n");
 #endif
       // However, union cutaways are implemented in DrawDisplayLists, so make
@@ -208 +205 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLStoredQtViewer::FinishView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
-#endif
-
   glFlush ();
   swapBuffers ();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLStoredQtViewer::FinishView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
-#endif
-
 }
 
@@ -314 +303 @@
 #endif
     setMouseTracking(true);
-    G4MousePressEvent(event->pos(),Qt::LeftButton);
+    G4MousePressEvent(event->pos());
   }
 }
@@ -338 +327 @@
 void G4OpenGLStoredQtViewer::mouseReleaseEvent(QMouseEvent *event)
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLStoredQtViewer::mouseReleaseEvent\n");
+  G4MouseReleaseEvent();
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLStoredQtViewer::mouseReleaseEvent ================\n");
 #endif
   setMouseTracking(false);
@@ -352 +342 @@
   G4MouseMoveEvent(event->x(),event->y(),event->buttons());
 #endif
-  if (hasPendingEvents ())
-#if QT_VERSION < 0x040000
-    G4MouseMoveEvent(event->x(),event->y(),event->state());
-#else
-    G4MouseMoveEvent(event->x(),event->y(),event->buttons());
-#endif
 }