Changeset 593 for trunk/geant4/visualization/management/src/G4VisCommands.cc

Timestamp:

Nov 9, 2007, 3:32:25 PM (17 years ago)

Author:

garnier

Message:

r627@mac-90108: laurentgarnier | 2007-11-09 07:57:42 +0100
modif dans les includes directives

File:

• trunk/geant4/visualization/management/src/G4VisCommands.cc (modified) (7 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommands.cc,v 1.20 2006/11/26 15:49:10 allison Exp $
-// GEANT4 tag $Name: geant4-08-02-patch-01 $
+// $Id: G4VisCommands.cc,v 1.22 2007/03/27 15:47:32 allison Exp $
+// GEANT4 tag $Name: geant4-09-00-ref-01 $
 
 // /vis/ top level commands - John Allison  5th February 2001
@@ -40 +40 @@
 #include "G4Run.hh"
 #include "G4UIsession.hh"
+
+////////////// /vis/abortReviewKeptEvents /////////////////////////////
+
+G4VisCommandAbortReviewKeptEvents::G4VisCommandAbortReviewKeptEvents () {
+  G4bool omitable;
+
+  fpCommand = new G4UIcmdWithABool("/vis/abortReviewKeptEvents", this);
+  fpCommand -> SetGuidance("Abort review of kept events.");
+  fpCommand -> SetParameterName("abort", omitable=true);
+  fpCommand -> SetDefaultValue(true);
+}
+
+G4VisCommandAbortReviewKeptEvents::~G4VisCommandAbortReviewKeptEvents () {
+  delete fpCommand;
+}
+
+G4String G4VisCommandAbortReviewKeptEvents::GetCurrentValue (G4UIcommand*) {
+  return G4String();
+}
+
+void G4VisCommandAbortReviewKeptEvents::SetNewValue (G4UIcommand*,
+                                                     G4String newValue) {
+  fpVisManager->SetAbortReviewKeptEvents(G4UIcommand::ConvertToBool(newValue));
+  G4cout << "Type \"continue\" to complete the abort." << G4endl;
+}
 
 ////////////// /vis/enable ///////////////////////////////////////
@@ -128 +153 @@
   fpCommand -> SetGuidance
     ("If a macro file is specified, it is executed for each event.");
-  fpCommand -> SetGuidance
-    ("If a macro file is not specified, each event is drawn to the current"
-     "\nviewer.  After each event, the session is paused.  The user may issue"
-     "\nany allowed command.  Then enter \"continue\" to continue to the next"
-     "\nevent.");
+  fpCommand -> SetGuidance(
+  "If a macro file is not specified, each event is drawn to the current"
+  "\nviewer.  After each event, the session is paused.  The user may issue"
+  "\nany allowed command.  Then enter \"cont[inue]\" to continue to the next"
+  "\nevent."
+  "\nUseful commands might be:"
+  "\n  \"/vis/viewer/...\" to change the view (zoom, set/viewpoint,...)."
+  "\n  \"/vis/oglx/printEPS\" to get hard copy."
+  "\n  \"/vis/open\" to get alternative viewer."
+  "\n  \"/vis/abortReviewKeptEvents\", then \"cont[inue]\", to abort.");
   fpCommand -> SetParameterName("macro-file-name", omitable=true);
   fpCommand -> SetDefaultValue("");
@@ -185 +215 @@
   }
 
-  G4VSceneHandler* sceneHandler = fpVisManager->GetCurrentSceneHandler();
-
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
   G4int keepVerbose = UImanager->GetVerboseLevel();
@@ -200 +228 @@
 
     // Draw to viewer and pause session...
+    G4UIsession* session = UImanager->GetSession();
     for (size_t i = 0; i < nKeptEvents; ++i) {
       const G4Event* event = (*events)[i];
       if (verbosity >= G4VisManager::warnings) {
         G4cout << "Drawing event : " << event->GetEventID() <<
-          ".  At EndOfEvent, enter any command, then \"continue\"..."
+          ".  At EndOfEvent, enter any command, then \"cont[inue]\"..."
                << G4endl;
+        static G4bool first = true;
+        if (first) {
+          first = false;
+          G4cout <<
+  "  Useful commands might be:"
+  "\n    \"/vis/viewer/...\" to change the view (zoom, set/viewpoint,...)."
+  "\n    \"/vis/oglx/printEPS\" to get hard copy."
+  "\n    \"/vis/open\" to get alternative viewer."
+  "\n    \"/vis/abortReviewKeptEvents\", then \"cont[inue]\", to abort."
+                 << G4endl;
+        }
       }
-      sceneHandler->SetEvent(event);
+      fpVisManager->SetRequestedEvent(event);
       UImanager->ApplyCommand("/vis/viewer/rebuild");
       /* The above command forces a rebuild of the scene, including
@@ -224 +264 @@
          features or a complete re-think.
       */
-      if (!viewer->GetViewParameters().IsAutoRefresh())
-        UImanager->ApplyCommand("/vis/viewer/flush");
-      G4UIsession* session = UImanager->GetSession();
+      UImanager->ApplyCommand("/vis/viewer/flush");
       session->PauseSessionStart("EndOfEvent");
-      sceneHandler->SetEvent(0);
-    }
+      fpVisManager->SetRequestedEvent(0);
+      if (fpVisManager->GetAbortReviewKeptEvents()) break;
+    }
+    fpVisManager->SetAbortReviewKeptEvents(false);
 
   } else {
@@ -240 +280 @@
                << " with macro file \"" << macroFileName << G4endl;
       }
-      sceneHandler->SetEvent(event);
+      fpVisManager->SetRequestedEvent(event);
       UImanager->ApplyCommand("/control/execute " + macroFileName);
-      sceneHandler->SetEvent(0);
+      fpVisManager->SetRequestedEvent(0);
     }
   }