Changeset 950 for trunk/source/visualization/OpenGL

Timestamp:

Mar 25, 2009, 11:12:05 AM (15 years ago)

Author:

garnier

Message:

bug fix in glReadPixels

Location:

trunk/source/visualization/OpenGL

Files:

• History (modified) (2 diffs)
• include/G4OpenGLXViewer.hh (modified) (1 diff)
• src/G4OpenGLViewer.cc (modified) (1 diff)
• src/G4OpenGLXViewer.cc (modified) (9 diffs)

trunk/source/visualization/OpenGL/History

@@ -1 @@
-$Id: History,v 1.129 2009/03/05 16:36:13 lgarnier Exp $
+$Id: History,v 1.131 2009/03/24 13:50:07 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -24 +24 @@
  - G4OpenGLViewer : Add a fix and resizing when X/Y size was even (lack of precision
    in a /2)
+
+18th March 2009  John Allison
+- G4OpenGLViewerMessenger.cc: printMode and transparency are available
+  for all OGL windows (they were previously inadvertently hidden by
+  an OGLS requirement).
 
 16th March 2009, Laurent Garnier

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

@@ -98 +98 @@
   char                              charViewName [100];
 
-  GLubyte* grabPixelsX (int inColor, unsigned int width, unsigned int height);
+  bool grabPixelsX (unsigned int width, unsigned int height,GLenum format, GLubyte* buffer);
   int generateEPSX (const char* filnam,int inColour, unsigned int width,unsigned int height);
 

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

@@ -164 +164 @@
   // SPECIAL CASE
   if ((fWinSize_x - side)%2) {
-    fWinSize_x --;
+    //    fWinSize_x --;
+
+    side = fWinSize_x;
+    if (fWinSize_y < fWinSize_x) side = fWinSize_y;
   }
   if ((fWinSize_y - side)%2) {
-    fWinSize_y --;
-  }
-  
-  GLint width = (fWinSize_x - side) / 2;
-  GLint height = (fWinSize_y - side) / 2;
-  
-  glViewport(width, height, side, side);  
+    //    fWinSize_y --;
+
+    side = fWinSize_x;
+    if (fWinSize_y < fWinSize_x) side = fWinSize_y;
+  }
+  
+  GLint X = (fWinSize_x - side) / 2;
+  GLint Y = (fWinSize_y - side) / 2;
+  
+  printf("G4OpenGLViewer::ResizeGLView X:%d Y:%d W:%d H:%d --side%d\n",(fWinSize_x - side) / 2,(fWinSize_y - side) / 2,fWinSize_x,fWinSize_y,side);
+  glViewport(X, Y, side, side);
+  //    glViewport(0, 0, fWinSize_x,fWinSize_y);  
+  
+
 }
 

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

@@ -511 +511 @@
     
     //    InitializeGLView ();
-    
+    int winX=fWinSize_x;
+    int winY=fWinSize_y;
+
+    for (int tstX  = winX-2;tstX <=winX+2;tstX++) {
+      for (int tstY  = winY-2;tstY <=winY+2;tstY++) {
+        fWinSize_y = tstY;
+        fWinSize_x = tstX;
+        std::string file = "G4OpenGL_XPixmap";
+        file += tstX;
+        file +="x";
+        file +=tstY;
+        file +=".eps";
+
     // clear the buffers and window.
     SetView();
@@ -540 +552 @@
 
     
-    std::string file = "G4OpenGL_XPixmap.eps";
     generateEPSX (file.c_str(),
                  fPrintColour,
                  fWinSize_x, fWinSize_y);
     
+      }
+    }
     fGLXWin=tmp_win;
     cx=tmp_cx;
@@ -607 +620 @@
 
 
-GLubyte* G4OpenGLXViewer::grabPixelsX (int inColor, unsigned int width, unsigned int height) {
+bool G4OpenGLXViewer::grabPixelsX (unsigned int width, unsigned int height,GLenum format,GLubyte* buffer) {
 #ifdef G4DEBUG_VIS_OGL
   GLint viewport[4];
@@ -614 +627 @@
 #endif
          
-  //  GLubyte* buffer;
-  GLint* bufferI;
   GLint swapbytes, lsbfirst, rowlength;
   GLint skiprows, skippixels, alignment;
-  GLenum format;
-  int size;
-        
-  if (inColor) {
-    format = GL_RGB;
-    size = width*height*3;
+
+  unsigned int lineSize = 0;
+  if (format == GL_RGB){
+    lineSize = width*3;
   } else {
-    format = GL_LUMINANCE;
-    size = width*height*1;
-  }
-        
-  unsigned char *buffer = new unsigned char [ size] ;
-  buffer = new GLubyte[size];
-  bufferI = new int[size];
-  if (buffer == NULL)
-    return NULL;
-  for (int y = 0; y<size; y++) {
-    buffer[y] = 0;
-  }
+    lineSize = width*1;
+  }
+  
+  GLubyte* lineBuffer = new GLubyte[lineSize];
+  if (lineBuffer == NULL)
+    return false;
+  for (int y = 0; y<lineSize; y++) {
+    lineBuffer[y] = 0;
+  }
+
   glGetIntegerv (GL_UNPACK_SWAP_BYTES, &swapbytes);
   glGetIntegerv (GL_UNPACK_LSB_FIRST, &lsbfirst);
@@ -645 +652 @@
   glGetIntegerv (GL_UNPACK_ALIGNMENT, &alignment);
         
-//   glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
-//   glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
-//   glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
-        
-//   glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
-//   glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
-//   glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-        
-  glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_UNSIGNED_BYTE, (GLvoid*) buffer);
-  //  glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, format, GL_INT, bufferI);
-        
-  glXWaitGL (); //Wait for effects of all previous OpenGL commands to
+  glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
+  glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
+  glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
+        
+  glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
+  glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
+  glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+        
+  // FIXME L.Garnier 25 03 2009
+  // Try to read at first a block of width by height
+  // But on mac osX 10.5.6 on some window size their is
+  // some stranges effects: 
+  // Pixels should came 3 values by 3 values but on border
+  // it seems that with some window size there is a lack of
+  // 1 or 2 values. For example a gray level picture like
+  // (1,1,1) (2,2,2) (3,3,3) 
+  // (4,4,4) (5,5,5) (6,6,6) 
+  // (7,7,7) (8,8,8) (9,9,9)
+  // appear as (with all buffer values init to 999) :
+  // (1,1,1) (2,2,2) (3,3,3) 
+  // (999,999,4) (4,4,5) (5,5,6) 
+  // (6,6,999) (999,999,7) (7,7,8)
+  // STRANGE EFFECT....
+
+  // Then we read line by line...and NO problem ! 
+
+
+  for (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++) {
+      buffer[j+i*lineSize] = lineBuffer[j];
+      //      printf("%d ",buffer[j]);
+    }
+  }
   //                 //be propagated before progressing.
   glFlush ();
 
-//   printf("-----------\n-----------\n-----------\n-----------\n-----------\n%d %d %d\n",width, height,size);
-  //  char * pixels = new char [3 * width * height];
-  //  glReadPixels (0, 0, (GLsizei)width, (GLsizei)height, GL_DEPTH_COMPONENT, GL_FLOAT, pixels);
-  
-  for (int y = 0; y<height*3; y++) {
-    printf("\n%d : ",y/3);
-    for (int x = 0; x<width*3; x++) {
-      printf("%d ",buffer[y*width+x]);
-  //     if (buffer[y*width+x] == 0)
-//         printf("");
-//       else  if (buffer[y*width+x] == 255)
-//         printf("0");
-     }
-  }
-  
-//   printf("-----------\n-----------\n-----------\n-----------\n-----------\n");
+  delete [] lineBuffer;
   
   glPixelStorei (GL_UNPACK_SWAP_BYTES, swapbytes);
@@ -686 +702 @@
          
   
-  return buffer;
+  return true;
 }
         
@@ -698 +714 @@
   GLubyte* curpix;
   int components, pos, i;
+
+  GLenum format;
+  int size;
+        
+  if (inColour) {
+    format = GL_RGB;
+    size = width*height*3;
+  } else {
+    format = GL_LUMINANCE;
+    size = width*height*1;
+  }
+        
+  pixels = new GLubyte[size];
+  if (pixels == NULL)
+    return NULL;
+  for (int y = 0; y<size; y++) {
+    pixels[y] = 0;
+  }
+
         
 #ifdef G4DEBUG_VIS_OGL
@@ -704 +739 @@
   
 
-  pixels = grabPixelsX (inColour, width, height);
+  if (!grabPixelsX (width, height,format,pixels)) {
+    return 1;
+  }
 #ifdef G4DEBUG_VIS_OGL
     printf("--\n--\n--\n");
 #endif
         
-  if (pixels == NULL)
-    return 1;
   if (inColour) {
     components = 3;
@@ -772 +807 @@
   delete pixels;
   fclose (fp);
+
+#ifdef G4DEBUG_VIS_OGL
+  printf("G4OpenGLXViewer::generateEPSX END\n");
+#endif
+
   return 0;
 }