Changeset 550 for trunk/geant4/visualization/OpenGL

Timestamp:

Jul 10, 2007, 6:15:34 PM (17 years ago)

Author:

garnier

Message:

r696@mac-90108: laurentgarnier | 2007-07-10 18:18:50 +0200
modif non concluantes

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQt.cc (modified) (2 diffs)
• G4OpenGLImmediateQtViewer.cc (modified) (5 diffs)
• G4OpenGLQtViewer.cc (modified) (1 diff)

trunk/geant4/visualization/OpenGL/src/G4OpenGLImmediateQt.cc

@@ -58 +58 @@
 G4VViewer* G4OpenGLImmediateQt::CreateViewer
 (G4VSceneHandler& scene, const G4String& name) {
+  printf("G4OpenGLImmediateQt::CreateViewer \n");
   G4VViewer* pView =
     new G4OpenGLImmediateQtViewer
@@ -75 +76 @@
       " new G4OpenGLImmediateQtViewer." << G4endl;
   }
+  printf("G4OpenGLImmediateQt::CreateViewer END \n");
    return pView;
 }

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

@@ -41 +41 @@
 (G4OpenGLImmediateSceneHandler& sceneHandler,
  const G4String&  name):
-G4OpenGLViewer (sceneHandler),
-G4OpenGLQtViewer (sceneHandler),
-G4OpenGLImmediateViewer (sceneHandler),
-G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name) {
+ G4VViewer (sceneHandler, sceneHandler.IncrementViewCount (), name),
+ G4OpenGLViewer (sceneHandler),
+ G4OpenGLQtViewer (sceneHandler),
+ G4OpenGLImmediateViewer (sceneHandler),
+ QGLWidget()                      // FIXME : gerer le pb du parent !
+ {
 
   if (fViewId < 0) return;  // In case error in base class instantiation.
@@ -50 +52 @@
 
 void G4OpenGLImmediateQtViewer::Initialise() {
-
-  readyToPaint = false;
-
-// ensure a suitable window was found
-
   printf("G4OpenGLImmediateQtViewer::Initialise () 1\n");
   CreateGLQtContext ();
@@ -62 +59 @@
   printf("G4OpenGLImmediateQtViewer::Initialise () 3\n");
   CreateFontLists ();
-  printf("G4OpenGLImmediateQtViewer::Initialise () 4\n");
+}
+
+void G4OpenGLImmediateQtViewer::InitialiseGL () {
+  printf("G4OpenGLImmediateQtViewer::InitialiseGL   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
+  readyToPaint = false;
+
+// ensure a suitable window was found
+
+  printf("G4OpenGLImmediateQtViewer::InitialiseGL () 4\n");
   readyToPaint = true;
 
   InitializeGLView ();
 
-  printf("G4OpenGLImmediateQtViewer::Initialise () 5\n");
+  printf("G4OpenGLImmediateQtViewer::InitialiseGL () 5\n");
 
   // clear the buffers and window.
   //  ClearView ();
-  printf("G4OpenGLImmediateQtViewer::Initialise () 6\n");
+  printf("G4OpenGLImmediateQtViewer::InitialiseGL () 6\n");
   //  FinishView ();
-  printf("G4OpenGLImmediateQtViewer::Initialise () 7\n");
+  printf("G4OpenGLImmediateQtViewer::InitialiseGL () 7\n");
 
   // If a double buffer context has been forced upon us, ignore the
@@ -81 +86 @@
   glDepthFunc (GL_LEQUAL);
   glDepthMask (GL_TRUE);
-  printf("G4OpenGLImmediateQtViewer::Initialise () 8\n");
-
-}
-
-void G4OpenGLImmediateQtViewer::InitialiseGL () {
-  printf("G4OpenGLImmediateQtViewer::Initialise   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
-  printf("G4OpenGLImmediateQtViewer::Initialise  -------------------------------------------------------------------------------------\n");
+  printf("G4OpenGLImmediateQtViewer::InitialiseGL () 8\n");
+
+  printf("G4OpenGLImmediateQtViewer::InitialiseGL  -------------------------------------------------------------------------------------\n");
 }
 
@@ -120 +121 @@
   ProcessView ();
   FinishView ();
-  printf("G4OpenGLImmediateQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
+  printf("G4OpenGLImmediateQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
 
 }

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -227 +227 @@
   GLWindow->setLayout(mainLayout);
   GLWindow->setWindowTitle("QGl Viewer");
-  // GLWindow->resize(300, 300);
+  GLWindow->resize(300, 300);
   GLWindow->show();