Changeset 582

Timestamp:

Sep 21, 2007, 3:17:46 PM (17 years ago)

Author:

garnier

Message:

r605@mac-90108: laurentgarnier | 2007-09-21 15:20:26 +0200
ajout de la boite de dialog a l export des fichiers. En test

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtExportDialog.hh (modified) (4 diffs)
• src/G4OpenGLQtExportDialog.cc (modified) (7 diffs)
• src/G4OpenGLQtViewer.cc (modified) (2 diffs)

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

@@ -41 +41 @@
 class QPushButton;
 class QCheckBox;
-class QSpinBox;
+class QSlider;
 class QComboBox;
 class QLabel;
@@ -53 +53 @@
   ~G4OpenGLQtExportDialog();
 
+  int getSliderValue();
   QPushButton* buttonOk;
   QPushButton* buttonCancel;
   QButtonGroup* GroupBox1, *GroupBox2;
   QCheckBox* boxTransparency;
-  QSpinBox * boxQuality;
+  QSlider * qualitySlider;
   QLabel *formatLabel;
   QComboBox *boxFormat;
@@ -69 +70 @@
   void setExportDirPath(const QString& dir) {f_dir = dir;};
   
-protected slots:
-  void accept();
 
 signals:
@@ -78 +77 @@
 private:
   QString f_name, f_type, f_dir;
+  QLabel* qualityLabel;
   bool expAll;
+
 };
 

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

@@ -39 +39 @@
 #include <qlabel.h>
 #include <qcombobox.h>
-#include <qspinbox.h>
+#include <qslider.h>
 #include <qlayout.h>
 #include <qgroupbox.h>
@@ -49 +49 @@
   : QDialog( parent )
 {
-  setWindowTitle( tr( "QtiPlot - Export options" ));
-  setMinimumSize( QSize( 310, 140 ) );
-  setMaximumSize( QSize( 310, 140 ) );
+  setWindowTitle( tr( " Export options" ));
   
-  QGroupBox *groupBox1 = new QGroupBox(tr("Exclusive Radio Buttons"));
+  QGroupBox *groupBox1 = new QGroupBox(tr("Image quality"));
   QVBoxLayout *vbox1 = new QVBoxLayout;
   
   if(nomFich.endsWith(".jpg")) {
     
-    vbox1->addWidget( new QLabel( tr( "Image quality" ) ));
-    boxQuality= new QSpinBox();
-    
-    boxQuality->setMinimum(0);
-    boxQuality->setMaximum(100);
-    boxQuality->setValue(100);
-    vbox1->addWidget(boxQuality);
+    QWidget *sliderBox = new QWidget;
+    QHBoxLayout *hSlider = new QHBoxLayout;
+    //    qualityLabel =  new QLabel( tr( "Image quality" ) );
+    //    vbox1->addWidget(qualityLabel);
+    qualitySlider= new QSlider(Qt::Horizontal);
+    qualitySlider->setMinimum(0);
+    qualitySlider->setMaximum(100);
+    qualitySlider->setTickPosition(QSlider::TicksBelow);
+    qualitySlider->setValue(60);
+    hSlider->addWidget(new QLabel("low"));
+    hSlider->addWidget(qualitySlider);
+    hSlider->addWidget(new QLabel("Maximum"));
+    sliderBox->setLayout(hSlider);
+    vbox1->addWidget(sliderBox);
   }
   
@@ -76 +81 @@
   if(nomFich.endsWith(".tif") ||
      nomFich.endsWith(".tiff") ||
+     nomFich.endsWith(".jpg") ||
      nomFich.endsWith(".png") ||
      nomFich.endsWith(".xpm")) {
@@ -89 +95 @@
   QGroupBox *groupBox2 = new QGroupBox();
   QHBoxLayout *hbox2 = new QHBoxLayout;
-  groupBox2->setFlat (TRUE);
 
   buttonOk = new QPushButton( tr( "&OK" ) );
@@ -101 +106 @@
 
   groupBox2->setLayout(hbox2);
-  QHBoxLayout* hlayout = new QHBoxLayout();
-  hlayout->addWidget(groupBox1);
-  hlayout->addWidget(groupBox2);
+  QVBoxLayout* vlayout = new QVBoxLayout();
+  vlayout->addWidget(groupBox1);
+  vlayout->addWidget(groupBox2);
 
+  setLayout(vlayout);
 
   // signals and slots connections
@@ -120 +126 @@
 }
 
+int G4OpenGLQtExportDialog::getSliderValue()
+{
+  return qualitySlider->value();
+}
+
 void G4OpenGLQtExportDialog::enableTransparency()
 {
@@ -126 +137 @@
   if (type == "tif" || type == "tiff" || type == "png" || type == "xpm")
     boxTransparency->setEnabled(true);
-}
-
-void G4OpenGLQtExportDialog::accept()
-{
-  emit options(f_name, f_type, boxQuality->value(), boxTransparency->isChecked());
-  close();
 }
 

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

@@ -659 +659 @@
   QList<QByteArray> formats =  QImageWriter::supportedImageFormats ();
   for (int i = 0; i < formats.size(); ++i) {
-    filters +="."+formats.at(i);
+    filters +=formats.at(i);
     if ((i+1) <formats.size()) {
       filters += ";;";
     }
   }
-  
+  QString* selectedFilter = new QString();
   QString nomFich =  QFileDialog::getSaveFileName ( GLWindow,
                                                     tr("Save as ..."),
                                                     ".",
-                                                    filters ); 
+                                                    filters,
+                                                    selectedFilter ); 
   // bmp jpg jpeg png ppm xbm xpm
+  if (nomFich == "") {
+    return;
+  }
+  nomFich += "."+selectedFilter->toLower();
+  printf("G4OpenGLQtViewer::name %s\n",nomFich.toStdString().c_str());
   if(nomFich.endsWith(".eps")) {
     G4cerr << "This version of G4UI Could not generate EPS." << G4endl;
   } else if(nomFich.endsWith(".jpg") || nomFich.endsWith(".jpeg")) {
-    G4cerr << "Should display a quality selector" << G4endl;
     G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(GLWindow,nomFich);
+    int res = exportDialog->exec();
+    printf("G4OpenGLQtViewer::actionCreateEPS() --%d-- quality:\n",res);
     fWindow->grabFrameBuffer().save(nomFich);
   } else {
@@ -756 +763 @@
           //  return;
         }
-      QStringList list=QImage::outputFormatList ();
+QStringList list=QImage::outputFormatList ();
       for (int i=0; i<(int)list.count(); i++)
         {
           if (selectedFilter.contains("."+(list[i]).lower()))
             {
-              if (ied->showExportOptions())
-                {
-                  imageExportDialog* ed= new imageExportDialog(false, this,"exportDialog",TRUE,WStyle_Tool|WDestructiveClose);
+            if (ied->showExportOptions())
+              {
+              imageExportDialog* ed= new imageExportDialog(false, this,"exportDialog",TRUE,WStyle_Tool|WDestructiveClose);
                   connect (ed, SIGNAL(options(const QString&, const QString&, int, bool)),
                            g, SLOT(exportImage(const QString&, const QString&, int, bool)));