Changeset 559 for trunk/geant4/visualization

Timestamp:

Aug 13, 2007, 4:59:11 PM (17 years ago)

Author:

garnier

Message:

r721@mac-90108: laurentgarnier | 2007-07-13 12:20:45 +0200
Init OK Run OK, mais le resize NOK

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLImmediateQtViewer.hh (modified) (2 diffs)
• src/G4OpenGLImmediateQtViewer.cc (modified) (3 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -41 +41 @@
 #include "G4OpenGLQtViewer.hh"
 #include <QGLWidget>
+#include <QPaintEvent>
 
 #include "globals.hh"
@@ -60 +61 @@
   void resizeGL(int width,int height);
   void paintGL();
+  void paintEvent(QPaintEvent*);
 private : 
   int readyToPaint;

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

@@ -151 +151 @@
    FinishView ();
   printf("G4OpenGLImmediateQtViewer::DrawView2 %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
-
+  readyToPaint = false;
 }
 
@@ -192 +192 @@
 }
 
+void G4OpenGLImmediateQtViewer::paintEvent (
+ QPaintEvent * event
+ )
+{
+//   printf("G4OpenGLImmediateQtViewer::paintEvent VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
+//   printf("Type of Event %d \n",event->type());
+//   printf("G4OpenGLImmediateQtViewer::paintEvent ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+  return paintGL();
+}
+
+
 void G4OpenGLImmediateQtViewer::paintGL()
  {
    if (!readyToPaint)
      return;
+   // DO NOT RESIZE IF SIZE HAS NOT CHANGE
+   if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
+     return;
+   }
    nbPaint++;
    printf("\n\nG4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d\n",nbPaint);
-
    WinSize_x = (G4int) width();
    WinSize_y = (G4int) height();
@@ -211 +225 @@
    //   ClearView (); //ok, put the background correct
    DrawView2();
+   readyToPaint = true; // could be set to false by DrawView
+
    // INIT ok  RUN nok      ShowView();
    //  printf("before ClearView\n");