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

Timestamp:

Dec 6, 2007, 4:16:58 PM (17 years ago)

Author:

garnier

Message:

correction du ticket #66 : export size ok. Reste la qualite et l eps

File:

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

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

@@ -117 +117 @@
   //  if ((format == "ps") || (format == "pdf") || (format == "eps")) {
 
- if (format == ".eps") {
+ if (format == "eps") {
 
     QWidget * EPSWidgetGroupBox; // widget containing group button
@@ -180 +180 @@
 
   // size box
-  QWidget* modifyAndRatioWidget = new QWidget();
-
-  QHBoxLayout *modifyAndRatioLayout = new QHBoxLayout(modifyAndRatioWidget);
-
-  QWidget * sizeWidgetGroupBox; // widget containing group button
-  QButtonGroup * sizeButtonGroupBox; // group button 
-  QLayout *sizeGroupBoxLayout;
-
-#if QT_VERSION < 0x040000
-  sizeButtonGroupBox = new QButtonGroup ( 2,Qt::Vertical, tr("Size"),this);
+
+  QWidget * sizeWidget = new QWidget(this); // widget containing group button
+  QLayout *sizeWidgetLayout = new QVBoxLayout(sizeWidget);
+
+  // original and modify radiobuttons
+#if QT_VERSION < 0x040000
+  QButtonGroup * sizeButtonGroupBox = new QButtonGroup ( 2,Qt::Vertical, tr("Size"),this);
 
   original = new QRadioButton("Original",sizeButtonGroupBox);
@@ -197 +194 @@
   sizeButtonGroupBox->insert(modify);
   sizeButtonGroupBox->setExclusive(true);
-  sizeWidgetGroupBox = sizeButtonGroupBox;
-  sizeGroupBoxLayout = sizeWidgetGroupBox->layout();
-
+  sizeWidgetLayout->add(sizeButtonGroupBox);
+
+  connect( sizeButtonGroupBox, SIGNAL( clicked(int) ), this, SLOT( changeSizeBox()) );
 #else
   
-  sizeWidgetGroupBox = new QGroupBox(tr("Size"));
-  sizeGroupBoxLayout = new QVBoxLayout(sizeWidgetGroupBox);
-  sizeButtonGroupBox = new QButtonGroup();
+  QGroupBox * sizeGroupBox = new QGroupBox(tr("Size"));
+  QLayout *sizeGroupBoxLayout = new QVBoxLayout(sizeGroupBox);
+  QButtonGroup * sizeButtonGroupBox = new QButtonGroup();
 
   original = new QRadioButton("Original");
   modify = new QRadioButton("Modify");
 
+  sizeButtonGroupBox->addButton(original);
   sizeButtonGroupBox->addButton(modify);
-  sizeButtonGroupBox->addButton(original);
   sizeButtonGroupBox->setExclusive(true);
 
+  sizeGroupBoxLayout->addWidget(original);    
   sizeGroupBoxLayout->addWidget(modify);    
-  sizeGroupBoxLayout->addWidget(original);    
+
+  sizeGroupBox->setLayout(sizeGroupBoxLayout);
+  sizeWidgetLayout->addWidget(sizeGroupBox);
   
-  sizeWidgetGroupBox->setLayout(sizeGroupBoxLayout);
+  connect( sizeButtonGroupBox, SIGNAL( buttonClicked(int) ), this, SLOT( changeSizeBox()) );
 #endif
   original->setChecked( true );
 
 
-  ratioCheckBox = new QCheckBox( "Keep ratio",modifyAndRatioWidget);
-  ratioCheckBox->setChecked( true );
-
-  modifyAndRatioLayout->addWidget(modify);
-  modifyAndRatioLayout->addWidget(ratioCheckBox);
-#if QT_VERSION >= 0x040000
-  modifyAndRatioWidget->setLayout(modifyAndRatioLayout);
-#endif
-#if QT_VERSION < 0x040000
-  sizeGroupBoxLayout->add(modifyAndRatioWidget);
-#else
-  sizeGroupBoxLayout->addWidget(modifyAndRatioWidget);
-#endif
-  if (modify->isChecked()) {
-    ratioCheckBox->show();
-  } else {
-    ratioCheckBox->hide();
-  }
-
-#if QT_VERSION < 0x040000
-  connect( sizeButtonGroupBox, SIGNAL( clicked(int) ), this, SLOT( changeSizeBox()) );
-#else
-  connect( sizeButtonGroupBox, SIGNAL( buttonClicked(int) ), this, SLOT( changeSizeBox()) );
-#endif
-
   // height
-  heightWidget = new QWidget();
+  heightWidget = new QWidget(this);
 
   QHBoxLayout *heightLineLayout = new QHBoxLayout(heightWidget);
@@ -261 +236 @@
   heightLineLayout->addWidget(height);
 #endif
+
 #if QT_VERSION >= 0x040000
   heightWidget->setLayout(heightLineLayout);
 #endif
-#if QT_VERSION < 0x040000
-  sizeGroupBoxLayout->add(heightWidget);
-#else
-  sizeGroupBoxLayout->addWidget(heightWidget);
+
+#if QT_VERSION < 0x040000
+  sizeWidgetLayout->add(heightWidget);
+#else
+  sizeWidgetLayout->addWidget(heightWidget);
 #endif
   connect( height, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textHeightChanged(const QString &) ) );
@@ -273 +250 @@
 
   // width
-  widthWidget = new QWidget();
+  widthWidget = new QWidget(this);
 
   QHBoxLayout *widthLineLayout = new QHBoxLayout(widthWidget);
@@ -293 +270 @@
 #endif
 #if QT_VERSION < 0x040000
-  sizeGroupBoxLayout->add(widthWidget);
-#else
-  sizeGroupBoxLayout->addWidget(widthWidget);
+  sizeWidgetLayout->add(widthWidget);
+#else
+  sizeWidgetLayout->addWidget(widthWidget);
 #endif
   connect( width, SIGNAL( textChanged ( const QString& ) ), this, SLOT( textWidthChanged(const QString &) ) );
 
-#if QT_VERSION >= 0x040000
-  sizeWidgetGroupBox->setLayout(sizeGroupBoxLayout);
-#endif
-  globalVLayout->addWidget(sizeWidgetGroupBox);
-
+
+
+  // ratio check box
+
+  ratioCheckBox = new QCheckBox( "Keep ratio",sizeWidget);
+  ratioCheckBox->setChecked( true );
+
+#if QT_VERSION < 0x040000
+  sizeWidgetLayout->add(ratioCheckBox);
+#else
+  sizeWidgetLayout->addWidget(ratioCheckBox);
+#endif
+
+#if QT_VERSION < 0x040000
+  ratioCheckBox->setEnabled ( false );
+  heightWidget->setEnabled ( false );
+  widthWidget->setEnabled ( false );
+#else
+  ratioCheckBox->hide();
   heightWidget->hide();
   widthWidget->hide();
+#endif
+
+#if QT_VERSION >= 0x040000
+  sizeWidget->setLayout(sizeWidgetLayout);
+#endif
+  globalVLayout->addWidget(sizeWidget);
+
+
+
 
   // button ok/cancel box
@@ -382 +382 @@
 
   if ( original->isChecked()) {
+#if QT_VERSION < 0x040000
+    ratioCheckBox->setEnabled ( false );
+    heightWidget->setEnabled ( false );
+    widthWidget->setEnabled ( false );
+#else
+    ratioCheckBox->hide();
     heightWidget->hide();
     widthWidget->hide();
-    ratioCheckBox->hide();
+#endif
   } else {
+#if QT_VERSION < 0x040000
+    ratioCheckBox->setEnabled ( true );
+    heightWidget->setEnabled ( true );
+    widthWidget->setEnabled ( true );
+#else
     heightWidget->show();
     widthWidget->show();
     ratioCheckBox->show();
+#endif
   }
 }