Changeset 655 for trunk/geant4/visualization/OpenGL

Timestamp:

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

Author:

garnier

Message:

tickets #102 et #103 corriges

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog.cc (modified) (1 diff)
• G4OpenGLQtViewer.cc (modified) (4 diffs)

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);

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

@@ -1091 +1091 @@
 
     QImage image;
+    bool res = false;
     if ((exportDialog->getWidth() !=fWindow->width()) ||
         (exportDialog->getHeight() !=fWindow->height())) {
+      if (format != QString("eps")) {
       G4cerr << "Export->Change Size : This function is not implemented, to export in another size, please resize your frame to what you need\n" << G4endl;
       
@@ -1110 +1112 @@
       //      glResized->resize(exportDialog->getWidth()*2,exportDialog->getHeight()*2);
       //      image = glResized->grabFrameBuffer();
-      
+      }      
     } else {
       image = fWindow->grabFrameBuffer();
@@ -1116 +1118 @@
     if (format == QString("eps")) {
       if (exportDialog->getVectorEPS()) {
-        generateVectorEPS(nomFich,exportDialog->getWidth(),exportDialog->getHeight(),image);
+        res = generateVectorEPS(nomFich,exportDialog->getWidth(),exportDialog->getHeight(),image);
       } else {
-        generateEPS(nomFich,exportDialog->getNbColor(),image);
+        res = generateEPS(nomFich,exportDialog->getNbColor(),image);
       }
     } else if ((format == "ps") || (format == "pdf")) {
-      generatePS_PDF(nomFich,exportDialog->getNbColor(),image);
-  } else if ((format == "tif") ||
-             (format == "tiff") ||
-             (format == "jpg") ||
-             (format == "jpeg") ||
-             (format == "png") ||
-             (format == "pbm") ||
-             (format == "pgm") ||
-             (format == "ppm") ||
-             (format == "bmp") ||
-             (format == "xbm") ||
-             (format == "xpm")) {
-#if QT_VERSION < 0x040000
-      bool res = image.save(nomFich,selectedFormat->ascii(),exportDialog->getSliderValue());
-#else
-      bool res = image.save(nomFich,0,exportDialog->getSliderValue());
-#endif
-      if (res == false) {
-        G4cerr << "Error while saving file...\n" << G4endl;
-      }
+      res = generatePS_PDF(nomFich,exportDialog->getNbColor(),image);
+    } else if ((format == "tif") ||
+               (format == "tiff") ||
+               (format == "jpg") ||
+               (format == "jpeg") ||
+               (format == "png") ||
+               (format == "pbm") ||
+               (format == "pgm") ||
+               (format == "ppm") ||
+               (format == "bmp") ||
+               (format == "xbm") ||
+               (format == "xpm")) {
+#if QT_VERSION < 0x040000
+      res = image.save(nomFich,selectedFormat->ascii(),exportDialog->getSliderValue());
+#else
+      res = image.save(nomFich,0,exportDialog->getSliderValue());
+#endif
     } else {
       G4cerr << "This version of G4UI Could not generate the selected format\n" << G4endl;
+    }
+    if (res == false) {
+#if QT_VERSION < 0x040000
+      G4cerr << "Error while saving file... "<<nomFich.ascii()<<"\n" << G4endl;
+#else
+      G4cerr << "Error while saving file... "<<nomFich.toStdString().c_str()<<"\n" << G4endl;
+#endif
+    } else {
+#if QT_VERSION < 0x040000
+      G4cerr << "File "<<nomFich.ascii()<<" saved \n" << G4endl;
+#else
+      G4cerr << "File "<<nomFich.toStdString().c_str()<<" saved \n" << G4endl;
+#endif
     }
     
@@ -1334 +1346 @@
     spewWireframeEPS (file, returned, feedback_buffer, "rendereps");
   } else {
-    printf("Could not open %s\n", print_string);
+    G4cerr << "Could not open "<< print_string<<"\n" << G4endl;
   }