Changeset 638

Timestamp:

Dec 5, 2007, 3:47:18 PM (17 years ago)

Author:

garnier

Message:

amelioration du ticket #66

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog.cc (modified) (2 diffs)
• G4OpenGLQtViewer.cc (modified) (9 diffs)

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

@@ -117 +117 @@
   if ((nomFich.endsWith(".eps"))) {
 
-    //    transparencyEPS = new QCheckBox( "transparencyEPS" );
-    //    transparencyEPS->setText( "save background" );
-    //    transparencyEPS->setChecked( true );
 
     QWidget * EPSWidgetGroupBox; // widget containing group button
@@ -153 +150 @@
     colorButton->setChecked( true );
 
-    //    EPSGroupBoxLayout->addWidget(transparencyEPS);    
     globalVLayout->addWidget(EPSWidgetGroupBox);
 
   }
 
-  if(nomFich.endsWith(".tif") ||
-     nomFich.endsWith(".tiff") ||
-     nomFich.endsWith(".jpg") ||
-     nomFich.endsWith(".jpeg") ||
-     nomFich.endsWith(".png") ||
-     nomFich.endsWith(".xpm")) {
-
-    QGroupBox *transparencyGroupBox = new QGroupBox(tr("Transparency"),this);
-    QVBoxLayout *transparencyGroupBoxLayout = new QVBoxLayout(transparencyGroupBox);
-
-    boxTransparency = new QCheckBox("Save transparency",transparencyGroupBox);
-    boxTransparency->setChecked( false );
-    //    boxTransparency->setEnabled(false);
-
-    transparencyGroupBoxLayout->addWidget(boxTransparency);    
-#if QT_VERSION >= 0x040000
-    transparencyGroupBox->setLayout(transparencyGroupBoxLayout);
-#endif
-    globalVLayout->addWidget(transparencyGroupBox);
-
-  }
+  // FIXME : L. Garnier 4/12/07
+  // Not implented. Should deal with alpha channel
+
+//   if(nomFich.endsWith(".tif") ||
+//      nomFich.endsWith(".tiff") ||
+//      nomFich.endsWith(".jpg") ||
+//      nomFich.endsWith(".jpeg") ||
+//      nomFich.endsWith(".png") ||
+//      nomFich.endsWith(".xpm")) {
+
+//     QGroupBox *transparencyGroupBox = new QGroupBox(tr("Transparency"),this);
+//     QVBoxLayout *transparencyGroupBoxLayout = new QVBoxLayout(transparencyGroupBox);
+
+//     boxTransparency = new QCheckBox("Save transparency",transparencyGroupBox);
+//     boxTransparency->setChecked( false );
+
+//     transparencyGroupBoxLayout->addWidget(boxTransparency);    
+// #if QT_VERSION >= 0x040000
+//     transparencyGroupBox->setLayout(transparencyGroupBoxLayout);
+// #endif
+//     globalVLayout->addWidget(transparencyGroupBox);
+
+//   }
 
   // size box

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

@@ -113 +113 @@
   glFlush ();
   if (!GLWindow) {
-    G4cerr << "Visualization window not defined, please choose one before" << G4endl;
+    G4cerr << "Visualization window not defined, please choose one before\n" << G4endl;
   } else {
 #if QT_VERSION < 0x040000
@@ -698 +698 @@
 {
   if (!GLWindow) {
-    G4cerr << "Visualization window not defined, please choose one before" << G4endl;
+    G4cerr << "Visualization window not defined, please choose one before\n" << G4endl;
   } else {
   
@@ -1008 +1008 @@
   GLWindow->setWindowState(GLWindow->windowState() ^ Qt::WindowFullScreen);
 #else
-  G4cerr << "This version of G4UI Could not generate the selected format" << G4endl;
+  G4cerr << "This version of G4UI Could not generate the selected format\n" << G4endl;
 #endif
 #ifdef GEANT4_QT_DEBUG
@@ -1098 +1098 @@
     if ((exportDialog->getWidth() !=fWindow->width()) ||
         (exportDialog->getHeight() !=fWindow->height())) {
-      G4cerr << "Export->Change Size : This function is not implemented, to export in another size, please resize your frame to what you need" << G4endl;
+      G4cerr << "Export->Change Size : This function is not implemented, to export in another size, please resize your frame to what you need\n" << G4endl;
       
       //    rescaleImage(exportDialog->getWidth(),exportDialog->getHeight());// re-scale image
@@ -1129 +1129 @@
                nomFich.endsWith(".jpeg") ||
                nomFich.endsWith(".png") ||
+               nomFich.endsWith(".ppm") ||
                nomFich.endsWith(".bmp") ||
+               nomFich.endsWith(".xbm") ||
                nomFich.endsWith(".xpm")) {
       bool res = image.save(nomFich,0,exportDialog->getSliderValue());
       if (res == false) {
-        G4cerr << "Error while saving file..." << G4endl;
+        G4cerr << "Error while saving file...\n" << G4endl;
       }
 #ifdef GEANT4_QT_DEBUG
@@ -1139 +1141 @@
 #endif
     } else {
-      G4cerr << "This version of G4UI Could not generate the selected format" << G4endl;
+      G4cerr << "This version of G4UI Could not generate the selected format\n" << G4endl;
     }
     
@@ -1416 +1418 @@
   } else {
 #if QT_VERSION < 0x040000
-  G4cerr << "GenerateEPS:: No alpha channel image with Qt3. This is only supported with Qt4" << G4endl;
+  G4cerr << "GenerateEPS:: No alpha channel image with Qt3. This is only supported with Qt4\n" << G4endl;
 #else
     bool alpha = aImage.hasAlphaChannel();
@@ -1463 +1465 @@
 )
 {
+
 #if QT_VERSION < 0x040000
 #ifdef Q_WS_MAC || Q_WS_X11
@@ -1486 +1489 @@
   paint.end();
 #else
-  G4cerr << "This fonction is only supported on Mac OsX or X11 with Qt3. Full platform supported with Qt4" << G4endl;
+  G4cerr << "This fonction is only supported on Mac OsX or X11 with Qt3. Full platform supported with Qt4\n" << G4endl;
 #endif
 #else