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

Timestamp:

Jun 4, 2010, 5:28:11 PM (14 years ago)

Author:

garnier

Message:

fixes et cvs update

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.29 2010/03/10 11:03:46 lgarnier Exp $
-// GEANT4 tag $Name: vis-V09-03-06 $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.30 2010/06/04 15:27:47 lgarnier Exp $
+// GEANT4 tag $Name:  $
 //
 //
@@ -53 +53 @@
   setFocusPolicy(Qt::StrongFocus); // enable keybord events
 #endif
-  fHasToRepaint =false;
+  fHasToRepaint = false;
+  fIsRepainting = false;
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -181 +182 @@
   printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",getWinWidth(), getWinHeight());
 #endif
-  fHasToRepaint =true;
+  fHasToRepaint = true;
 }
 
@@ -193 +194 @@
 {  
   // Set new size, it will be update when next Repaint()->SetView() called
-  ResizeWindow(aWidth,aHeight);
-  fHasToRepaint = sizeHasChanged();
+  if ((aWidth > 0) && (aHeight > 0)) {
+    ResizeWindow(aWidth,aHeight);
+    fHasToRepaint = sizeHasChanged();
+  }
 }
 
@@ -205 +208 @@
 void G4OpenGLStoredQtViewer::paintGL()
 {
+  if (fIsRepainting) {
+    return ;
+  }
+  fIsRepainting = true;
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::paintGL ready:%d fHasTo:%d??\n",fReadyToPaint,fHasToRepaint);
@@ -240 +247 @@
 
   SetView();
-          
+
   ClearView (); //ok, put the background correct
   ComputeView();
 
-  fHasToRepaint =false;
+  fHasToRepaint = false;
 
 #ifdef G4DEBUG_VIS_OGL
   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n",fReadyToPaint);
 #endif
+  fIsRepainting = false;
 }