Changeset 579 for trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

Timestamp:

Sep 18, 2007, 6:39:37 PM (17 years ago)

Author:

garnier

Message:

r599@mac-90108: laurentgarnier | 2007-09-18 18:43:19 +0200
correction du ticket #72 et la suppresion de la fenetre OpenGL entraine desormais un message d erreur lors du prochain BeamOn

File:

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

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

@@ -68 +68 @@
   //   ::wglMakeCurrent(fHDC,fHGLRC);
   //  fWindow->makeCurrent();
-  G4OpenGLViewer::SetView ();  
+  G4OpenGLViewer::SetView ();
   printf("G4OpenGLQtViewer::SetView --------------------\n");
 }
@@ -85 +85 @@
   printf("G4OpenGLQtViewer::ShowView  +++++++++++++++++++++\n");
   glFlush ();
-  GLWindow->activateWindow();
-  printf("G4OpenGLQtViewer::ShowView -----------------------\n");
-
+  if (!GLWindow) {
+    G4cerr << "Visualization window not defined, please choose one before" << G4endl;
+  } else {
+    GLWindow->activateWindow();
+    printf("G4OpenGLQtViewer::ShowView -----------------------\n");
+  }
   //   // Empty the Windows message queue :
   //   MSG event;
@@ -132 +135 @@
     foreach (QWidget *widget, QApplication::allWidgets()) {
       if ((found== false) && (widget->inherits("QMainWindow"))) {
-        GLWindow = new QDialog(widget);
+        printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
+        GLWindow = new QDialog(widget,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
         found = true;
       }
     }
     if (found==false) {
+      printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist, but not found\n");
       GLWindow = new QDialog();
     }
   } else {
+    printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
     GLWindow = new QDialog();
   }
@@ -152 +158 @@
   GLWindow->show();
   
+  // delete the pointer if close this
+  //  GLWindow->setAttribute(Qt::WA_DeleteOnClose);
+
+  QObject ::connect(GLWindow, 
+                    SIGNAL(rejected()),
+                    this, 
+                    SLOT(dialogClosed()));
+
   WinSize_x = 400;
   WinSize_y = 400;
@@ -166 +180 @@
 
 }
+
+/**  Close the dialog and set the pointer to NULL
+ */
+void G4OpenGLQtViewer::dialogClosed() {
+  GLWindow = NULL;
+}
+
 
 //////////////////////////////////////////////////////////////////////////////
@@ -187 +208 @@
 {
   printf("G4OpenGLQtViewer::~G4OpenGLQtViewer \n");
-  delete fContextMenu;    
+  delete fContextMenu;
 }
 
@@ -357 +378 @@
 void G4OpenGLQtViewer::manageContextMenuEvent(QContextMenuEvent *e)
 {
-  if (!GLWindow) return;
+  if (!GLWindow) {
+    G4cerr << "Visualization window not defined, please choose one before" << G4endl;
+  } else {
   
-  if (!fContextMenu) 
-    createPopupMenu();
-
-  // launch menu
-  if ( fContextMenu ) {
-    fContextMenu->exec( e->globalPos() );
-    //    delete fContextMenu;
+    if (!fContextMenu) 
+      createPopupMenu();
+    
+    // launch menu
+    if ( fContextMenu ) {
+      fContextMenu->exec( e->globalPos() );
+      //    delete fContextMenu;
+    }
   }
   e->accept();