Changeset 975 for trunk/source/visualization/OpenGL

Timestamp:

Apr 8, 2009, 6:56:12 PM (15 years ago)

Author:

garnier

Message:

Improvments for print in pixmap. Not finish yet

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• include/G4OpenGLViewer.hh (modified) (1 diff)
• include/G4OpenGLXViewer.hh (modified) (2 diffs)
• src/G4OpenGLImmediateXmViewer.cc (modified) (2 diffs)
• src/G4OpenGLStoredViewer.cc (modified) (2 diffs)
• src/G4OpenGLStoredWin32Viewer.cc (modified) (1 diff)
• src/G4OpenGLStoredXViewer.cc (modified) (3 diffs)
• src/G4OpenGLStoredXmViewer.cc (modified) (3 diffs)
• src/G4OpenGLViewer.cc (modified) (3 diffs)
• src/G4OpenGLXViewer.cc (modified) (14 diffs)
• src/G4OpenGLXmWindowHandlingCallbacks.cc (modified) (1 diff)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.134 2009/04/08 15:15:07 lgarnier Exp $
+$Id: History,v 1.135 2009/04/08 16:55:44 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -23 +23 @@
 8th April 2009, Laurent Garnier
  - G4OpenGLBitmapStore.hh : BugFix correction for windows (introduce 2nd February ?)
+ - G4OpenGLViewer.hh : move methods in private
+ - G4OpenGLXViewer.hh : Add debug methods
+ - G4OpenGLImmediateXmViewer.cc, G4OpenGLStoredViewer.cc, G4OpenGLStoredXmViewer.cc,
+   G4OpenGLStoredXViewer.cc, G4OpenGLViewer.cc   : Add debug messages
+ - G4OpenGLStoredXmViewer.cc,G4OpenGLStoredXViewer.cc, G4OpenGLStoredWin32Viewer.cc :
+   - Add a DrawDisplay list in case of KernelVisit=1 and  nothing new to display. 
+   - Add a flush at the end of the view.
+ - G4OpenGLViewer.cc : 
+   - Improve the fix and resizing when X/Y size was even (lack of precision
+     in a /2)
+   - Set line/point size at a default size when printing.
+ - G4OpenGLXmWindowsHandlingCallbacks.cc : print method rename in printEPS
+ - G4OpenGLXViewer.cc : Lot of changes, try to debug it. Pb when printing in pixmap
+   mode on some windows size
 
 6th April 2009, Joseph Perl (opengl-V09-02-02)

trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.hh,v 1.29 2009/03/05 16:36:13 lgarnier Exp $
+// $Id: G4OpenGLViewer.hh,v 1.30 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

trunk/source/visualization/OpenGL/include/G4OpenGLXViewer.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.hh,v 1.30 2009/02/04 16:48:41 lgarnier Exp $
+// $Id: G4OpenGLXViewer.hh,v 1.31 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -80 +80 @@
   Colormap                          cmap;
   XSetWindowAttributes              swa;
-  GLXDrawable                       fGLXWin;
+  GLXDrawable                       win;
   GLXContext                        cx;
   XEvent                            event;

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateXmViewer.cc,v 1.20 2009/02/04 16:48:41 lgarnier Exp $
+// $Id: G4OpenGLImmediateXmViewer.cc,v 1.21 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -96 +96 @@
 
   //Make sure current viewer is attached and clean...
-  glXMakeCurrent (dpy, fGLXWin, cx);
+  glXMakeCurrent (dpy, win, cx);
 
   if(style!=G4ViewParameters::hlr &&

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredViewer.cc,v 1.25 2009/01/19 16:53:42 lgarnier Exp $
+// $Id: G4OpenGLStoredViewer.cc,v 1.26 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -134 +134 @@
   size_t nPasses = cutawayUnion? cutaways.size(): 1;
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredViewer::DrawDisplayLists %d",nPasses);
+  printf("G4OpenGLStoredViewer::DrawDisplayLists");
 #endif
   for (size_t i = 0; i < nPasses; ++i) {

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.20 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.21 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredXViewer.cc,v 1.24 2009/01/19 16:53:42 lgarnier Exp $
+// $Id: G4OpenGLStoredXViewer.cc,v 1.25 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -84 +84 @@
 #endif
   //Make sure current viewer is attached and clean...
-  glXMakeCurrent (dpy, fGLXWin, cx);
+  glXMakeCurrent (dpy, win, cx);
 
   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
@@ -154 +154 @@
   GLint renderMode;
   glGetIntegerv(GL_RENDER_MODE, &renderMode);
-  if (renderMode == GL_RENDER) glXSwapBuffers (dpy, fGLXWin);  
+  if (renderMode == GL_RENDER) glXSwapBuffers (dpy, win);  
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredXmViewer.cc,v 1.24 2009/01/19 16:53:42 lgarnier Exp $
+// $Id: G4OpenGLStoredXmViewer.cc,v 1.25 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -83 +83 @@
 void G4OpenGLStoredXmViewer::DrawView () {
 #ifdef G4DEBUG_VIS_OGL
-  printf("G4OpenGLStoredXmViewer::DrawView  context:%d old winGL:%d \n",cx,fGLXWin);
+  printf("G4OpenGLStoredXmViewer::DrawView \n");
 #endif
 
   //Make sure current viewer is attached and clean...
-  glXMakeCurrent (dpy, fGLXWin, cx);
+  glXMakeCurrent (dpy, win, cx);
 
   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
@@ -159 +159 @@
   GLint renderMode;
   glGetIntegerv(GL_RENDER_MODE, &renderMode);
-  if (renderMode == GL_RENDER) glXSwapBuffers (dpy, fGLXWin);  
+  if (renderMode == GL_RENDER) glXSwapBuffers (dpy, win);  
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.cc,v 1.50 2009/03/05 16:36:13 lgarnier Exp $
+// $Id: G4OpenGLViewer.cc,v 1.53 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -616 +616 @@
   if (!fGL2PSAction) return false;
 
-
   fGL2PSAction->setFileName(fPrintFilename.c_str());
   // try to resize
@@ -624 +623 @@
   fWinSize_x = width;
   fWinSize_y = height;
-
   ResizeGLView();
   if (fGL2PSAction->enableFileWriting()) {

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.cc,v 1.51 2009/03/05 16:36:13 lgarnier Exp $
+// $Id: G4OpenGLXViewer.cc,v 1.52 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -92 +92 @@
 
 void G4OpenGLXViewer::SetView () {
-  glXMakeCurrent (dpy, fGLXWin, cx);
+  glXMakeCurrent (dpy, win, cx);
   G4OpenGLViewer::SetView ();  
 }
@@ -259 +259 @@
   class_hints -> res_class = NewString("G4OpenGL");
 
-   fGLXWin = XCreateWindow (dpy, XRootWindow (dpy, vi -> screen), x_origin, 
+   win = XCreateWindow (dpy, XRootWindow (dpy, vi -> screen), x_origin, 
                         y_origin, fWinSize_x, fWinSize_y, 0, vi -> depth,
                         InputOutput, vi -> visual,  
@@ -266 +266 @@
                         &swa);
   
-   XSetWMProperties (dpy, fGLXWin, &windowName, &iconName, 0, 0, 
+   XSetWMProperties (dpy, win, &windowName, &iconName, 0, 0, 
                      size_hints, wm_hints, class_hints);
   
 // request X to Draw window on screen.
-  XMapWindow (dpy, fGLXWin);
+  XMapWindow (dpy, win);
 
 // Wait for window to appear (wait for an "expose" event).
-  XIfEvent (dpy, &event, G4OpenGLXViewerWaitForNotify, (char*) fGLXWin);
+  XIfEvent (dpy, &event, G4OpenGLXViewerWaitForNotify, (char*) win);
 
 // connect the context to a window
-  Bool success = glXMakeCurrent (dpy, fGLXWin, cx);
+  Bool success = glXMakeCurrent (dpy, win, cx);
   if (!success) {
     fViewId = -1;  // This flags an error.
@@ -405 +405 @@
     glXMakeCurrent (dpy, None, NULL);
     glXDestroyContext (dpy, cx);
-    if (fGLXWin) XDestroyWindow (dpy, fGLXWin); // ...if already deleted in
+    if (win) XDestroyWindow (dpy, win); // ...if already deleted in
     // sub-class G4OpenGLXmViewer.
     XFlush (dpy);
@@ -451 +451 @@
 
 #ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLXViewer::print Create pixmap old context:%d new context %d old winGL:%d  Size :%d %d\n",cx,pcx,fGLXWin,fWinSize_x, fWinSize_y);
+    printf("G4OpenGLXViewer::print Create pixmap  Size :%d %d\n",fWinSize_x, fWinSize_y);
 #endif
     cx=pcx;
@@ -478 +478 @@
 
     GLXDrawable tmp_win;
-    tmp_win=fGLXWin;
-    fGLXWin=glxpmap;
-    
-    int winX=fWinSize_x;
-    int winY=fWinSize_y;
+    tmp_win=win;
+    win=glxpmap;
+    
+//     int winX=fWinSize_x;
+//     int winY=fWinSize_y;
 
     //#define CHECK_MULTIPLE_PRINT 1
@@ -504 +504 @@
 
 #ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLXViewer::print Call DrawView context:%d old winGL:%d \n",cx,fGLXWin);
+    printf("G4OpenGLXViewer::print Call DrawView \n");
 #endif
 
@@ -537 +537 @@
     fWinSize_x = winX;
 #endif
-    fGLXWin=tmp_win;
+    win=tmp_win;
     cx=tmp_cx;
     
 //     bool er2 = glXMakeCurrent (dpy,
-//                  fGLXWin,
+//                  win,
 //                  cx);
 #ifdef G4DEBUG_VIS_OGL
-    printf("G4OpenGLXViewer::print Restored context:%d old winGL:%d \n",cx,fGLXWin);
+    printf("G4OpenGLXViewer::print Restored \n");
 #endif
     //    printf("Error 1:%d 2:%d\n",er1,er2);
@@ -593 +593 @@
 
   
-#ifdef G4DEBUG_VIS_OGL
-  printf("------%d------\n",tmp_cx);
-#endif
   return glXCreateContext (dpy,
                            pvi,
@@ -623 +620 @@
   if (lineBuffer == NULL)
     return false;
-  for (int y = 0; y<lineSize; y++) {
+  for (unsigned int y = 0; y<lineSize; y++) {
     lineBuffer[y] = 0;
   }
@@ -662 +659 @@
 
 
-  for (int i=0;i<height;i++) {
+  for (unsigned int i=0;i<height;i++) {
     glReadPixels (0, i, (GLsizei)width, 1, format, GL_UNSIGNED_BYTE, (GLvoid*) lineBuffer);
     glXWaitGL (); //Wait for effects of all previous OpenGL commands to
     //    printf("\n%d ",i);
-    for (int j=0;j<lineSize;j++) {
+    for (unsigned int j=0;j<lineSize;j++) {
       buffer[j+i*lineSize] = lineBuffer[j];
       //      printf("%d ",buffer[j]);
@@ -699 +696 @@
   GLubyte* pixels;
   GLubyte* curpix;
-  int components, pos, i;
+  int components;
 
   GLenum format;
@@ -777 +774 @@
          
   curpix = (GLubyte*) pixels;
-  pos = 0;
-  for (i = width*height*components; i>0; i--) {
+  unsigned int pos = 0;
+  for (unsigned int i = width*height*components; i>0; i--) {
     fprintf (fp, "%02hx ", *(curpix++));
     if (++pos >= width) {

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.9 2009/02/25 15:15:50 lgarnier Exp $
+// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.10 2009/04/08 16:55:44 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //