Changeset 606 for trunk/geant4/visualization/management/src

Timestamp:

Nov 15, 2007, 11:56:03 AM (17 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/management/src

Files:

• G4VisCommandsScene.cc (modified) (5 diffs)
• G4VisManager.cc (modified) (2 diffs)

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;