Changeset 579 for trunk/geant4/visualization/OpenGL

Timestamp:

Sep 18, 2007, 6:39:37 PM (18 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

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (2 diffs)
• src/G4OpenGLQtViewer.cc (modified) (7 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (6 diffs)

trunk/geant4/visualization/OpenGL/include/G4OpenGLQtViewer.hh

@@ -78 +78 @@
   void createPopupMenu();
   void createRadioAction(QAction *,QAction *, const std::string&,unsigned int a=1);
+  
   QMenu *fContextMenu;
   bool fMouseAction; // 1: rotate 0:move
@@ -104 +105 @@
   void toggleAux(bool);
   void toggleFullScreen(bool);
+
+  void dialogClosed();
 };
 

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

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

@@ -55 +55 @@
 G4OpenGLStoredQtViewer::~G4OpenGLStoredQtViewer() {
    printf("GLWidget::~GLWidget \n");
-     makeCurrent();
+   makeCurrent();
+   // this is connect to the Dialog for deleting it properly
+   // when close event.
+   //   ((QDialog*)window())->reject();
    printf("GLWidget::~GLWidget END\n");
 }
@@ -104 +107 @@
 
   printf("G4OpenGLStoredQtViewer::DrawView %d %d   VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n",WinSize_x, WinSize_y);
-
+  printf("G4OpenGLStoredQtViewer::DrawView Dialog adress : %d\n",GLWindow);
    G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();
 
@@ -116 +119 @@
    // if necessary...
    if (!fNeedKernelVisit) 
-     printf("***************************  CASE 0 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
 
    if (!fNeedKernelVisit) KernelVisitDecision ();
-   printf("***************************  kernelVisit:%d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",fNeedKernelVisit);
    
    G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
@@ -209 +210 @@
  {
    if (!readyToPaint) {
-     printf("\n\nG4OpenGLStoredQtViewer::paintGL ============  Not ready %d\n",readyToPaint);
+     printf("G4OpenGLStoredQtViewer::paintGL ============  Not ready %d\n",readyToPaint);
      readyToPaint= true;
      return;
@@ -218 +219 @@
    if ( !hasToRepaint) {
      if (((WinSize_x == (G4int)width())) &&(WinSize_y == (G4int) height())) {
-       printf("\n\nG4OpenGLStoredQtViewer::paintGL ============  Dont repaint\n");
+       printf("G4OpenGLStoredQtViewer::paintGL ============  Dont repaint\n");
        return;
      }
    }
    nbPaint++;
-   printf("\n\nG4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
+   printf("G4OpenGLStoredQtViewer::paintGL VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV %d ready %d\n",nbPaint,readyToPaint);
    WinSize_x = (G4int) width();
    WinSize_y = (G4int) height();
@@ -241 +242 @@
    hasToRepaint =false;
 
-   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n\n\n",nbPaint,readyToPaint);
+   printf("G4OpenGLStoredQtViewer::paintGL ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ %d ready %d\n",nbPaint,readyToPaint);
  }