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

Timestamp:

Aug 14, 2007, 4:57:01 PM (17 years ago)

Author:

garnier

Message:

r569@mac-90108: laurentgarnier | 2007-08-14 15:07:23 +0200
commenatires et suppression de double rotation

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.18 2007/06/25 12:07:59 $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.16 2007/06/25 16:38:13 $
 // GEANT4 tag $Name: geant4-08-02-patch-01 $
 //
-// 
+//
 // Class G4OpenGLStoredQtViewer : a class derived from G4OpenGLQtViewer and
-//                             G4OpenGLStoredViewer.
+//                                G4OpenGLStoredViewer.
 
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
 #include "G4OpenGLStoredQtViewer.hh"
+#include "G4VisManager.hh"
 
 #include "G4ios.hh"
@@ -41 +42 @@
 (G4OpenGLStoredSceneHandler& sceneHandler,
  const G4String&  name):
-G4OpenGLViewer (sceneHandler),
-G4OpenGLQtViewer (sceneHandler),
-G4OpenGLStoredViewer (sceneHandler),
-G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name) {
-
+ G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
+ G4OpenGLViewer (sceneHandler),
+ G4OpenGLQtViewer (sceneHandler),
+ G4OpenGLStoredViewer (sceneHandler),
+ QGLWidget()                      // FIXME : gerer le pb du parent !
+ {
+   nbPaint =0;
+   hasToRepaint =false;
   if (fViewId < 0) return;  // In case error in base class instantiation.
 }
 
-void G4OpenGLStoredQtViewer::Initialise () {
-
-  //Check that G4OpenGLQtViewer got a double buffered colour visual
-
-  CreateGLQtContext ();
-  CreateMainWindow ();
-  CreateFontLists ();
-
-// clear the buffers and window.
-  ClearView ();
-  FinishView ();
-
-  glDepthFunc (GL_LEQUAL);
-  glDepthMask (GL_TRUE);
-}
+G4OpenGLStoredQtViewer::~G4OpenGLStoredQtViewer() {
+   printf("GLWidget::~GLWidget \n");
+     makeCurrent();
+   printf("GLWidget::~GLWidget END\n");
+}
+
+void G4OpenGLStoredQtViewer::Initialise() {
+   printf("GLWidget::Initialise \n");
+   readyToPaint = false;
+   CreateGLQtContext ();
+   printf("G4OpenGLStoredQtViewer::Initialise () 2\n");
+
+  CreateMainWindow (this);
+  printf("G4OpenGLStoredQtViewer::Initialise () 3\n");
+
+  CreateFontLists ();  // FIXME Does nothing!
+  
+  printf("readyToPaint = true \n");
+  readyToPaint = true;
+  
+  // First Draw
+  SetView();
+  printf("    ClearView\n");
+  ClearView (); //ok, put the background correct
+  ShowView();
+  FinishView();
+}
+
+void G4OpenGLStoredQtViewer::initializeGL () {
+
+   InitializeGLView ();
+
+   printf("G4OpenGLStoredQtViewer::InitialiseGL () 1\n");
+
+   // clear the buffers and window.
+   ClearView ();
+   //   printf("G4OpenGLStoredQtViewer::InitialiseGL () 2\n");
+   FinishView ();
+   
+   glDepthFunc (GL_LEQUAL);
+   glDepthMask (GL_TRUE);
+
+   hasToRepaint =true;
+
+   printf("G4OpenGLStoredQtViewer::InitialiseGL  -------------------------------------------------------------------------------------\n");
+}
+
 
 void G4OpenGLStoredQtViewer::DrawView () {
 
-  //Make sure current viewer is attached and clean...
-  //Qt version needed
-  //  glXMakeCurrent (dpy, win, cx);
-  glViewport (0, 0, WinSize_x, WinSize_y);
-
-  G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
-
-  //See if things have changed from last time and remake if necessary...
-  // The fNeedKernelVisit flag might have been set by the user in
-  // /vis/viewer/rebuild, but if not, make decision and set flag only
-  // if necessary...
-  if (!fNeedKernelVisit) KernelVisitDecision ();
-  G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
-  ProcessView ();
-
-  if(style!=G4ViewParameters::hlr &&
-     haloing_enabled) {
-
-    HaloingFirstPass ();
-    DrawDisplayLists ();
-    glFlush ();
-
-    HaloingSecondPass ();
-
-    DrawDisplayLists ();
-    FinishView ();
-
-  } else {
-
-    // If kernel visit was needed, drawing and FinishView will already
-    // have been done, so...
-    if (!kernelVisitWasNeeded) {
-      DrawDisplayLists ();
-      FinishView ();
-    } else {
-    // However, union cutaways are implemented in DrawDisplayLists, so make
-    // an extra pass...
-      if (fVP.IsCutaway() &&
-          fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion) {
-        ClearView();
-        DrawDisplayLists ();
-        FinishView ();
-      }
-    }
-  }
-}
+  printf("G4OpenGLStoredQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
+
+   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
+
+   //Make sure current viewer is attached and clean...
+   //Qt version needed
+   glViewport (0, 0, WinSize_x, WinSize_y);
+
+   //See if things have changed from last time and remake if necessary...
+   // The fNeedKernelVisit flag might have been set by the user in
+   // /vis/viewer/rebuild, but if not, make decision and set flag only
+   // if necessary...
+   if (!fNeedKernelVisit) KernelVisitDecision ();
+   G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
+   ProcessView ();
+   
+
+   if(style!=G4ViewParameters::hlr &&
+      haloing_enabled) {
+     printf("G4OpenGLStoredQtViewer::DrawView DANS LE IF\n");
+
+     HaloingFirstPass ();
+     DrawDisplayLists ();
+     glFlush ();
+
+     HaloingSecondPass ();
+
+     DrawDisplayLists ();
+
+   } else {
+     
+     // If kernel visit was needed, drawing and FinishView will already
+     // have been done, so...
+     if (!kernelVisitWasNeeded) {
+       DrawDisplayLists ();
+     } else {
+       // However, union cutaways are implemented in DrawDisplayLists, so make
+       // an extra pass...
+       if (fVP.IsCutaway() &&
+           fVP.GetCutawayMode() == G4ViewParameters::cutawayUnion) {
+         ClearView();
+         DrawDisplayLists ();
+       }
+     }
+   }
+
+   FinishView ();
+  printf("G4OpenGLStoredQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
+   hasToRepaint =true;
+}
+
 
 //////////////////////////////////////////////////////////////////////////////
@@ -120 +161 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  printf("................G4OpenGLStoredQtViewer::FinishView");
-  if(!fWindow) return;
+  printf("G4OpenGLStoredQtViewer::FinishView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
 
   glFlush ();
-  fWindow->swapBuffers ();
-  printf("................G4OpenGLStoredQtViewer::FinishView     END");
+  swapBuffers ();
+  printf("G4OpenGLStoredQtViewer::FinishView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+
+}
+
+
+/**
+ - Lors du resize de la fenetre, on doit non pas redessiner le detecteur, mais aussi les evenements
+ */
+void G4OpenGLStoredQtViewer::resizeGL(
+ int aWidth
+,int aHeight)
+{  
+  glViewport(0, 0, aWidth, aHeight);
+  glMatrixMode(GL_PROJECTION);
+  glMatrixMode(GL_MODELVIEW);
+
+   if (((WinSize_x != (G4int)aWidth)) || (WinSize_y != (G4int) aHeight)) {
+     hasToRepaint =true;
+   }
+   WinSize_x = (G4int) aWidth;
+   WinSize_y = (G4int) aHeight;
+
+  printf("G4OpenGLStoredQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d %d=%d %d=%d\n",hasToRepaint,width(),aWidth,height(),aHeight);
+}
+
+
+
+void G4OpenGLStoredQtViewer::paintGL()
+ {
+   if (!readyToPaint) {
+     printf("\n\nG4OpenGLStoredQtViewer::paintGL ============  Not ready %d\n",readyToPaint);
+     readyToPaint= true;
+     return;
+   }
+   // DO NOT RESIZE IF SIZE HAS NOT CHANGE :
+   //    WHEN CLICK ON THE FRAME FOR EXAMPLE
+   //    EXECEPT WHEN MOUSE MOVE EVENT
+   if ( !hasToRepaint) {
+     if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
+       printf("\n\nG4OpenGLStoredQtViewer::paintGL ============  Dont repaint\n");
+       return;
+     }
+   }
+   nbPaint++;
+   printf("\n\nG4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
+   WinSize_x = (G4int) width();
+   WinSize_y = (G4int) height();
+   
+   glViewport (0, 0, width(), height());
+   //   glLoadIdentity();
+   
+
+   SetView();
+
+//   //  printf("before ClearView\n");
+   printf("    ClearView\n");
+   
+   ClearView (); //ok, put the background correct
+   DrawView();
+
+   hasToRepaint =false;
+
+   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n\n\n",nbPaint,readyToPaint);
+ }
+
+void G4OpenGLStoredQtViewer::mousePressEvent(QMouseEvent *event)
+{
+  printf("G4OpenGLStoredQtViewer::mousePressEvent\n");
+  G4MousePressEvent(event->pos());
+}
+
+void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
+{
+  G4MouseMoveEvent(event->x(),event->y(),event->buttons());
+  //  DrawView();
+}
+
+
+void G4OpenGLStoredQtViewer::contextMenuEvent(QContextMenuEvent *e)
+{
+  manageContextMenuEvent(e);
+}
+
+void G4OpenGLStoredQtViewer::updateQWidget() {
+  hasToRepaint= true;
+  updateGL();
+  hasToRepaint= false;
 }