Changeset 589

Timestamp:

Sep 28, 2007, 5:16:34 PM (17 years ago)

Author:

garnier

Message:

r618@mac-90108: laurentgarnier | 2007-09-26 18:45:28 +0200
eps ok couleur et BW

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog.cc (modified) (3 diffs)
• G4OpenGLQtViewer.cc (modified) (1 diff)

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

@@ -87 +87 @@
   }
   
-  if(nomFich.endsWith(".eps") ||
-     nomFich.endsWith(".jpg")) {
+  if(nomFich.endsWith(".eps")) {
     QGroupBox *EPSGroupBox = new QGroupBox(tr("EPS options"));
     QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout;
 
-    transparencyEPS = new QCheckBox( "transparencyEPS" );
-    transparencyEPS->setText( "save background" );
-    transparencyEPS->setChecked( true );
+    //    transparencyEPS = new QCheckBox( "transparencyEPS" );
+    //    transparencyEPS->setText( "save background" );
+    //    transparencyEPS->setChecked( true );
 
     color = new QRadioButton("Color");
@@ -102 +101 @@
 
 
-    EPSGroupBoxLayout->addWidget(transparencyEPS);    
+    //    EPSGroupBoxLayout->addWidget(transparencyEPS);    
     EPSGroupBoxLayout->addWidget(color);    
     EPSGroupBoxLayout->addWidget(BW);    
@@ -241 +240 @@
   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

@@ -871 +871 @@
 
   FILE* fp;
-  aInColor = 3;
-
+
+  if ((!aImage.isGrayscale ()) &&(aInColor ==1 )) {
+    aImage.convertToFormat ( aImage.format(), Qt::MonoOnly);
+  }
   const uchar * pixels = aImage.bits ();