Changeset 649

Timestamp:

Dec 10, 2007, 7:06:14 PM (17 years ago)

Author:

garnier

Message:

modif pour la sauvegarde en EPS

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (5 diffs)

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

@@ -288 +288 @@
   printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
 #endif
-  delete fContextMenu;
 }
 
@@ -1308 +1307 @@
   FILE* fp;
 
-  if ((!aImage.isGrayscale ()) &&(aInColor ==1 )) {
-#if QT_VERSION < 0x040000
-    aImage = aImage.convertDepth(1,Qt::MonoOnly);
-#else
-    aImage = aImage.convertToFormat ( aImage.format(), Qt::MonoOnly);
-#endif
-  }
-  const uchar * pixels = aImage.bits ();
-    
-  if (pixels == NULL)
+  if (aImage.bits () == NULL)
     return false;
   
@@ -1372 +1362 @@
   int size = width*height;
   
+
   if (depth == 1)
     size = (width+7)/8*height;
@@ -1378 +1369 @@
   
   int i = 0;
-  if (depth == 1) {
-    //  To be implemented
-    //    QImage::Endian bitOrder = aImage.bitOrder();
-    /*    for(int y=0; y < height; y++) {
-      const uchar * s = aImage.scanLine(y);
-      for(int x=0; x < width; x++) {
-        // need to copy bit for bit...
-        bool b = (bitOrder == QImage::LittleEndian) ?
-          (*(s + (x >> 3)) >> (x & 7)) & 1 :
-          (*(s + (x >> 3)) << (x & 7)) & 0x80 ;
-        if (b)
-          pixel[i >> 3] ^= (0x80 >> (i & 7));
-        i++;
-      }
-      // we need to align to 8 bit here
-      i = (i+7) & 0xffffff8;
-    }
-    */
-  } else if (depth == 8) {
+  //  if ( aInColor ==1 ) {
+  // FIXME : L. Garnier. For the moment 10 dec 2007, I could not find a way
+  // to save correctly grayscale Image. I mean that color or grayscale image
+  // have the same file save size !
+  
+  /* } else*/ if (depth == 8) {
     for(int y=height-1; y >=0 ; y--) {
       const uchar * s = aImage.scanLine(y);
@@ -1416 +1394 @@
   } else {
 #if QT_VERSION < 0x040000
-  G4cerr << "GenerateEPS:: No alpha channel image with Qt3. This is only supported with Qt4\n" << G4endl;
+    bool alpha = aImage.hasAlphaBuffer();
 #else
     bool alpha = aImage.hasAlphaChannel();
-#ifdef GEANT4_QT_DEBUG
-    printf("has else %d alpha %d\n",depth,alpha);
-#endif
     for(int y=height-1; y >=0 ; y--) {
       QRgb * s = (QRgb*)(aImage.scanLine(y));