Changeset 639

Timestamp:

Dec 5, 2007, 7:02:02 PM (17 years ago)

Author:

garnier

Message:

amelioration du ticket #66

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtExportDialog.hh (modified) (1 diff)
• src/G4OpenGLQtExportDialog.cc (modified) (5 diffs)
• src/G4OpenGLQtViewer.cc (modified) (5 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtExportDialog.hh

@@ -57 +57 @@
       @param parent : parent widget
       @param name : name of the saved file with extention
+      @param format : format of save file in lower case
       @param height : height of the original file
       @param width : width of the original file
   */
-  G4OpenGLQtExportDialog(QWidget* parent, QString name, int height =0, int width=0);
+  G4OpenGLQtExportDialog(QWidget* parent, QString name, QString format, int height =0, int width=0);
 
   /** Destroys G4OpenGLQtExportDialog */

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

@@ -51 +51 @@
  QWidget* parent
 ,QString nomFich
+,QString format
  ,int aHeight
  ,int aWidth
@@ -75 +76 @@
 
   
-  if (nomFich.endsWith(".jpg") || 
-      nomFich.endsWith(".jpeg")) {
+  if ((format == "jpg") || 
+      (format == "jpeg")) {
     
     QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"),this);
@@ -114 +115 @@
   // 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"))) {
-
+  //  if ((format == "ps") || (format == "pdf") || (format == "eps")) {
+
+ if (format == ".eps") {
 
     QWidget * EPSWidgetGroupBox; // widget containing group button
@@ -157 +158 @@
   // Not implented. Should deal with alpha channel
 
-//   if(nomFich.endsWith(".tif") ||
-//      nomFich.endsWith(".tiff") ||
-//      nomFich.endsWith(".jpg") ||
-//      nomFich.endsWith(".jpeg") ||
-//      nomFich.endsWith(".png") ||
-//      nomFich.endsWith(".xpm")) {
+//   if((format == "tif") ||
+//      (format == "tiff") ||
+//      (format == "jpg") ||
+//      (format == "jpeg") ||
+//      (format == "png") ||
+//      (format == "xpm")) {
 
 //     QGroupBox *transparencyGroupBox = new QGroupBox(tr("Transparency"),this);
@@ -186 +187 @@
   QButtonGroup * sizeButtonGroupBox; // group button 
   QLayout *sizeGroupBoxLayout;
+
 #if QT_VERSION < 0x040000
   sizeButtonGroupBox = new QButtonGroup ( 2,Qt::Vertical, tr("Size"),this);

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

@@ -1062 +1062 @@
   filters += "ps;;";
   filters += "pdf";
-  QString* selectedFilter = new QString();
+  QString* selectedFormat = new QString();
 #if QT_VERSION < 0x040000
   QString nomFich =  QFileDialog::getSaveFileName ( ".",
@@ -1069 +1069 @@
                                                     "Save file dialog",
                                                     tr("Save as ..."),
-                                                    selectedFilter ); 
+                                                    selectedFormat ); 
 #else
   QString nomFich =  QFileDialog::getSaveFileName ( GLWindow,
@@ -1075 +1075 @@
                                                     ".",
                                                     filters,
-                                                    selectedFilter ); 
+                                                    selectedFormat ); 
 #endif
   // bmp jpg jpeg png ppm xbm xpm
@@ -1082 +1082 @@
   }
 #if QT_VERSION < 0x040000
-  nomFich += "."+selectedFilter->lower();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::name %s\n",nomFich.ascii());
-#endif
-#else
-  nomFich += "."+selectedFilter->toLower();
-#ifdef GEANT4_QT_DEBUG
-  printf("G4OpenGLQtViewer::name %s\n",nomFich.toStdString().c_str());
-#endif
-#endif
-  G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,nomFich,fWindow->height(),fWindow->width());
+  nomFich += "."+QString(selectedFormat->ascii());
+  QString format = selectedFormat->lower();
+#else
+  nomFich += "."+QString(selectedFormat->toStdString().c_str());
+  QString format = selectedFormat->toLower();
+#endif
+  G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,nomFich,format,fWindow->height(),fWindow->width());
   if(  exportDialog->exec()) {
 
@@ -1119 +1115 @@
       image = fWindow->grabFrameBuffer();
     }    
-    // jpeg format
-    if (nomFich.endsWith(".eps")) {
+    if (format == QString("eps")) {
       generateEPS(nomFich,exportDialog->getNbColor(),image);
-    } else if (nomFich.endsWith(".ps") ||nomFich.endsWith(".pdf")) {
+    } else if ((format == "ps") || (format == "pdf")) {
       generatePS_PDF(nomFich,exportDialog->getNbColor(),image);
-    } else if (nomFich.endsWith(".tif") ||
-               nomFich.endsWith(".tiff") ||
-               nomFich.endsWith(".jpg") ||
-               nomFich.endsWith(".jpeg") ||
-               nomFich.endsWith(".png") ||
-               nomFich.endsWith(".ppm") ||
-               nomFich.endsWith(".bmp") ||
-               nomFich.endsWith(".xbm") ||
-               nomFich.endsWith(".xpm")) {
+  } else if ((format == "tif") ||
+             (format == "tiff") ||
+             (format == "jpg") ||
+             (format == "jpeg") ||
+             (format == "png") ||
+             (format == "pbm") ||
+             (format == "pgm") ||
+             (format == "ppm") ||
+             (format == "bmp") ||
+             (format == "xbm") ||
+             (format == "xpm")) {
+#if QT_VERSION < 0x040000
+      bool res = image.save(nomFich,selectedFormat->ascii(),exportDialog->getSliderValue());
+#else
       bool res = image.save(nomFich,0,exportDialog->getSliderValue());
+#endif
       if (res == false) {
         G4cerr << "Error while saving file...\n" << G4endl;
       }
-#ifdef GEANT4_QT_DEBUG
-      printf("saving ELSE %d\n",res);
-#endif
     } else {
       G4cerr << "This version of G4UI Could not generate the selected format\n" << G4endl;