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

Timestamp:

Nov 15, 2007, 7:41:15 PM (17 years ago)

Author:

garnier

Message:

r657@mac-90108: laurentgarnier | 2007-11-15 19:44:52 +0100
ajout d un flag pour debug

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.5 2007/11/14 18:58:59 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.6 2007/11/15 18:24:28 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -57 +57 @@
 
 G4OpenGLStoredQtViewer::~G4OpenGLStoredQtViewer() {
+#ifdef GEANT4_QT_DEBUG
    printf("GLWidget::~GLWidget \n");
+#endif
    makeCurrent();
    // this is connect to the Dialog for deleting it properly
    // when close event.
    //   ((QDialog*)window())->reject();
+#ifdef GEANT4_QT_DEBUG
    printf("GLWidget::~GLWidget END\n");
+#endif
 }
 
 void G4OpenGLStoredQtViewer::Initialise() {
+#ifdef GEANT4_QT_DEBUG
    printf("GLWidget::Initialise \n");
+#endif
    readyToPaint = false;
    CreateGLQtContext ();
+#ifdef GEANT4_QT_DEBUG
    printf("G4OpenGLStoredQtViewer::Initialise () 2\n");
-
+#endif
   CreateMainWindow (this);
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::Initialise () 3\n");
-
+#endif
   CreateFontLists ();  // FIXME Does nothing!
   
+#ifdef GEANT4_QT_DEBUG
   printf("readyToPaint = true \n");
+#endif
   readyToPaint = true;
   
   // First Draw
   SetView();
+#ifdef GEANT4_QT_DEBUG
   printf("    ClearView\n");
+#endif
   ClearView (); //ok, put the background correct
   ShowView();
@@ -91 +103 @@
    InitializeGLView ();
 
+#ifdef GEANT4_QT_DEBUG
    printf("G4OpenGLStoredQtViewer::InitialiseGL () 1\n");
+#endif
 
    // clear the buffers and window.
@@ -103 +117 @@
    hasToRepaint =true;
 
+#ifdef GEANT4_QT_DEBUG
    printf("G4OpenGLStoredQtViewer::InitialiseGL  -------------------------------------------------------------------------------------\n");
+#endif
 }
 
@@ -109 +125 @@
 void G4OpenGLStoredQtViewer::DrawView () {
 
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
   printf("G4OpenGLStoredQtViewer::DrawView Dialog adress : %d\n",GLWindow);
+#endif
    G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
 
@@ -131 +149 @@
    if(style!=G4ViewParameters::hlr &&
       haloing_enabled) {
+#ifdef GEANT4_QT_DEBUG
      printf("G4OpenGLStoredQtViewer::DrawView DANS LE IF\n");
+#endif
 
      HaloingFirstPass ();
@@ -143 +163 @@
 
    } else {
+#ifdef GEANT4_QT_DEBUG
      printf("***************************  CASE 1 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+#endif
      
      // If kernel visit was needed, drawing and FinishView will already
      // have been done, so...
      if (!kernelVisitWasNeeded) {
+#ifdef GEANT4_QT_DEBUG
        printf("***************************  CASE 2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+#endif
        DrawDisplayLists ();
        FinishView ();
      } else {
+#ifdef GEANT4_QT_DEBUG
        printf("***************************  CASE 3 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+#endif
        // However, union cutaways are implemented in DrawDisplayLists, so make
        // an extra pass...
@@ -160 +186 @@
          DrawDisplayLists ();
          FinishView ();
+#ifdef GEANT4_QT_DEBUG
          printf("***************************  CASE 4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+#endif
        } else { // ADD TO AVOID KernelVisit=1 and nothing to display
          DrawDisplayLists ();
@@ -168 +196 @@
    }
 
+#ifdef GEANT4_QT_DEBUG
    printf("G4OpenGLStoredQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
+#endif
    hasToRepaint =true;
 }
@@ -179 +209 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::FinishView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
+#endif
 
   glFlush ();
   swapBuffers ();
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::FinishView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+#endif
 
 }
@@ -205 +239 @@
    WinSize_y = (G4int) aHeight;
 
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d %d=%d %d=%d\n",hasToRepaint,width(),aWidth,height(),aHeight);
+#endif
 }
 
@@ -213 +249 @@
  {
    if (!readyToPaint) {
+#ifdef GEANT4_QT_DEBUG
      printf("G4OpenGLStoredQtViewer::paintGL ============  Not ready %d\n",readyToPaint);
+#endif
      readyToPaint= true;
      return;
@@ -222 +260 @@
    if ( !hasToRepaint) {
      if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
+#ifdef GEANT4_QT_DEBUG
        printf("G4OpenGLStoredQtViewer::paintGL ============  Dont repaint\n");
+#endif
        return;
      }
    }
    nbPaint++;
+#ifdef GEANT4_QT_DEBUG
    printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
+#endif
    WinSize_x = (G4int) width();
    WinSize_y = (G4int) height();
@@ -238 +280 @@
 
 //   //  printf("before ClearView\n");
+#ifdef GEANT4_QT_DEBUG
    printf("    ClearView\n");
+#endif
    
    ClearView (); //ok, put the background correct
@@ -245 +289 @@
    hasToRepaint =false;
 
+#ifdef GEANT4_QT_DEBUG
    printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n",nbPaint,readyToPaint);
+#endif
  }
 
 void G4OpenGLStoredQtViewer::mousePressEvent(QMouseEvent *event)
 {
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::mousePressEvent\n");
+#endif
   G4MousePressEvent(event->pos());
 }
@@ -256 +304 @@
 void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
 {
+#ifdef GEANT4_QT_DEBUG
   printf("G4OpenGLStoredQtViewer::mouseMoveEvent\n");
+#endif
 #if QT_VERSION < 0x040000
   G4MouseMoveEvent(event->x(),event->y(),event->button());