Changeset 565 for trunk/geant4/visualization/OpenGL

Timestamp:

Aug 14, 2007, 4:57:05 PM (17 years ago)

Author:

garnier

Message:

r570@mac-90108: laurentgarnier | 2007-08-14 17:00:14 +0200
debut de l'EPS

Location:

trunk/geant4/visualization/OpenGL

Files:

• include/G4OpenGLQtViewer.hh (modified) (1 diff)
• src/G4OpenGLQtViewer.cc (modified) (6 diffs)
• src/G4OpenGLStoredQtViewer.cc (modified) (3 diffs)

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

@@ -92 +92 @@
   void actionDrawingSurfaceRemoval();
   void actionDrawingLineSurfaceRemoval();
+  void actionControlPanels();
+  void actionExitG4();
+  void actionCreateEPS();
+
   void toggleDrawingAction(int);
   void toggleMouseAction(bool);

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

@@ -51 +51 @@
 #include <QtGui/qdialog.h>
 #include <QtGui/qmenu.h>
+#include <QFileDialog.h>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -241 +242 @@
   }
 
-  QObject ::connect(fDrawingWireframe, SIGNAL(triggered(bool)),this, SLOT(actionDrawingWireframe()));
-  QObject ::connect(fDrawingLineRemoval, SIGNAL(triggered(bool)),this, SLOT(actionDrawingLineRemoval()));
-  QObject ::connect(fDrawingSurfaceRemoval, SIGNAL(triggered(bool)),this, SLOT(actionDrawingSurfaceRemoval()));
-  QObject ::connect(fDrawingLineSurfaceRemoval, SIGNAL(triggered(bool)),this, SLOT(actionDrawingLineSurfaceRemoval()));
+  QObject ::connect(fDrawingWireframe, 
+                    SIGNAL(triggered(bool)),
+                    this, 
+                    SLOT(actionDrawingWireframe()));
+  QObject ::connect(fDrawingLineRemoval, 
+                    SIGNAL(triggered(bool)),
+                    this, 
+                    SLOT(actionDrawingLineRemoval()));
+  QObject ::connect(fDrawingSurfaceRemoval, 
+                    SIGNAL(triggered(bool)),
+                    this, 
+                    SLOT(actionDrawingSurfaceRemoval()));
+  QObject ::connect(fDrawingLineSurfaceRemoval, 
+                    SIGNAL(triggered(bool)),
+                    this, 
+                    SLOT(actionDrawingLineSurfaceRemoval()));
 
 
@@ -261 +274 @@
   // Action Menu
   QMenu *mActions = fContextMenu->addMenu("&Actions");
-  QAction *rotation = mActions->addAction("Rotation control panel");
-  QAction *panning = mActions->addAction("Panning control panel");
-  QAction *setControl = mActions->addAction("Set control panel limits");
-
-  // Miscellany Menu
-  QMenu * mMisc = fContextMenu->addMenu("&Miscellany");
-  QAction *miscellany = mMisc->addAction("Miscellany control panel");
-  QAction *exitG4 = mMisc->addAction("Exit to G4Vis >");
-  QAction *createEPS = mMisc->addAction("Create .eps file");
+  QAction *controlPanels = mActions->addAction("Control panels");
+  QAction *exitG4 = mActions->addAction("Exit to G4Vis >");
+  QAction *createEPS = mActions->addAction("Create .eps file");
+  QObject ::connect(controlPanels, 
+                    SIGNAL(changed()),
+                    this, 
+                    SLOT(actionControlPanels()));
+  QObject ::connect(exitG4, 
+                    SIGNAL(changed()),
+                    this, 
+                    SLOT(actionExitG4()));
+  QObject ::connect(createEPS, 
+                    SIGNAL(changed()),
+                    this,
+                    SLOT(actionCreateEPS()));
+
 
   // Special Menu
@@ -395 +415 @@
 
 /**
-  Slot activated when drawing menu is toggle
-  @param aAction : 1 wireframe, 2 line removal, 3 surface removal, 4 line & surface removal
+   Slot activated when drawing menu is toggle
+   Warning : When G4OpenGLStoredQtViewer::DrawView() method call,
+   KernelVisitDecision () will be call and will set the fNeedKernelVisit
+   to 1. See G4XXXStoredViewer::CompareForKernelVisit for explanations.
+   It will cause a redraw of the view
+   @param aAction : 1 wireframe, 2 line removal, 3 surface removal, 4 line & surface removal
+   @see G4OpenGLStoredQtViewer::DrawView
+   @see G4XXXStoredViewer::CompareForKernelVisit
  */
 void G4OpenGLQtViewer::toggleDrawingAction(int aAction) {
@@ -444 +470 @@
 /**
    SLOT Activate by a click on the representation menu
+   Warning : When G4OpenGLStoredQtViewer::DrawView() method call,
+   KernelVisitDecision () will be call and will set the fNeedKernelVisit
+   to 1. See G4XXXStoredViewer::CompareForKernelVisit for explanations.
+   It will cause a redraw of the view
    @param check : 1 polyhedron, 0 nurbs
+   @see G4OpenGLStoredQtViewer::DrawView
+   @see G4XXXStoredViewer::CompareForKernelVisit
 */
 void G4OpenGLQtViewer::toggleRepresentation(bool check) {
@@ -575 +607 @@
   printf("G4OpenGLQtViewer::toggleRepresentation %d\n",check);
 }
+
+
+void G4OpenGLQtViewer::actionControlPanels() {
+  printf("G4OpenGLQtViewer::actionControlPanels \n");
+}
+
+void G4OpenGLQtViewer::actionExitG4() {
+  printf("G4OpenGLQtViewer::actionExitG4() \n");
+}
+
+void G4OpenGLQtViewer::actionCreateEPS() {
+  QString nomFich = QFileDialog::getSaveFileName(GLWindow,
+                                                 "Choisir un fichier",
+                                                 ".", "Images (*.BMP *.GIF *.JPG *.JPEG *.PNG *.PBM *.PGM *.PPM *.TIFF *.XBM *.XPM)" );
+
+  fWindow->grabFrameBuffer().save(nomFich);
+  printf("G4OpenGLQtViewer::actionCreateEPS() \n");
+}
+
 
 

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

@@ -115 +115 @@
    // /vis/viewer/rebuild, but if not, make decision and set flag only
    // if necessary...
+   if (!fNeedKernelVisit) 
+     printf("***************************  CASE 0 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+
    if (!fNeedKernelVisit) KernelVisitDecision ();
+   printf("***************************  kernelVisit:%d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",fNeedKernelVisit);
+   
    G4bool kernelVisitWasNeeded = fNeedKernelVisit; // Keep (ProcessView resets).
    ProcessView ();
@@ -131 +136 @@
 
      DrawDisplayLists ();
+     FinishView ();
 
    } else {
+     printf("***************************  CASE 1 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
      
      // If kernel visit was needed, drawing and FinishView will already
      // have been done, so...
      if (!kernelVisitWasNeeded) {
+       printf("***************************  CASE 2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
        DrawDisplayLists ();
+       FinishView ();
      } else {
+       printf("***************************  CASE 3 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
        // However, union cutaways are implemented in DrawDisplayLists, so make
        // an extra pass...
@@ -145 +155 @@
          ClearView();
          DrawDisplayLists ();
+         FinishView ();
+         printf("***************************  CASE 4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n");
+       } else { // ADD TO AVOID KernelVisit=1 and nothing to display
+         DrawDisplayLists ();
+         FinishView ();
        }
      }
    }
 
-   FinishView ();
-  printf("G4OpenGLStoredQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
+   printf("G4OpenGLStoredQtViewer::DrawView %d %d ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ \n",WinSize_x, WinSize_y);
    hasToRepaint =true;
 }