Changeset 606 for trunk/geant4/visualization

Timestamp:

Nov 15, 2007, 11:56:03 AM (18 years ago)

Author:

garnier

Message:

r647@mac-90108: laurentgarnier | 2007-11-15 11:32:46 +0100
Ok en Qt 4.3.0

Location:

trunk/geant4/visualization

Files:

• OpenGL/include/G4OpenGLQtViewer.hh (modified) (1 diff)
• OpenGL/include/G4OpenGLViewer.hh (modified) (3 diffs)
• OpenGL/include/G4OpenGLWin32Viewer.hh (modified) (2 diffs)
• OpenGL/include/G4OpenGLXViewer.hh (modified) (2 diffs)
• OpenGL/src/G4OpenGLImmediateQtViewer.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLQtExportDialog.cc (modified) (1 diff)
• OpenGL/src/G4OpenGLQtViewer.cc (modified) (2 diffs)
• OpenGL/src/G4OpenGLStoredQtViewer.cc (modified) (2 diffs)
• management/src/G4VisCommandsScene.cc (modified) (5 diffs)
• management/src/G4VisManager.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.hh,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.hh,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLViewer.hh,v 1.20 2007/05/08 11:04:11 allison Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4OpenGLViewer.hh,v 1.21 2007/11/10 14:50:01 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -48 +48 @@
   friend class G4OpenGLImmediateSceneHandler;
   friend class G4OpenGLStoredSceneHandler;
+  friend class G4OpenGLFileSceneHandler;
   friend class G4OpenGLViewerMessenger;
 
@@ -79 +80 @@
   G4OpenGLSceneHandler& fOpenGLSceneHandler;
   G4Colour background;      //the OpenGL clear colour
+  unsigned int WinSize_x, WinSize_y;
   G4bool
     transparency_enabled,   //is alpha blending enabled?

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLWin32Viewer.hh,v 1.13 2006/06/29 21:18:20 gunter Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4OpenGLWin32Viewer.hh,v 1.14 2007/11/10 14:50:01 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -55 +55 @@
   void CreateGLWin32Context ();
   virtual void CreateMainWindow ();
-protected:
-  G4int WinSize_x;
-  G4int WinSize_y;
   HDC fHDC;
 private:

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.hh,v 1.27 2007/05/08 11:04:11 allison Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4OpenGLXViewer.hh,v 1.28 2007/11/10 14:50:01 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -105 +105 @@
   Pixmap                            icon_pixmap;
   XSizeHints                        *size_hints;
-  unsigned int                      WinSize_x,
-                                    WinSize_y;
   Atom                              Xatom;
   XTextProperty                     windowName,

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLImmediateQtViewer.cc,v 1.1 2007/09/28 14:44:13 lgarnier Exp $
+// $Id: G4OpenGLImmediateQtViewer.cc,v 1.2 2007/11/13 17:48:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtExportDialog.cc,v 1.3 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4OpenGLQtExportDialog.cc,v 1.4 2007/11/13 17:48:51 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLQtViewer.cc,v 1.4 2007/11/09 15:03:22 lgarnier Exp $
+// $Id: G4OpenGLQtViewer.cc,v 1.6 2007/11/14 11:49:00 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -1344 +1344 @@
 
   if (aFilename.endsWith(".ps")) {
+#if QT_VERSION > 0x040200
     printer.setOutputFormat(QPrinter::PostScriptFormat);
-  } else {
+#endif
+  } else {
+#if QT_VERSION > 0x040100
     printer.setOutputFormat(QPrinter::PdfFormat);
-  }
+#endif
+  }
+#if QT_VERSION > 0x040100
   printer.setOutputFileName(aFilename);
+#endif
   //  printer.setFullPage ( true);
   QPainter paint(&printer);

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredQtViewer.cc,v 1.3 2007/11/09 15:03:22 lgarnier Exp $
+// $Id: G4OpenGLStoredQtViewer.cc,v 1.5 2007/11/14 18:58:59 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -256 +256 @@
 void G4OpenGLStoredQtViewer::mouseMoveEvent(QMouseEvent *event)
 {
+  printf("G4OpenGLStoredQtViewer::mouseMoveEvent\n");
+#if QT_VERSION < 0x040000
   G4MouseMoveEvent(event->x(),event->y(),event->button());
+#else
+  G4MouseMoveEvent(event->x(),event->y(),event->buttons());
+#endif
   //  DrawView();
 }

trunk/geant4/visualization/management/src/G4VisCommandsScene.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsScene.cc,v 1.66 2007/05/25 10:49:55 allison Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4VisCommandsScene.cc,v 1.67 2007/11/10 15:03:56 allison Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/scene commands - John Allison  9th August 1998
@@ -34 +34 @@
 #include "G4VisManager.hh"
 #include "G4TransportationManager.hh"
+#include "G4RunManager.hh"
+#include "G4Run.hh"
 #include "G4PhysicalVolumeModel.hh"
 #include "G4ApplicationState.hh"
@@ -202 +204 @@
   fpVisManager->ResetTransientsDrawnFlags();
 
+  // Are there any events currently kept...
+  size_t nCurrentlyKept = 0;
+  G4RunManager* runManager = G4RunManager::GetRunManager();
+  if (runManager) {
+    const G4Run* currentRun = runManager->GetCurrentRun();
+    if (currentRun) {
+      const std::vector<const G4Event*>* events =
+        currentRun->GetEventVector();
+      if (events) nCurrentlyKept = events->size();
+    }
+  }
+
   if (verbosity >= G4VisManager::confirmations) {
     G4cout << "End of event action set to ";
@@ -211 +225 @@
              << " (unlimited if negative)."
         "\n  This may be changed with, e.g., "
-        "\"/vis/scene/endOfEventAction accumulate 100\"."
-             << G4endl;
-    }
-  }
+        "\"/vis/scene/endOfEventAction accumulate 1000\".";
+    }
+    G4cout << G4endl;
+  }
+
   if (!pScene->GetRefreshAtEndOfEvent() &&
       maxNumberOfKeptEvents != 0 &&
       verbosity >= G4VisManager::warnings) {
-    G4cout << "WARNING: The vis manager will keep ";
-    if (maxNumberOfKeptEvents < 0) G4cout << "an unlimited number of";
-    else G4cout << "up to " << maxNumberOfKeptEvents;
-    G4cout << " events.";
-    if (maxNumberOfKeptEvents > 1 || maxNumberOfKeptEvents < 0)
-      G4cout << "\n  This may use a lot of memory.";
+    G4cout << "WARNING: ";
+    if (nCurrentlyKept) {
+      G4cout <<
+        "\n  There are currently " << nCurrentlyKept
+             << " events kept for refreshing and/or reviewing.";
+    } else {
+      G4cout << "The vis manager will keep ";
+      if (maxNumberOfKeptEvents < 0) G4cout << "an unlimited number of";
+      else G4cout << "up to " << maxNumberOfKeptEvents;
+      G4cout << " events.";
+      if (maxNumberOfKeptEvents > 1 || maxNumberOfKeptEvents < 0)
+        G4cout << "\n  This may use a lot of memory.";
+    }
     G4cout << G4endl;
   }
-  UpdateVisManagerScene (pScene->GetName());
 }
 
@@ -316 +337 @@
     G4cout << "\"" << G4endl;
   }
-  UpdateVisManagerScene (pScene->GetName());
 }
 

trunk/geant4/visualization/management/src/G4VisManager.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.113 2007/05/25 10:50:26 allison Exp $
-// GEANT4 tag $Name: geant4-09-00-ref-01 $
+// $Id: G4VisManager.cc,v 1.114 2007/11/10 14:59:46 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -1244 +1244 @@
       G4cout <<
         "  Only useful if before starting the run:"
-        "\n    a) trajectories are stored (\"/tracking/storeTrajectory N\"), or"
+        "\n    a) trajectories are stored (\"/vis/scene/add/trajectories [smooth|rich]\"), or"
         "\n    b) the Draw method of any hits is implemented."
         "\n  To view trajectories and hits:"
         "\n    open a viewer, draw a volume, \"/vis/scene/add/trajectories\""
         "\n    \"/vis/scene/add/hits\" and, possibly, \"/vis/viewer/flush\"."
-        "\n  To see all events: \"vis/scene/endOfEventAction accumulate\"."
+        "\n  To see all events: \"/vis/scene/endOfEventAction accumulate\"."
         "\n  To see events individually: \"/vis/reviewKeptEvents\"."
              << G4endl;