Changeset 542 for trunk/geant4/visualization/OpenGL/src

Timestamp:

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

Author:

garnier

Message:

r688@mac-90108: laurentgarnier | 2007-07-06 18:41:19 +0200
mise a jour de la visu OpenGl. Ne marche pas encore, en version lente

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLImmediateQtViewer.cc (modified) (6 diffs)
• G4OpenGLQtViewer.cc (modified) (6 diffs)

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

@@ -77 +77 @@
 void G4OpenGLImmediateQtViewer::DrawView () {
 
-  printf("G4OpenGLImmediateQtViewer::DrawView %d %d\n",WinSize_x, WinSize_y);
+  printf("G4OpenGLImmediateQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
   // If a double buffer context has been forced upon us, ignore the
   // back buffer for this OpenGLImmediate view.
@@ -88 +88 @@
   //glXMakeCurrent (dpy, win, cx);
   glViewport (0, 0, WinSize_x, WinSize_y);
-  printf("******************* 1\n");
 
   if(style!=G4ViewParameters::hlr &&
      haloing_enabled) {
-  printf("******************* 3\n");
 
     HaloingFirstPass ();
-  printf("******************* 4\n");
     NeedKernelVisit ();
-  printf("******************* 5\n");
     ProcessView ();
-  printf("******************* 6\n");
     glFlush ();
-  printf("******************* 7\n");
 
     HaloingSecondPass ();
-  printf("******************* 8\n");
 
   }
 
   NeedKernelVisit ();  // Always need to visit G4 kernel.
-  printf("******************* 9\n");
   ProcessView ();
-  printf("******************* 10\n");
   FinishView ();
-  printf("G4OpenGLImmediateQtViewer::DrawView %d %d   terminé\n",WinSize_x, WinSize_y);
+  printf("G4OpenGLImmediateQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
 
 }
@@ -124 +115 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  printf("G4OpenGLImmediateQtViewer::FinishView \n");
+  printf("G4OpenGLImmediateQtViewer::FinishView VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
   //    if(!fHDC) return;
 
   glFlush ();
+  printf("G4OpenGLImmediateQtViewer::FinishView ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 
   // Empty the Windows message queue :
@@ -142 +134 @@
 ,int height)
 {
-  printf("G4OpenGLImmediateQtViewer::resizeGL \n");
+  printf("G4OpenGLImmediateQtViewer::resizeGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
   int side = qMin(width, height);
   glViewport((width - side) / 2, (height - side) / 2, side, side);
@@ -149 +141 @@
   glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
   glMatrixMode(GL_MODELVIEW);
-  printf("G4OpenGLImmediateQtViewer::resizeGL terminé \n");
+  printf("G4OpenGLImmediateQtViewer::resizeGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 }
 
 void G4OpenGLImmediateQtViewer::paintGL()
  {
-  printf("G4OpenGLImmediateQtViewer::paintGL \n");
+  printf("G4OpenGLImmediateQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV \n");
   if (!readyToPaint)
     return;
@@ -163 +155 @@
   glViewport (0, 0, width(), height());
 
-  ClearView ();
-  DrawView ();
-
+  SetView();
+  ClearView (); //ok, put the background correct
+  float b=3;
+  for (int a=0;a<100000000;a++) {b = b/3.1456;}
+  DrawView();
+  for (int a=0;a<100000000;a++) {b = b/3.1456;}
+  ShowView();
+  for (int a=0;a<100000000;a++) {b = b/3.1456;}
+  //  makeCurrent();
+  printf("G4OpenGLImmediateQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
   // FIXME
   //  FinishView();

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

@@ -60 +60 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  printf("G4OpenGLQtViewer::SetView \n");
+  printf("G4OpenGLQtViewer::SetView ++++++++++++++++++++\n");
 //   if(!fHDC) return;
 //   if(!fHGLRC) return;
@@ -66 +66 @@
   fWindow->makeCurrent();
   G4OpenGLViewer::SetView ();  
+  printf("G4OpenGLQtViewer::SetView --------------------\n");
 }
 
@@ -79 +80 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!//
 {
-  printf("G4OpenGLQtViewer::ShowView \n");
+  printf("G4OpenGLQtViewer::ShowView  +++++++++++++++++++++\n");
   //   if(!fHDC) return;
   glFlush ();
+  printf("G4OpenGLQtViewer::ShowView -----------------------\n");
 
 //   // Empty the Windows message queue :
@@ -122 +124 @@
   G4Qt* interactorManager = G4Qt::getInstance ();
   //  G4UImanager* UI = G4UImanager::GetUIpointer();
-  printf("G4OpenGLQtViewer::CreateMainWindow 3\n");
 
   fWindow = new QGLWidget() ;
-  printf("G4OpenGLQtViewer::CreateMainWindow 4\n");
   fWindow->makeCurrent();
-  printf("G4OpenGLQtViewer::CreateMainWindow 5\n");
 
   // create window
-  printf("G4OpenGLQtViewer::CreateMainWindow 6\n");
   if (qApp) {
     GLWindow = new QDialog();//qApp->mainWidget());
@@ -137 +135 @@
   }
 
-  printf("G4OpenGLQtViewer::CreateMainWindow 7\n");
-  printf("G4OpenGLQtViewer::CreateMainWindow 8\n");
   QHBoxLayout *mainLayout = new QHBoxLayout;
-  printf("G4OpenGLQtViewer::CreateMainWindow 9\n");
   mainLayout->addWidget(fWindow);
-  printf("G4OpenGLQtViewer::CreateMainWindow 10\n");
   GLWindow->setLayout(mainLayout);
-  printf("G4OpenGLQtViewer::CreateMainWindow 11\n");
   GLWindow->setWindowTitle("QGl Viewer");
-  printf("G4OpenGLQtViewer::CreateMainWindow 12\n");
   GLWindow->resize(100, 300);
   GLWindow->show();
@@ -219 +211 @@
   G4Qt* interactorManager = G4Qt::getInstance ();
   //  G4UImanager* UI = G4UImanager::GetUIpointer();
-  printf("G4OpenGLQtViewer::CreateMainWindow 3\n");
 
   fWindow = glWidget ;