Changeset 1038 for trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

Timestamp:

May 12, 2009, 11:04:00 AM (15 years ago)

Author:

garnier

Message:

en test pour les refresh, ne marche pas bien

File:

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

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

@@ -57 +57 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  hasToRepaint =false;
+  fNeedRepaint =false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -78 +78 @@
   
   readyToPaint = true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredQtViewer::Initialise END\n");
+#endif
 }
 
@@ -96 +99 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    hasToRepaint =false;
+    fNeedRepaint =false;
   } else {
-    hasToRepaint =true;
+    fNeedRepaint =true;
   }
 
@@ -117 +120 @@
   // And we loose the redraw of things !
   
-  ComputeView();
+  // avoid problems at initialisation
+  if (readyToPaint) {
+    ComputeView();
+  }
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -197 +204 @@
   printf("G4OpenGLStoredQtViewer::ComputeView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 #endif
-  hasToRepaint =true;
 }
 
@@ -205 +211 @@
 */
 void G4OpenGLStoredQtViewer::resizeGL(
-                                      int aWidth
-                                      ,int aHeight)
+ int aWidth
+,int aHeight)
 {  
   // Set new size, it will be update when next Repaint()->SetView() called
   ResizeGLView(aWidth,aHeight);
-  //  hasToRepaint = true;
+  //  fNeedRepaint = true;
 }
 
@@ -223 +229 @@
     return;
   }
-  // DO NOT RESIZE IF SIZE HAS NOT CHANGE :
-  //    WHEN CLICK ON THE FRAME FOR EXAMPLE
-  //    EXECEPT WHEN MOUSE MOVE EVENT
-//   if ( !hasToRepaint) {
-//     if (((fWinSize_x == (unsigned int)width())) &&(fWinSize_y == (unsigned int) height())) {
-//       return;
-//     }
-//   }
-#ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ready %d\n",readyToPaint);
-#endif
-
-  SetView();
-          
-  ClearView (); //ok, put the background correct
-  ComputeView();
-     
-  hasToRepaint =false;
-     
+  RepaintGLView();
+
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint);
@@ -288 +277 @@
 
 void G4OpenGLStoredQtViewer::updateQWidget() {
-  hasToRepaint= true;
+  fNeedRepaint= true;
   updateGL();
-  hasToRepaint= false;
+  fNeedRepaint= false;
 }