Changeset 975 for trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

Timestamp:

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

Author:

garnier

Message:

Improvments for print in pixmap. Not finish yet

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc (modified) (14 diffs)

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) {