Changeset 541 for trunk/geant4/visualization/OpenGL

Timestamp:

Jul 6, 2007, 3:03:56 PM (17 years ago)

Author:

garnier

Message:

r686@mac-90108: laurentgarnier | 2007-07-06 15:07:30 +0200
mise a jour de la visu OpenGl. Ne marche pas encore

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLImmediateQtViewer.hh (modified) (1 diff)
• include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• src/G4OpenGLImmediateQtViewer.cc (modified) (5 diffs)
• src/G4OpenGLImmediateSceneHandler.cc (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (4 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLImmediateQtViewer.hh

@@ -57 +57 @@
   void resizeGL(int width,int height);
   void paintGL();
+private : 
+  int readyToPaint;
 };
 

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

@@ -43 +43 @@
 
 #include <QGLWidget>
+#include <QDialog>
 
 class G4OpenGLSceneHandler;
@@ -62 +63 @@
   G4int WinSize_y;
   QGLWidget* fWindow;
+  QDialog* GLWindow;
 private:
   //  static LRESULT CALLBACK WindowProc(HWND,UINT,WPARAM,LPARAM);

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

@@ -51 +51 @@
 void G4OpenGLImmediateQtViewer::Initialise () {
 
+  readyToPaint = false;
+
 // ensure a suitable window was found
 
   printf("G4OpenGLImmediateQtViewer::Initialise () 1\n");
   CreateGLQtContext ();
+
   CreateMainWindow (this);
   CreateFontLists ();
@@ -68 +71 @@
   glDepthFunc (GL_LEQUAL);
   glDepthMask (GL_TRUE);
+
+  readyToPaint = true;
 }
 
@@ -83 +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);
 
 }
@@ -134 +149 @@
   glOrtho(-0.5, +0.5, +0.5, -0.5, 4.0, 15.0);
   glMatrixMode(GL_MODELVIEW);
+  printf("G4OpenGLImmediateQtViewer::resizeGL terminé \n");
 }
 
@@ -139 +155 @@
  {
   printf("G4OpenGLImmediateQtViewer::paintGL \n");
+  if (!readyToPaint)
+    return;
+
+  WinSize_x = (G4int) width();
+  WinSize_y = (G4int) height();
+
+  glViewport (0, 0, width(), height());
+
+  ClearView ();
+  DrawView ();
+
   // FIXME
   //  FinishView();

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

@@ -151 +151 @@
 
 void G4OpenGLImmediateSceneHandler::ClearTransientStore () {
-
   G4VSceneHandler::ClearTransientStore ();
 

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

@@ -82 +82 @@
   //   if(!fHDC) return;
   glFlush ();
+
 //   // Empty the Windows message queue :
 //   MSG event;
@@ -123 +124 @@
   printf("G4OpenGLQtViewer::CreateMainWindow 3\n");
 
-  QPushButton hello("Hello world!");
-  hello.resize(100, 30);
-  hello.show();
-
   fWindow = new QGLWidget() ;
+  printf("G4OpenGLQtViewer::CreateMainWindow 4\n");
   fWindow->makeCurrent();
+  printf("G4OpenGLQtViewer::CreateMainWindow 5\n");
 
   // create window
-  QDialog* GLWindow ;
+  printf("G4OpenGLQtViewer::CreateMainWindow 6\n");
   if (qApp) {
     GLWindow = new QDialog();//qApp->mainWidget());
@@ -138 +137 @@
   }
 
+  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");
-  GLWindow->resize(100, 30);
+  printf("G4OpenGLQtViewer::CreateMainWindow 12\n");
+  GLWindow->resize(100, 300);
   GLWindow->show();
 
@@ -220 +225 @@
 
   // create window
-  QDialog* GLWindow ;
   if (qApp) {
     GLWindow = new QDialog();//qApp->mainWidget());