Changeset 980 for trunk/source/visualization/OpenGL/src

Timestamp:

Apr 15, 2009, 12:00:49 PM (15 years ago)

Author:

garnier

Message:

passage de print OK

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLImmediateXmViewer.cc (modified) (2 diffs)
• G4OpenGLStoredSceneHandler.cc (modified) (3 diffs)
• G4OpenGLViewer.cc (modified) (4 diffs)
• G4OpenGLXViewer.cc (modified) (7 diffs)

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

@@ -37 +37 @@
 #include "G4OpenGLImmediateXmViewer.hh"
 #include "G4OpenGLImmediateSceneHandler.hh"
+#include "G4StateManager.hh"
 
 #include "G4ios.hh"
@@ -116 +117 @@
   printf("G4OpenGLImmediateXmViewer::DrawView : need Kernel/Process/Finish\n");
 #endif
+
+
   NeedKernelVisit ();  // Always need to visit G4 kernel.
+
+  // Change G4 State in order to redraw everything even when state is not IDLE
+  G4StateManager* stateManager = G4StateManager::GetStateManager(); 
+  G4ApplicationState oldState = stateManager->GetCurrentState(); 
+  stateManager->SetNewState(G4State_Idle);  
+
   ProcessView ();
+
+  stateManager->SetNewState(oldState);  
   FinishView ();
+
 
 }

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

@@ -196 +196 @@
     glPopMatrix();
 #ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLStoredSceneHandler::AddPrimitivePostamble glFlush\n");
+    //    printf("G4OpenGLStoredSceneHandler::AddPrimitivePostamble glFlush\n");
 #endif
     glFlush ();
@@ -215 +215 @@
 
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredSceneHandler::AddPrimitive\n");
+  //  printf("G4OpenGLStoredSceneHandler::AddPrimitive\n");
 #endif
   std::vector< G4Polymarker > poly;
@@ -288 +288 @@
 #endif  
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredSceneHandler::AddPrimitive new marker list\n");
+  //  printf("G4OpenGLStoredSceneHandler::AddPrimitive new marker list\n");
 #endif
   AddPrimitivePreamble(polymarker);

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

@@ -438 +438 @@
   int size;
 
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLViewer::grabPixels\n");
+#endif
   if (inColor) {
     format = GL_RGB;
@@ -466 +469 @@
   glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
 
+  glReadBuffer(GL_FRONT);
   glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
 
@@ -485 +489 @@
 #endif
   if (fVectoredPs) {
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLViewer::printEPS Vectored\n");
+#endif
     res = printVectoredEPS();
   } else {
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLViewer::printEPS NON Vectored\n");
+#endif
 
     G4OpenGLXViewer* pOGLXViewer = dynamic_cast<G4OpenGLXViewer*>(this);
-    if (pOGLXViewer) {
-      pOGLXViewer->printEPS();
-    } else {
+//     if (pOGLXViewer) {
+//       res = printNonVectoredEPS();
+//       pOGLXViewer->printEPS();
+//       fPrintFilename = "G4OpenGLViewer_Print.eps";
+//     } else {
       res = printNonVectoredEPS();
-    }
+//     }
   }
   if (res == false) {
@@ -631 +643 @@
   fWinSize_x = width;
   fWinSize_y = height;
+  glReadBuffer(GL_FRONT);
   ResizeGLView();
   if (fGL2PSAction->enableFileWriting()) {

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

@@ -92 +92 @@
 
 void G4OpenGLXViewer::SetView () {
-  glXMakeCurrent (dpy, win, cx);
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLXViewer::SetView \n");
+#endif
+  Bool success = glXMakeCurrent (dpy, win, cx);
+  if (!success) {
+    fViewId = -1;  // This flags an error.
+    G4cerr << "G4OpenGLViewer::G4OpenGLViewer failed to attach a GLX context."
+           << G4endl;
+    GLint error = GL_NO_ERROR;
+    while ((error = glGetError()) != GL_NO_ERROR) {
+      G4cout << "GL Error: " << gluErrorString(error) << G4endl;
+    }
+    return;
+  }
   G4OpenGLViewer::SetView ();  
 }
@@ -429 +442 @@
     printf("G4OpenGLXViewer::print non Vectored\n");
 #endif
-    //    G4OpenGLViewer::printEPS();    
-
+    G4OpenGLViewer::printEPS();    
+    return;
+
+
+
+    std::string fileTst = "G4OpenGL_XPixmapTestWithoutPixmap.eps";
+    generateEPSX (fileTst.c_str(),
+                  fPrintColour,
+                  fWinSize_x, fWinSize_y);
+    
 
 
@@ -448 +469 @@
 
 // save context before
+    XVisualInfo* tmp_vi = vi;
+    GLXDrawable tmp_win = win;
     tmp_cx = cx;
+
     XVisualInfo* pvi;
     GLXContext pcx = create_GL_print_context(pvi);
@@ -458 +482 @@
 
 #ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLXViewer::print Create pixmap  Size :%d %d\n",fWinSize_x, fWinSize_y);
+    printf("G4OpenGLXViewer::print Create pixmap  Size :%d %d --- %d %d %d\n",fWinSize_x, fWinSize_y,vi,win,cx);
 #endif
     cx=pcx;
@@ -484 +508 @@
 
 
-    GLXDrawable tmp_win;
-    tmp_win=win;
     win=glxpmap;
     
@@ -544 +566 @@
     fWinSize_x = winX;
 #endif
-    win=tmp_win;
-    cx=tmp_cx;
-    
-//     bool er2 = glXMakeCurrent (dpy,
-//                  win,
-//                  cx);
-#ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLXViewer::print Restored \n");
+    vi = tmp_vi;
+    win = tmp_win;
+    cx = tmp_cx;
+    
+    glXMakeCurrent (dpy, win, cx);
+    //     XVisualInfo*  pvi = glXChooseVisual (dpy,
+    //                                          XDefaultScreen (dpy),
+    //                                          snglBuf_RGBA);
+    
+    //     if (!pvi) {
+    //       pvi = glXChooseVisual (dpy,
+    //                              XDefaultScreen (dpy),
+    //                              dblBuf_RGBA);
+    //     }
+    
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLXViewer::print Restored %d %d %d\n",vi,win,cx);
 #endif
     //    printf("Error 1:%d 2:%d\n",er1,er2);
     
+
     // Free print context 
     XFreePixmap(dpy,pmap);
@@ -666 +698 @@
 
 
+  glReadBuffer(GL_FRONT);
   for (unsigned int i=0;i<height;i++) {
     glReadPixels (0, i, (GLsizei)width, 1, format, GL_UNSIGNED_BYTE, (GLvoid*) lineBuffer);