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

Timestamp:

Nov 6, 2008, 2:44:17 PM (16 years ago)

Author:

garnier

Message:

OpenGL Qt improvments. See History file

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.19 2008/10/24 13:49:19 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.20 2008/11/06 13:43:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -108 +108 @@
 
 void G4OpenGLStoredQtViewer::DrawView () {
-
-#ifdef G4DEBUG
-  printf("G4OpenGLStoredQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
-#endif
+#ifdef G4DEBUG
+  printf("G4OpenGLStoredQtViewer::DrawView  VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
+#endif
+  // That's no the same logic as Immediate Viewer, I don't know why...
+  // But if I send updateGL here, we go here :
+  //  updateQWidget -> paintGL -> ComputeView
+  // whih is not the same as ComputeView Directly
+  // And we loose the redraw of things !
+  
+  ComputeView();
+#ifdef G4DEBUG
+  printf("G4OpenGLStoredQtViewer::DrawView  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
+#endif
+}
+
+void G4OpenGLStoredQtViewer::ComputeView () {
+
+#ifdef G4DEBUG
+  printf("G4OpenGLStoredQtViewer::ComputeView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
+#endif
+  makeCurrent();
   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
 
   //Make sure current viewer is attached and clean...
-  //Qt version needed
-  //   glViewport (0, 0, WinSize_x, WinSize_y);
 
   //See if things have changed from last time and remake if necessary...
@@ -123 +138 @@
   // if necessary...
   if (!fNeedKernelVisit) {
-    if (!fNeedKernelVisit) KernelVisitDecision ();
+    KernelVisitDecision ();
   }
   G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
@@ -132 +147 @@
      haloing_enabled) {
 #ifdef G4DEBUG
-    printf("G4OpenGLStoredQtViewer::DrawView DANS LE IF\n");
+    printf("G4OpenGLStoredQtViewer::ComputeView DANS LE IF\n");
 #endif
 
@@ -150 +165 @@
     if (!kernelVisitWasNeeded) {
 #ifdef G4DEBUG
-      printf("**************************  G4OpenGLStoredQtViewer::DrawView Don't need kernel Visit \n");
+      printf("**************************  G4OpenGLStoredQtViewer::ComputeView Don't need kernel Visit \n");
 #endif
       DrawDisplayLists ();
@@ -156 +171 @@
     } else {
 #ifdef G4DEBUG
-      printf("**************************  G4OpenGLStoredQtViewer::DrawView need kernel Visit \n");
+      printf("**************************  G4OpenGLStoredQtViewer::ComputeView need kernel Visit \n");
 #endif
       // However, union cutaways are implemented in DrawDisplayLists, so make
@@ -180 +195 @@
 
 #ifdef G4DEBUG
-  printf("G4OpenGLStoredQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
+  printf("G4OpenGLStoredQtViewer::ComputeView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
 #endif
   hasToRepaint =true;
@@ -225 +240 @@
           
   ClearView (); //ok, put the background correct
-  DrawView();
+  ComputeView();
      
   hasToRepaint =false;
@@ -280 +295 @@
 }
 
-
-#endif
+void G4OpenGLStoredQtViewer::ShowView (
+) 
+//////////////////////////////////////////////////////////////////////////////
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
+{
+#if QT_VERSION < 0x040000
+  setActiveWindow();
+#else
+  activateWindow();
+#endif
+  updateQWidget();
+}
+
+#endif