Changeset 642 for trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc

Timestamp:

Dec 6, 2007, 7:15:52 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);
+  globalVLayout->setMargin(10);
+  globalVLayout->setSpacing(10);
   
-  
-  if ((format == "jpg") || 
-      (format == "jpeg")) {
-    
-    QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"),this);
-    QHBoxLayout *imageGroupBoxLayout = new QHBoxLayout(imageGroupBox);
-
-
-    qualitySlider= new QSlider(Qt::Horizontal,imageGroupBox);
-#if QT_VERSION < 0x040000
-    qualitySlider->setMinValue(0);
-    qualitySlider->setMaxValue(100);
-    qualitySlider->setTickmarks(QSlider::Below); 
-#else
-    qualitySlider->setMinimum(0);
-    qualitySlider->setMaximum(100);
-    qualitySlider->setTickPosition(QSlider::TicksBelow);
-#endif
-    qualitySlider->setValue(60);
-    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
@@ -122 +90 @@
 
 #if QT_VERSION < 0x040000
+
     colorButton = new QRadioButton("Color",EPSWidgetGroupBox);
     BWButton = new QRadioButton("Grayscale",EPSWidgetGroupBox);
     EPSButtonGroupBox = new QButtonGroup( 2,Qt::Vertical, tr("EPS options"),this);
+    EPSButtonGroupBox->setInsideMargin (15); 
     EPSButtonGroupBox->insert(colorButton);
     EPSButtonGroupBox->insert(BWButton);
@@ -133 +103 @@
     EPSWidgetGroupBox = new QGroupBox(tr("EPS options"));
     QVBoxLayout *EPSGroupBoxLayout = new QVBoxLayout(EPSWidgetGroupBox);
+    EPSGroupBoxLayout->setMargin (15); 
 
     colorButton = new QRadioButton("Color",EPSWidgetGroupBox);
@@ -181 +152 @@
   QWidget * sizeWidget = new QWidget(this); // widget containing group button
   QVBoxLayout * sizeWidgetLayout = new QVBoxLayout(sizeWidget);
+  sizeWidgetLayout->setMargin (10); 
 
   // original and modify radiobuttons
 #if QT_VERSION < 0x040000
   QButtonGroup * sizeButtonGroupBox = new QButtonGroup ( 2,Qt::Vertical, tr("Size"),this);
+  sizeButtonGroupBox->setInsideMargin (15); 
 
   original = new QRadioButton("Original",sizeButtonGroupBox);
@@ -200 +173 @@
   QVBoxLayout *sizeGroupBoxLayout = new QVBoxLayout(sizeGroupBox);
   QButtonGroup * sizeButtonGroupBox = new QButtonGroup();
+  sizeGroupBoxLayout->setMargin (15); 
 
   original = new QRadioButton("Original");
@@ -301 +275 @@
 #endif
   globalVLayout->addWidget(sizeWidget);
+
+  if ((format == "jpg") || 
+      (format == "jpeg")) {
+    
+    QGroupBox *imageGroupBox = new QGroupBox(tr("Image quality"),this);
+    QHBoxLayout *hSliderLayout = new QHBoxLayout(imageGroupBox);
+    hSliderLayout->setMargin (15); 
+
+    qualitySlider= new QSlider(Qt::Horizontal,imageGroupBox);
+#if QT_VERSION < 0x040000
+    qualitySlider->setMinValue(0);
+    qualitySlider->setMaxValue(100);
+    qualitySlider->setTickmarks(QSlider::Below); 
+#else
+    qualitySlider->setMinimum(0);
+    qualitySlider->setMaximum(100);
+    qualitySlider->setTickPosition(QSlider::TicksBelow);
+#endif
+    qualitySlider->setValue(60);
+    hSliderLayout->addWidget(new QLabel("Low ",imageGroupBox));
+    hSliderLayout->addWidget(qualitySlider);
+    hSliderLayout->addWidget(new QLabel(" Maximum",imageGroupBox));
+    
+#if QT_VERSION >= 0x040000
+    imageGroupBox->setLayout(hSliderLayout);
+#endif
+
+#if QT_VERSION >= 0x040000
+    imageGroupBox->setLayout(hSliderLayout);
+#endif
+
+    globalVLayout->addWidget(imageGroupBox);
+  }