Changeset 637 for trunk/geant4

Timestamp:

Dec 5, 2007, 2:41:42 PM (17 years ago)

Author:

garnier

Message:

amelioration du ticket #66

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog.cc (modified) (5 diffs)
• G4OpenGLQtViewer.cc (modified) (4 diffs)

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

@@ -111 +111 @@
   }
   
-  if ((nomFich.endsWith(".ps")) || (nomFich.endsWith(".pdf")) || (nomFich.endsWith(".eps"))) {
+  // FIXME : L. Garnier 4/12/07
+  // This is not working for PS and PDF images, it does nothing.
+  // Image is staying in color mode
+  //  if ((nomFich.endsWith(".ps")) || (nomFich.endsWith(".pdf")) || (nomFich.endsWith(".eps"))) {
+  if ((nomFich.endsWith(".eps"))) {
 
     //    transparencyEPS = new QCheckBox( "transparencyEPS" );
@@ -361 +365 @@
 int G4OpenGLQtExportDialog::getNbColor()
 {
+  if (!colorButton) return -1;
   // Black and white
   if (!colorButton->isChecked())
@@ -371 +376 @@
 void G4OpenGLQtExportDialog::changeSizeBox()
 {
+  if (!original) return;
+  if (!heightWidget) return;
+  if (!widthWidget) return;
+  if (!ratioCheckBox) return;
+
   if ( original->isChecked()) {
     heightWidget->hide();
@@ -386 +396 @@
  )
 {
+  if (!ratioCheckBox) return;
+  if (!width) return;
+
   if (ratioCheckBox->isChecked()){
     QString tmp;
@@ -396 +409 @@
 )
 {
+  if (!ratioCheckBox) return;
+  if (!width) return;
+
   if (ratioCheckBox->isChecked()){
     QString tmp;

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

@@ -1310 +1310 @@
   if ((!aImage.isGrayscale ()) &&(aInColor ==1 )) {
 #if QT_VERSION < 0x040000
-    aImage.convertDepth(1,Qt::MonoOnly);
-#else
-    aImage.convertToFormat ( aImage.format(), Qt::MonoOnly);
+    aImage = aImage.convertDepth(1,Qt::MonoOnly);
+#else
+    aImage = aImage.convertToFormat ( aImage.format(), Qt::MonoOnly);
 #endif
   }
@@ -1397 +1397 @@
     */
   } else if (depth == 8) {
-#ifdef GEANT4_QT_DEBUG
-    printf("has 8 bit\n");
-#endif
     for(int y=height-1; y >=0 ; y--) {
       const uchar * s = aImage.scanLine(y);
@@ -1494 +1491 @@
   QPrinter printer;
   //  printer.setPageSize(pageSize);
-  if (aInColor == 1) {
-    printer.setColorMode(QPrinter::GrayScale);
-  } else {
-    printer.setColorMode(QPrinter::Color);
-  }
+
+  // FIXME : L. Garnier 4/12/07
+  // This is not working, it does nothing. Image is staying in color mode
+  // So I have desactivate the B/W button in GUI
+  if ((!aImage.isGrayscale ()) &&(aInColor ==1 )) {
+#if QT_VERSION < 0x040000
+    aImage = aImage.convertDepth(1,Qt::MonoOnly);
+#else
+    aImage = aImage.convertToFormat ( aImage.format(), Qt::MonoOnly);
+#endif
+  }
+
 
   if (aFilename.endsWith(".ps")) {
@@ -1514 +1518 @@
   //  printer.setFullPage ( true);
   QPainter paint(&printer);
-  paint.drawImage (0,0,aImage );
+  paint.drawImage (0,0,aImage);
   paint.end();
 #endif