Changeset 641 for trunk

Timestamp:

Dec 6, 2007, 6:43:54 PM (17 years ago)

Author:

garnier

Message:

correction du ticket #66 : export size ok. Qaulite ok, reste EPS et espaces sur les bords

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc (modified) (6 diffs)

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

@@ -74 +74 @@
   // global layout
   QVBoxLayout* globalVLayout = new QVBoxLayout(this);
-
+  
   
   if ((format == "jpg") || 
@@ -80 +80 @@
     
     QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"),this);
-    QVBoxLayout *imageGroupBoxLayout = new QVBoxLayout(imageGroupBox);
-    QWidget *sliderBox = new QWidget();
-
-    QHBoxLayout *hSliderLayout = new QHBoxLayout(sliderBox);
-
-    //    qualityLabel =  new QLabel( tr( "Image quality" ) );
-    //    imageGroupBoxLayout->addWidget(qualityLabel);
-    qualitySlider= new QSlider(Qt::Horizontal,sliderBox);
+    QHBoxLayout *imageGroupBoxLayout = new QHBoxLayout(imageGroupBox);
+
+
+    qualitySlider= new QSlider(Qt::Horizontal,imageGroupBox);
 #if QT_VERSION < 0x040000
     qualitySlider->setMinValue(0);
@@ -98 +94 @@
 #endif
     qualitySlider->setValue(60);
-    hSliderLayout->addWidget(new QLabel("low",sliderBox));
-    hSliderLayout->addWidget(qualitySlider);
-    hSliderLayout->addWidget(new QLabel("Maximum",sliderBox));
-#if QT_VERSION >= 0x040000
-    sliderBox->setLayout(hSliderLayout);
-#endif
-    imageGroupBoxLayout->addWidget(sliderBox);
-
+    imageGroupBoxLayout->addWidget(new QLabel("low",imageGroupBox));
+    imageGroupBoxLayout->addWidget(qualitySlider);
+    imageGroupBoxLayout->addWidget(new QLabel("Maximum",imageGroupBox));
+    
 #if QT_VERSION >= 0x040000
     imageGroupBox->setLayout(imageGroupBoxLayout);
 #endif
+
+#if QT_VERSION >= 0x040000
+    imageGroupBox->setLayout(imageGroupBoxLayout);
+#endif
+
     globalVLayout->addWidget(imageGroupBox);
   }
-  
+
+
   // FIXME : L. Garnier 4/12/07
   // This is not working for PS and PDF images, it does nothing.
@@ -182 +180 @@
 
   QWidget * sizeWidget = new QWidget(this); // widget containing group button
-  QLayout *sizeWidgetLayout = new QVBoxLayout(sizeWidget);
+  QVBoxLayout * sizeWidgetLayout = new QVBoxLayout(sizeWidget);
 
   // original and modify radiobuttons
@@ -200 +198 @@
   
   QGroupBox * sizeGroupBox = new QGroupBox(tr("Size"));
-  QLayout *sizeGroupBoxLayout = new QVBoxLayout(sizeGroupBox);
+  QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout(sizeGroupBox);
   QButtonGroup * sizeButtonGroupBox = new QButtonGroup();
 
@@ -309 +307 @@
   // button ok/cancel box
 
-  QGroupBox *buttonGroupBox = new QGroupBox(this);
-
-  QHBoxLayout *buttonGroupBoxLayout = new QHBoxLayout(buttonGroupBox);
-
-  buttonOk = new QPushButton( tr( "&OK" ),buttonGroupBox );
+  QWidget *buttonBox = new QWidget(this);
+
+  QHBoxLayout *buttonBoxLayout = new QHBoxLayout(buttonBox);
+
+  buttonOk = new QPushButton( tr( "&OK" ),buttonBox );
   buttonOk->setAutoDefault( TRUE );
   buttonOk->setDefault( TRUE );
-  buttonGroupBoxLayout->addWidget(buttonOk);
-
-  buttonCancel = new QPushButton( tr( "&Cancel" ),buttonGroupBox );
+  buttonBoxLayout->addWidget(buttonOk);
+
+  buttonCancel = new QPushButton( tr( "&Cancel" ),buttonBox );
   buttonCancel->setAutoDefault( TRUE );
-  buttonGroupBoxLayout->addWidget(buttonCancel);
-
-#if QT_VERSION >= 0x040000
-  buttonGroupBox->setLayout(buttonGroupBoxLayout);
-#endif
-  globalVLayout->addWidget(buttonGroupBox);
+  buttonBoxLayout->addWidget(buttonCancel);
+
+#if QT_VERSION >= 0x040000
+  buttonBox->setLayout(buttonBoxLayout);
+#endif
+  globalVLayout->addWidget(buttonBox);
+