Changeset 580 for trunk

Timestamp:

Sep 20, 2007, 5:24:46 PM (17 years ago)

Author:

garnier

Message:

r601@mac-90108: laurentgarnier | 2007-09-20 15:47:27 +0200
passage du fileSave en natif mac

Location:

trunk/geant4/visualization

Files:

• G4History.macro (modified) (1 diff)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (3 diffs)
• currentEvent.rndm (modified) (1 diff)

trunk/geant4/visualization/G4History.macro

@@ -59 +59 @@
 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
 /N03/event/printModulo 100
-/run/beamOn 1
-/control/execute visTutor/exN03Vis14.mac
-/vis/open OGLSQT
-/vis/sceneHandler/create OGLSQT
-/vis/sceneHandler/attach
-/vis/viewer/create ! ! 600
-/vis/viewer/refresh
-/vis/viewer/reset
-/vis/viewer/refresh
-/vis/viewer/set/viewpointThetaPhi  20 70
-/vis/viewer/refresh
-/vis/viewer/zoom               0.8 
-/vis/viewer/refresh
-/vis/drawVolume
-/vis/scene/create
-/vis/scene/add/volume world
-/vis/scene/notifyHandlers
-/vis/sceneHandler/attach
-/vis/viewer/flush
-/vis/viewer/refresh viewer-2
-/vis/viewer/update viewer-2
-/vis/open DAWNFILE
-/vis/sceneHandler/create DAWNFILE
-/vis/sceneHandler/attach
-/vis/viewer/create ! ! 600
-/vis/viewer/reset
-/vis/viewer/zoom               1.1
-/vis/viewer/set/viewpointThetaPhi  35 35
-/vis/drawVolume           Absorber 
-/vis/scene/create
-/vis/scene/add/volume Absorber
-/vis/sceneHandler/attach
-/vis/scene/add/axes      0 0 0 500 mm
-/vis/scene/notifyHandlers
-/vis/scene/add/text      0 0 0 mm  40 -100 -140   Absorber 
-/vis/scene/notifyHandlers
-/vis/scene/add/scale     10 cm z 1 0 0 manual -2.5 -5 0  cm
-/vis/scene/notifyHandlers
-/vis/scene/notifyHandlers
-/vis/viewer/update
-/vis/viewer/reset
-/vis/viewer/zoom               1.1
-/vis/viewer/set/viewpointThetaPhi  35 35
-/vis/drawVolume                Gap 
-/vis/scene/create
-/vis/scene/add/volume Gap
-/vis/sceneHandler/attach
-/vis/scene/add/axes       0 0 0 500 mm
-/vis/scene/notifyHandlers
-/vis/scene/add/text       0 0 0 mm  50 -100 -140   Gap 
-/vis/scene/notifyHandlers
-/vis/scene/add/scale      10 cm z 1 0 0 manual -2.5 -5  0 cm
-/vis/scene/notifyHandlers
-/vis/scene/notifyHandlers
-/vis/viewer/update
-/vis/viewer/reset
-/vis/viewer/zoom               1.1
-/vis/viewer/set/viewpointThetaPhi  35 35
-/vis/viewer/set/culling         global false
-/vis/drawVolume 
-/vis/scene/create
-/vis/scene/add/volume world
-/vis/scene/notifyHandlers
-/vis/sceneHandler/attach
-/vis/scene/add/axes      0 0 0 500 mm
-/vis/scene/notifyHandlers
-/vis/scene/add/text      0 0 0 mm 50 -100 -240   World
-/vis/scene/notifyHandlers
-/vis/scene/add/scale     10 cm x 1 0 0 
-/vis/scene/notifyHandlers
-/vis/scene/notifyHandlers
-/vis/viewer/update
-/vis/viewer/set/culling       global true
-/run/beamOn 1

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

@@ -45 +45 @@
 #include "G4Normal3D.hh"
 #include "G4Scene.hh"
+#include "G4OpenGLQtExportDialog.h"
 
 #include "G4Qt.hh"
@@ -52 +53 @@
 #include <QtGui/qdialog.h>
 #include <QtGui/qmenu.h>
+#include <QImageWriter>
+#include <QMessageBox>
 #include <QFileDialog.h>
 
@@ -653 +656 @@
 
 void G4OpenGLQtViewer::actionCreateEPS() {
-  //QString QFileDialog::getSaveFileName ( QWidget * parent = 0,
-  //  const QString & caption = QString(),
-  // const QString & dir = QString(),
-  // const QString & filter = QString(),
-  // QString * selectedFilter = 0, Options options = 0 ) 
-  QString nomFich = QFileDialog::getSaveFileName(GLWindow,
-                                                 "Choose a file",
-                                                 ".", tr("Images (*.BMP *.GIF *.JPG *.JPEG *.PNG *.PBM *.PGM *.PPM *.TIFF *.XBM *.XPM)") );
-
-  if(!nomFich.endsWith(".eps")) {
-    printf("G4OpenGLQtViewer::actionCreateEPS() COULD NOT GENERATE EPS FOR THE MOMENT\n");
-  } else {
+  QString filters;
+  QList<QByteArray> formats =  QImageWriter::supportedImageFormats ();
+  for (int i = 0; i < formats.size(); ++i) {
+    filters +="."+formats.at(i);
+    if ((i+1) <formats.size()) {
+      filters += ";;";
+    }
+  }
+  
+  QString nomFich =  QFileDialog::getSaveFileName ( GLWindow,
+                                                    tr("Save as ..."),
+                                                    ".",
+                                                    filters ); 
+  // bmp jpg jpeg png ppm xbm xpm
+  if(nomFich.endsWith(".eps")) {
+    G4cerr << "This version of G4UI Could not generate EPS." << G4endl;
+  } else if(nomFich.endsWith(".jpg") || nomFich.endsWith(".jpeg")) {
+    G4cerr << "Should display a quality selector" << G4endl;
+    G4OpenGLQtExportDialog* exportDialog= new G4OpenGLQtExportDialog(false, this,"exportDialog",TRUE,WStyle_Tool|WDestructiveClose);
     fWindow->grabFrameBuffer().save(nomFich);
-  }
+  } else {
+    fWindow->grabFrameBuffer().save(nomFich);
+    // grabFrameBuffer() :: Returns an image of the frame buffer. If withAlpha is true the alpha channel is included.
+  }
+  
   printf("G4OpenGLQtViewer::actionCreateEPS() \n");
 }
+
+/*
+// http://www.google.com/codesearch?hl=en&q=+jpg+Qt+quality+QDialog+show:FZkUoth8oiw:TONpW2mR-_c:tyTfrKMO-xI&sa=N&cd=2&ct=rc&cs_p=http://soft.proindependent.com/src/qtiplot-0.8.9.zip&cs_f=qtiplot-0.8.9/qtiplot/src/application.cpp#a0
+void ApplicationWindow::exportLayer()
+{
+  QWidget *w=ws->activeWindow();
+  if (!w || !w->isA("MultiLayer"))
+    return;
+  
+  Graph* g = ((MultiLayer*)w)->activeGraph();
+  if (!g)
+    return;
+  
+  ImageExportDialog *ied = new ImageExportDialog(this, 0);
+  ied->setDir(workingDir);
+  if ( ied->exec() == QDialog::Accepted )
+    {
+      workingDir = ied->dirPath();
+      QString fname = ied->selectedFile();
+      QString selectedFilter = ied->selectedFilter();
+  
+      QFileInfo fi(fname);
+      QString baseName = fi.fileName();
+  
+      if (baseName.contains(".")==0)
+        fname.append(selectedFilter.remove("*"));
+  
+      if ( QFile::exists(fname) &&
+           QMessageBox::question(0, tr("QtiPlot - Overwrite File?"),
+                                 tr("A file called: <p><b>%1</b><p>already exists. "
+                                    "Do you want to overwrite it?")
+                                 .arg(fname),
+                                 tr("&Yes"), tr("&No"),
+                                 QString::null, 0, 1 ) )
+        return ;
+      else
+        {
+          QFile f(fname);
+          if ( !f.open( IO_WriteOnly ) )
+            {
+              QMessageBox::critical(0, tr("QtiPlot - Export Error"),
+                                    tr("Could not write to file: <br><h4> %1 </h4><p>Please verify that you have the right to write to this location!").arg(fname));
+              return;
+            }
+  
+          if (selectedFilter.contains(".eps"))
+            {
+              if (ied->showExportOptions())
+                {
+                  epsExportDialog *ed= new epsExportDialog (fname, this, "exportDialog", TRUE, WStyle_Tool|WDestructiveClose);
+                  connect (ed, SIGNAL(exportToEPS(const QString&, int, QPrinter::Orientation, QPrinter::PageSize, QPrinter::ColorMode)),
+                           g, SLOT(exportToEPS(const QString&, int, QPrinter::Orientation, QPrinter::PageSize, QPrinter::ColorMode)));
+  
+                  ed->showNormal();
+                  ed->setActiveWindow();
+                }
+              else
+                g->exportToEPS(fname);
+  
+              if (((MultiLayer*)w)->hasOverlapingLayers())
+                ((MultiLayer*)w)->updateTransparency();
+              return;
+            }
+          else if (selectedFilter.contains(".svg"))
+            {
+              g->exportToSVG(fname);
+              return;
+            }
+          //  else if (selectedFilter.contains(".wmf"))
+          //  {
+          //  g->exportToWmf(fname);
+          //  return;
+        }
+      QStringList list=QImage::outputFormatList ();
+      for (int i=0; i<(int)list.count(); i++)
+        {
+          if (selectedFilter.contains("."+(list[i]).lower()))
+            {
+              if (ied->showExportOptions())
+                {
+                  imageExportDialog* ed= new imageExportDialog(false, this,"exportDialog",TRUE,WStyle_Tool|WDestructiveClose);
+                  connect (ed, SIGNAL(options(const QString&, const QString&, int, bool)),
+                           g, SLOT(exportImage(const QString&, const QString&, int, bool)));
+  
+                  ed->setExportPath(fname, list[i]);
+                  ed->enableTransparency();
+                  ed->showNormal();
+                  ed->setActiveWindow();
+                }
+              else
+                g->exportImage(fname, list[i], 100, true);
+  
+              if (((MultiLayer*)w)->hasOverlapingLayers())
+                ((MultiLayer*)w)->updateTransparency();
+              return;
+            }
+        }
+    }
+}
+}
+
+void Graph::exportToSVG(const QString& fname)
+{
+  // enable workaround for Qt3 misalignments
+  QwtPainter::setSVGMode(true);
+  QPicture picture;
+  QPainter p(&picture);
+  d_plot->print(&p, d_plot->rect());
+  p.end();
+
+  picture.save(fname, "svg");
+}
+*/
+
 
 

trunk/geant4/visualization/currentEvent.rndm

@@ -2 +2 @@
 1878463799
 0
-1180857998
-122938492
+9876
+54321