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

Timestamp:

May 12, 2009, 5:26:25 PM (15 years ago)

Author:

garnier

Message:

remise a jour

File:

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

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

@@ -57 +57 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  fNeedRepaint =false;
+  hasToRepaint =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
 }
 
@@ -99 +96 @@
 
   if (fSceneHandler.GetScene() == 0) {
-    fNeedRepaint =false;
+    hasToRepaint =false;
   } else {
-    fNeedRepaint =true;
+    hasToRepaint =true;
   }
 
@@ -120 +117 @@
   // And we loose the redraw of things !
   
-  // avoid problems at initialisation
-  if (readyToPaint) {
-    ComputeView();
-  }
-
+  ComputeView();
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
@@ -133 +126 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::ComputeView  VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
+  printf("G4OpenGLStoredQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",getWinWidth(), getWinHeight());
 #endif
   makeCurrent();
@@ -202 +195 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::ComputeView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
-#endif
+  printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight());
+#endif
+  hasToRepaint =true;
 }
 
@@ -211 +205 @@
 */
 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);
-  //  fNeedRepaint = true;
+  ResizeWindow(aWidth,aHeight);
+  hasToRepaint = sizeHasChanged();
 }
 
@@ -229 +223 @@
     return;
   }
-  RepaintGLView();
-
+  // DO NOT RESIZE IF SIZE HAS NOT CHANGE :
+  //    WHEN CLICK ON THE FRAME FOR EXAMPLE
+  //    EXECEPT WHEN MOUSE MOVE EVENT
+  if ( !hasToRepaint) {
+    if (((getWinWidth() == (unsigned int)width())) &&(getWinHeight() == (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;
+     
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",readyToPaint);
@@ -277 +288 @@
 
 void G4OpenGLStoredQtViewer::updateQWidget() {
-  fNeedRepaint= true;
+  hasToRepaint= true;
   updateGL();
-  fNeedRepaint= false;
+  hasToRepaint= false;
 }