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

Timestamp:

Dec 11, 2007, 3:45:51 PM (17 years ago)

Author:

garnier

Message:

tickets #102 et #103 corriges

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtExportDialog.cc (modified) (1 diff)

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

@@ -277 +277 @@
 #if QT_VERSION < 0x040000
 
-    QButtonGroup * EPSColorButtonGroupBox = new QButtonGroup( 2,Qt::Vertical, tr("EPS options"),this);
+    //    QButtonGroup * EPSColorButtonGroupBox = new QButtonGroup( 2,Qt::Vertical, tr("EPS options"),this);
     //    EPSGroupBoxLayout = new QVBoxLayout(EPSColorButtonGroupBox);
-    colorButton = new QRadioButton("Color",EPSColorButtonGroupBox);
-    BWButton = new QRadioButton("Grayscale",EPSColorButtonGroupBox);
-    EPSColorButtonGroupBox->setInsideMargin (15); 
-    EPSColorButtonGroupBox->insert(colorButton);
-    EPSColorButtonGroupBox->insert(BWButton);
-    EPSColorButtonGroupBox->setExclusive(true);
-    EPSWidgetGroupBox->add(EPSColorButtonGroupBox);
+    //     colorButton = new QRadioButton("Color",EPSColorButtonGroupBox);
+    //     BWButton = new QRadioButton("Grayscale",EPSColorButtonGroupBox);
+    //     EPSColorButtonGroupBox->setInsideMargin (15); 
+    //     EPSColorButtonGroupBox->insert(colorButton);
+    //     EPSColorButtonGroupBox->insert(BWButton);
+    //     EPSColorButtonGroupBox->setExclusive(true);
+    //     EPSWidgetGroupBox->add(EPSColorButtonGroupBox);
 
     vectorEPSCheckBox = new QCheckBox( "Vector EPS File",EPSWidgetGroupBox);
+    EPSWidgetGroupBox->add(vectorEPSCheckBox);
+
+#else
+     EPSWidgetGroupBox = new QGroupBox(tr("EPS options"));
+//     EPSGroupBoxLayout = new QVBoxLayout(EPSWidgetGroupBox);
+//     EPSGroupBoxLayout->setMargin (15); 
+
+//     colorButton = new QRadioButton("Color",EPSWidgetGroupBox);
+//     BWButton = new QRadioButton("Grayscale",EPSWidgetGroupBox);
+
+//     QButtonGroup * EPSColorButtonGroupBox = new QButtonGroup();
+//     EPSColorButtonGroupBox->addButton(colorButton);
+//     EPSColorButtonGroupBox->addButton(BWButton);
+//     EPSColorButtonGroupBox->setExclusive(true);
+
+//     EPSGroupBoxLayout->addWidget(colorButton);    
+//     EPSGroupBoxLayout->addWidget(BWButton);    
+
+    vectorEPSCheckBox = new QCheckBox( "Vector EPS File",EPSWidgetGroupBox);
+    EPSGroupBoxLayout->addWidget(vectorEPSCheckBox);
+
+    EPSWidgetGroupBox->setLayout(EPSGroupBoxLayout);
+#endif
+    //    colorButton->setChecked( true );
     vectorEPSCheckBox->setChecked( true );
-    EPSWidgetGroupBox->add(vectorEPSCheckBox);
-
-#else
-    EPSWidgetGroupBox = new QGroupBox(tr("EPS options"));
-    EPSGroupBoxLayout = new QVBoxLayout(EPSWidgetGroupBox);
-    EPSGroupBoxLayout->setMargin (15); 
-
-    colorButton = new QRadioButton("Color",EPSWidgetGroupBox);
-    BWButton = new QRadioButton("Grayscale",EPSWidgetGroupBox);
-
-    QButtonGroup * EPSColorButtonGroupBox = new QButtonGroup();
-    EPSColorButtonGroupBox->addButton(colorButton);
-    EPSColorButtonGroupBox->addButton(BWButton);
-    EPSColorButtonGroupBox->setExclusive(true);
-
-    EPSGroupBoxLayout->addWidget(colorButton);    
-    EPSGroupBoxLayout->addWidget(BWButton);    
-
-    vectorEPSCheckBox = new QCheckBox( "Vector EPS File",EPSWidgetGroupBox);
-    vectorEPSCheckBox->setChecked( true );
-    EPSGroupBoxLayout->addWidget(vectorEPSCheckBox);
-
-    EPSWidgetGroupBox->setLayout(EPSGroupBoxLayout);
-#endif
-    colorButton->setChecked( true );
     
     globalVLayout->addWidget(EPSWidgetGroupBox);