Changeset 587

Timestamp:

Sep 26, 2007, 3:29:10 PM (17 years ago)

Author:

garnier

Message:

r615@mac-90108: laurentgarnier | 2007-09-26 15:32:59 +0200
ok pour le moment avec alpha, mais tout les cas ne sont pas geres

Location:

trunk/geant4/visualization

Files:

• G4History.macro (modified) (1 diff)
• OpenGL/src/G4OpenGLQtExportDialog.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (4 diffs)

trunk/geant4/visualization/G4History.macro

@@ -59 +59 @@
 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
 /N03/event/printModulo 100
-/run/beamOn 1

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

@@ -236 +236 @@
 }
 
-int G4OpenGLQtExportDialog::getColorValue()
-{
+int G4OpenGLQtExportDialog::getNbColor()
+{
+  // Black and white
   if (!color->isChecked())
     return 1;
+  // rgb color with alpha
   if (color->isChecked() && transparencyEPS->isChecked())
     return 4;
+  // rgb color
   return 3;
 }

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

@@ -958 +958 @@
 )
 {
-  
+  // FIXME
   printf("saving EPS\n");
 
   FILE* fp;
-  
+  aInColor = 3;
+
   const uchar * pixels = aImage.bits ();
     //  pixels = grabPixels (inColour, width, height);
@@ -977 +978 @@
   fprintf (fp, "%%%%Title: %s\n", aFilename.toStdString().c_str());
   fprintf (fp, "%%%%Creator: OpenGL pixmap render output\n");
-  fprintf (fp, "%%%%BoundingBox: 0 0 %d %d\n", fWindow->width(), fWindow->height());
+  fprintf (fp, "%%%%BoundingBox: 0 0 %d %d\n", aImage.width(), aImage.height());
   fprintf (fp, "%%%%EndComments\n");
   fprintf (fp, "gsave\n");
@@ -999 +1000 @@
   fprintf (fp, "   }  def\n");
   fprintf (fp, "} if\n");
-  fprintf (fp, "/picstr %d string def\n", fWindow->width() * aInColor);
-  fprintf (fp, "%d %d scale\n", fWindow->width(), fWindow->height());
-  fprintf (fp, "%d %d %d\n", fWindow->width(), fWindow->height(), 8);
-  fprintf (fp, "[%d 0 0 %d 0 0]\n", fWindow->width(), fWindow->height());
+  fprintf (fp, "/picstr %d string def\n", aImage.width() * aInColor);
+  fprintf (fp, "%d %d scale\n", aImage.width(), aImage.height());
+  fprintf (fp, "%d %d %d\n", aImage.width(), aImage.height(), 8);
+  fprintf (fp, "[%d 0 0 %d 0 0]\n", aImage.width(), aImage.height());
   fprintf (fp, "{currentfile picstr readhexstring pop}\n");
   fprintf (fp, "false %d\n", aInColor);
@@ -1008 +1009 @@
   fprintf (fp, "colorimage\n");
   
-  printf("boucle jusque :%d/%d par ligne:%d \n",fWindow->width()*fWindow->height()*aInColor,aImage.numBytes(),aImage.bytesPerLine ());
-
-  int pos =0;
-  for (int i = 0;i<fWindow->width()*fWindow->height()*aInColor; i++) {
-    fprintf (fp, "%02hx ", pixels[i]);
-    if (++pos >= aImage.bytesPerLine ()) {
+  printf("boucle jusque :%d/%d par ligne:%d \n",aImage.width()*aImage.height()*aInColor,aImage.numBytes(),aImage.bytesPerLine ());
+
+  QRgb color;
+  if (aInColor == 3) {  // for RGB images
+    for (int j=aImage.height()-1;j>=0;j--){
+      for (int i=0;i<aImage.width();i++){
+        color = aImage.pixel (i,j);
+        fprintf (fp, " %02hx %02hx %02hx",qBlue(color),qGreen(color),qRed(color));
+      }
       fprintf (fp, "\n");
-      pos = 0; 
+    }  
+  } else if (aInColor == 4) {
+    // for RGB images
+    for (int j=aImage.height()-1;j>=0;j--){
+      for (int i=0;i<aImage.width();i++){
+        color = aImage.pixel (i,j);
+        fprintf (fp, " %02hx %02hx %02hx %02hx",qAlpha(color), qRed(color),qGreen(color),qBlue(color));
+      }
+      fprintf (fp, "\n");
     }
   }
-  
-  if (pos)
-    fprintf (fp, "\n");
+  else if (aInColor == 1) { // for grayscale
+  }
   
   fprintf (fp, "grestore\n");