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

Timestamp:

Nov 22, 2007, 6:07:00 PM (17 years ago)

Author:

garnier

Message:

r661@mac-90108: laurentgarnier | 2007-11-22 18:10:43 +0100
en debug

File:

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

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

@@ -36 +36 @@
 #ifdef G4VIS_BUILD_OPENGLQT_DRIVER
 
+#define GEANT4_QT_DEBUG
+
 #include "G4OpenGLQtViewer.hh"
 
@@ -194 +196 @@
     }
 #endif
+    // FIXME : not tested in Qt4
+    glWidget->reparent(GLWindow,0,QPoint(0,0));  
 
     if (found==false) {
@@ -224 +228 @@
   GLWindow->resize(300, 300);
   GLWindow->move(900,300);
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::Should show glWidget\n");
+#endif
   GLWindow->show();
   
@@ -229 +236 @@
   //  GLWindow->setAttribute(Qt::WA_DeleteOnClose);
 
+#if QT_VERSION >= 0x040000
   QObject ::connect(GLWindow, 
                     SIGNAL(rejected()),
                     this, 
                     SLOT(dialogClosed()));
+#endif
 
   WinSize_x = 400;
@@ -251 +260 @@
 }
 
+#if QT_VERSION >= 0x040000
 /**  Close the dialog and set the pointer to NULL
  */
 void G4OpenGLQtViewer::dialogClosed() {
-  GLWindow = NULL;
-}
-
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer::dialogClosed END\n");
+#endif
+  //  GLWindow = NULL;
+}
+#endif
 
 //////////////////////////////////////////////////////////////////////////////
@@ -340 +353 @@
 
   QMenu *mRepresentation = mStyle->addMenu("&Representation");
-  QAction *polyhedron = mRepresentation->addAction("Polyhedron");
+ QAction *polyhedron = mRepresentation->addAction("Polyhedron");
   QAction *nurbs = mRepresentation->addAction("NURBS");
 #endif
@@ -362 +375 @@
   fDrawingWireframe = new QPopupMenu(mDrawing);
   mDrawing->insertItem("&Wireframe",fDrawingWireframe);
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer:: fDrawingWireframe creation\n");
+#endif
 
   mDrawing->setCheckable(true);
@@ -410 +426 @@
     mDrawing->clear();
   }
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer:: fDrawingWireframe 1\n");
+#endif
+  QObject ::connect(fDrawingWireframe, 
+                    SIGNAL(activated(int)),
+                    this, 
+                    SLOT(actionDrawingWireframe()));
+#ifdef GEANT4_QT_DEBUG
+  printf("G4OpenGLQtViewer:: fDrawingWireframe 2\n");
+#endif
+  QObject ::connect(fDrawingLineRemoval, 
+                    SIGNAL(activated(int)),
+                    this, 
+                    SLOT(actionDrawingLineRemoval()));
+  QObject ::connect(fDrawingSurfaceRemoval, 
+                    SIGNAL(activated(int)),
+                    this, 
+                    SLOT(actionDrawingSurfaceRemoval()));
+  QObject ::connect(fDrawingLineSurfaceRemoval, 
+                    SIGNAL(activated(int)),
+                    this, 
+                    SLOT(actionDrawingLineSurfaceRemoval()));
 #else
   if (d_style == G4ViewParameters::wireframe) {
@@ -422 +460 @@
     mDrawing->clear();
   }
-#endif
-
   QObject ::connect(fDrawingWireframe, 
                     SIGNAL(triggered(bool)),
@@ -440 +476 @@
                     this, 
                     SLOT(actionDrawingLineSurfaceRemoval()));
+#endif
+
 
 
@@ -477 +515 @@
   exitG4->addTo(mActions);
   createEPS->addTo(mActions);
+  QObject ::connect(controlPanels, 
+                    SIGNAL(activated()),
+                    this, 
+                    SLOT(actionControlPanels()));
+  QObject ::connect(exitG4, 
+                    SIGNAL(activated()),
+                    this, 
+                    SLOT(actionExitG4()));
+  QObject ::connect(createEPS, 
+                    SIGNAL(activated()),
+                    this,
+                    SLOT(actionCreateEPS()));
 
 #else
@@ -484 +534 @@
   QAction *exitG4 = mActions->addAction("Exit to G4Vis >");
   QAction *createEPS = mActions->addAction("Save as ...");
-#endif
-
   QObject ::connect(controlPanels, 
                     SIGNAL(triggered()),
@@ -498 +546 @@
                     this,
                     SLOT(actionCreateEPS()));
+#endif
+
 
 
@@ -653 +703 @@
     ((QPopupMenu*)action1->parent())->setItemChecked(1,true);
    
-  QObject ::connect(action1, SIGNAL(triggered(bool)),action2, SLOT(toggle()));
-  QObject ::connect(action2, SIGNAL(triggered(bool)),action1, SLOT(toggle()));
+  //FIXME : Should not work on Qt3
+  QObject ::connect(action1, SIGNAL(activated()),action2, SLOT(toggle()));
+  QObject ::connect(action2, SIGNAL(activated()),action1, SLOT(toggle()));
 
   QObject ::connect(action1, SIGNAL(toggled(bool)),this, method.c_str());