Changeset 569 for trunk/geant4/visualization

Timestamp:

Aug 17, 2007, 5:27:44 PM (18 years ago)

Author:

garnier

Message:

r579@mac-90108: laurentgarnier | 2007-08-16 15:58:30 +0200
desormais le glWidget est accroche au mainWindow

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (5 diffs)

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

@@ -47 +47 @@
 
 #include "G4Qt.hh"
-#include "G4UIManager.hh"
+#include "G4UIsession.hh"
+#include "G4UImanager.hh"
 #include <QtGui/qboxlayout.h>
 #include <QtGui/qdialog.h>
@@ -86 +87 @@
   //  fWindow->resize(100, 300);
   glFlush ();
+  GLWindow->show();
   printf("G4OpenGLQtViewer::ShowView -----------------------\n");
 
@@ -127 +129 @@
 
   // create window
-  if (qApp) {
-    GLWindow = new QDialog();//qApp->mainWidget());
+  if (((QApplication*)interactorManager->GetMainInteractor())) {
+    // look for the main window
+    bool found = false;
+    foreach (QWidget *widget, QApplication::allWidgets()) {
+      if ((found== false) && (widget->inherits("QMainWindow"))) {
+        GLWindow = new QDialog(widget);
+        found = true;
+      }
+    }
+    if (found==false) {
+      GLWindow = new QDialog();
+    }
   } else {
     GLWindow = new QDialog();
@@ -176 +188 @@
 {
   printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
+  delete GLWindow;
   delete fContextMenu;    
 }
@@ -618 +631 @@
 
 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",
-                                                 ".", "Images (*.BMP *.GIF *.JPG *.JPEG *.PNG *.PBM *.PGM *.PPM *.TIFF *.XBM *.XPM)" );
+                                                 ".", tr("Images (*.BMP *.GIF *.JPG *.JPEG *.PNG *.PBM *.PGM *.PPM *.TIFF *.XBM *.XPM)") );
 
   if(!nomFich.endsWith(".eps")) {