Changeset 1327 for trunk

Timestamp:

Jul 28, 2010, 3:13:24 PM (14 years ago)

Author:

garnier

Message:

bug fix ?

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLStoredQtViewer.cc (modified) (3 diffs)
• G4OpenGLViewer.cc (modified) (2 diffs)

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

@@ -48 +48 @@
 {
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredQtViewer::constructor VVVVVVVVVVVV\n");
+#endif
 #if QT_VERSION < 0x040000
   setFocusPolicy(QWidget::StrongFocus); // enable keybord events
@@ -56 +59 @@
   fIsRepainting = false;
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredQtViewer::constructor ^^^^^^^^^^^^\n");
+#endif
   if (fViewId < 0) return;  // In case error in base class instantiation.
 }
@@ -68 +74 @@
 void G4OpenGLStoredQtViewer::Initialise() {
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredQtViewer::Initialise 1\n");
+  printf("G4OpenGLStoredQtViewer::Initialise VVVVVVVVVVVV\n");
 #endif
   fReadyToPaint = false;
+  initializeGL ();
   CreateMainWindow (this,QString(GetName()));
   CreateFontLists ();
   
   fReadyToPaint = true;
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredQtViewer::Initialise ^^^^^^^^^^^^\n");
+#endif
 }
 
 void G4OpenGLStoredQtViewer::initializeGL () {
 
-  InitializeGLView ();
+  QGLWidget::initializeGL(); 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLStoredQtViewer::InitialiseGL () 0\n");
+#endif
+  //  return;
+  //    InitializeGLView ();
 
 #ifdef G4DEBUG_VIS_OGL

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

@@ -101 +101 @@
   //  glDisable (GL_POLYGON_SMOOTH);
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::Creation !!\n");
+#endif
 }
 
@@ -107 +110 @@
 void G4OpenGLViewer::InitializeGLView () 
 {
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::InitializeGLView VVVVV\n");
+#endif
   glClearColor (0.0, 0.0, 0.0, 0.0);
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::InitializeGLView ---1---\n");
+#endif
   glClearDepth (1.0);
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::InitializeGLView ---2---\n");
+#endif
   glDisable (GL_BLEND);
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::InitializeGLView ---3---\n");
+#endif
   glDisable (GL_LINE_SMOOTH);
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::InitializeGLView ---4---\n");
+#endif
   glDisable (GL_POLYGON_SMOOTH);
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::InitializeGLView ---5---\n");
+#endif
 
   //  if (fVP != NULL) {
-    fWinSize_x = fVP.GetWindowSizeHintX();
-    fWinSize_y = fVP.GetWindowSizeHintY();
-    //  }
+  fWinSize_x = fVP.GetWindowSizeHintX();
+  fWinSize_y = fVP.GetWindowSizeHintY();
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::InitializeGLView ^^^^^^\n");
+#endif
+  //  }
 }