Changeset 1307 for trunk

Timestamp:

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

Author:

garnier

Message:

fixes et cvs update

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• src/G4OpenGLImmediateQtViewer.cc (modified) (5 diffs)
• src/G4OpenGLImmediateSceneHandler.cc (modified) (2 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (6 diffs)
• src/G4OpenGLStoredSceneHandler.cc (modified) (2 diffs)
• src/G4OpenGLStoredXViewer.cc (modified) (2 diffs)
• src/G4OpenGLViewer.cc (modified) (3 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.174 2010/05/30 09:53:05 allison Exp $
+$Id: History,v 1.178 2010/06/04 15:27:47 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+4th June 2010  Laurent Garnier
+- G4OpenGLImmediate/StoredQtViewer : Add protection against multiple
+  repaint call. Add protection against resizeGl with bad values
+
+3rd June 2010  John Allison  (opengl-V09-03-06)
+- G4OpenGLImmediateSceneHandler: Re-instate
+  // Make sure screen corresponds to graphical database...
+  if (fpViewer) {
+    fpViewer -> SetView ();
+    fpViewer -> ClearView ();
+    fpViewer -> DrawView ();
+  }
+  I was wrong - it *is* necessary.  If not there, events are not refreshed.
+  So this and similar changes below are all back to geant4-09-03, including
+  glFlush, which is still a big performance penalty on Mac's Snow Leopard.
+
+3rd June 2010  John Allison  (opengl-V09-03-05)
+- Restored following files to geant4-09-03 in interests of stable behaviour:
+  o G4OpenGLStoredSceneHandler.cc
+    Restored code removed in opengl-V09-03-03:
+  // Make sure screen corresponds to graphical database...
+  if (fpViewer) {
+    fpViewer -> SetView ();
+    fpViewer -> ClearView ();
+    fpViewer -> DrawView ();
+  }
+  o G4OpenGLStoredXViewer.cc:
+    Restore to geant4-09-03.  Restored code removed in opengl-V09-03-03:
+      } else { // ADD TO AVOID KernelVisit=1 and nothing to display
+        DrawDisplayLists ();
+        FinishView ();
+- Note: G4OpenGLImmediateSceneHandler: Same code commented out.  I think
+  it's not necessary for immediate mode.
 
 30th May 2010  John Allison  (opengl-V09-03-04)

trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.22 2010/05/26 14:50:56 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.23 2010/06/04 15:27:47 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -129 +129 @@
   bool fHasToRepaint;
   bool fReadyToPaint;
+  bool fIsRepainting;
 
 private:

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.18 2010/03/10 11:03:46 lgarnier Exp $
-// GEANT4 tag $Name: vis-V09-03-06 $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.19 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.
@@ -148 +149 @@
 ,int aHeight)
 {  
-  ResizeWindow(aWidth,aHeight);
-  fHasToRepaint = sizeHasChanged();
+  if ((aWidth > 0) && (aHeight > 0)) {
+    ResizeWindow(aWidth,aHeight);
+    fHasToRepaint = sizeHasChanged();
+  }
 }
 
@@ -155 +158 @@
 void G4OpenGLImmediateQtViewer::paintGL()
 {
+  if (fIsRepainting) {
+    return ;
+  }
 #ifdef G4DEBUG_VIS_OGL
   printf("\n\nG4OpenGLImmediateQtViewer::paintGL ??\n");
@@ -208 +214 @@
   printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ready %d\n\n\n",fReadyToPaint);
 #endif
+  fIsRepainting = false;
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.32 2010/05/29 15:52:49 allison Exp $
-// GEANT4 tag $Name: vis-V09-03-06 $
+// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.35 2010/06/03 20:35:19 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -203 +203 @@
 
 void G4OpenGLImmediateSceneHandler::ClearTransientStore () {
+
   G4VSceneHandler::ClearTransientStore ();
+
+  // Make sure screen corresponds to graphical database...
+  if (fpViewer) {
+    fpViewer -> SetView ();
+    fpViewer -> ClearView ();
+    fpViewer -> DrawView ();
+  }
 }
 

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;
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.41 2010/05/29 15:52:49 allison Exp $
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.42 2010/06/03 08:23:02 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -361 +361 @@
     glDeleteLists(fTOList[i].fDisplayListId, 1);
   fTOList.clear ();
+
+  // Make sure screen corresponds to graphical database...
+  if (fpViewer) {
+    fpViewer -> SetView ();
+    fpViewer -> ClearView ();
+    fpViewer -> DrawView ();
+  }
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredXViewer.cc,v 1.26 2010/05/29 15:56:50 allison Exp $
-// GEANT4 tag $Name: vis-V09-03-06 $
+// $Id: G4OpenGLStoredXViewer.cc,v 1.27 2010/06/03 08:26:55 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -133 +133 @@
         FinishView ();
       } else { // ADD TO AVOID KernelVisit=1 and nothing to display
-        //DrawDisplayLists ();  ????????? (JA)
-        //FinishView ();        ????????? (JA)
+        DrawDisplayLists ();
+        FinishView ();
       }
     }

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

@@ -177 +177 @@
   glViewport(0, 0, fWinSize_x,fWinSize_y); 
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::ResizeGLView END %d %d &:%d\n",fWinSize_x,fWinSize_y,this);
+#endif
   
 }
@@ -186 +189 @@
     return;
   }
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::SetView\n");
+#endif
   // Calculates view representation based on extent of object being
   // viewed and (initial) viewpoint.  (Note: it can change later due
@@ -330 +336 @@
   background = fVP.GetBackgroundColour ();
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::SetView END\n");
+#endif
 }