Changeset 1140 for trunk/source/visualization/management/src

Timestamp:

Nov 3, 2009, 11:17:28 AM (15 years ago)

Author:

garnier

Message:

update to CVS

Location:

trunk/source/visualization/management/src

Files:

• G4VSceneHandler.cc (modified) (3 diffs)
• G4VisCommandsSceneAdd.cc (modified) (5 diffs)
• G4VisManager.cc (modified) (6 diffs)

trunk/source/visualization/management/src/G4VSceneHandler.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VSceneHandler.cc,v 1.83 2008/01/04 22:03:46 allison Exp $
+// $Id: G4VSceneHandler.cc,v 1.86 2009/10/23 07:58:36 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -262 +262 @@
 
 void G4VSceneHandler::AddCompound (const G4VHit& hit) {
-  ((G4VHit&)hit).Draw(); // Cast to non-const because Draw is non-const!!!!
+  static_cast<G4VHit>(hit).Draw(); // Cast because Draw is non-const!!!!
+}
+
+void G4VSceneHandler::AddCompound (const G4THitsMap<G4double>& hits) {
+  // Cast because DrawAllHits is non-const!!!!
+  static_cast<G4THitsMap<G4double> >(hits).DrawAllHits();
 }
 
@@ -583 +588 @@
   printf("G4VSceneHandler::ProcessScene : Idle ?\n");
 #endif
-  // Refresh event from end-of-event model list.  Allow only in Idle state...
+  // Refresh event from end-of-event model list.
+  // Allow only in Idle or GeomClosed state...
   G4StateManager* stateManager = G4StateManager::GetStateManager();
   G4ApplicationState state = stateManager->GetCurrentState();
-  if (state == G4State_Idle) {
+  if (state == G4State_Idle || state == G4State_GeomClosed) {
 #ifdef G4DEBUG_VIS_MANAGEMENT
     printf("G4VSceneHandler::ProcessScene : IDLE\n");

trunk/source/visualization/management/src/G4VisCommandsSceneAdd.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsSceneAdd.cc,v 1.74 2009/07/24 09:20:52 lgarnier Exp $
+// $Id: G4VisCommandsSceneAdd.cc,v 1.76 2009/10/30 15:58:50 allison Exp $
 // GEANT4 tag $Name:  $
 // /vis/scene commands - John Allison  9th August 1998
@@ -37 +37 @@
 #include "G4ModelingParameters.hh"
 #include "G4HitsModel.hh"
+#include "G4PSHitsModel.hh"
 #include "G4TrajectoriesModel.hh"
 #include "G4ScaleModel.hh"
@@ -229 +230 @@
   const G4Run* currentRun = 0;
   G4RunManager* runManager = G4RunManager::GetRunManager();
-  if (runManager)  currentRun = runManager->GetCurrentRun();
+  if (runManager) currentRun = runManager->GetCurrentRun();
 
   G4VModel* model = fpVisManager->GetCurrentSceneHandler()->GetModel();
-  const G4ModelingParameters* mp;
-  const G4Event* currentEvent;
+  const G4ModelingParameters* mp = 0;
+  const G4Event* currentEvent = 0;
   if (model) {
    mp = model->GetModelingParameters();
@@ -240 +241 @@
     G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
     if (verbosity >= G4VisManager::errors) {
-      G4cout << "ERROR: No model defined for this SceneHandler : "<< fpVisManager->GetCurrentSceneHandler()->GetName() << G4endl;
+      G4cout << "ERROR: No model defined for this SceneHandler : "
+             << fpVisManager->GetCurrentSceneHandler()->GetName()
+             << G4endl;
     }
   }
@@ -890 +893 @@
   sceneHandler.AddPrimitive(*fp4);
   sceneHandler.EndPrimitives();
+}
+
+////////////// /vis/scene/add/psHits ///////////////////////////////////////
+
+G4VisCommandSceneAddPSHits::G4VisCommandSceneAddPSHits () {
+  fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/add/psHits", this);
+  fpCommand -> SetGuidance
+    ("Adds Primitive Scorer Hits (PSHits) to current scene.");
+  fpCommand -> SetGuidance
+    ("PSHits are drawn at end of run when the scene in which"
+     "\nthey are added is current.");
+}
+
+G4VisCommandSceneAddPSHits::~G4VisCommandSceneAddPSHits () {
+  delete fpCommand;
+}
+
+G4String G4VisCommandSceneAddPSHits::GetCurrentValue (G4UIcommand*) {
+  return "";
+}
+
+void G4VisCommandSceneAddPSHits::SetNewValue (G4UIcommand*, G4String) {
+
+  G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
+  G4bool warn(verbosity >= G4VisManager::warnings);
+
+  G4Scene* pScene = fpVisManager->GetCurrentScene();
+  if (!pScene) {
+    if (verbosity >= G4VisManager::errors) {
+      G4cout << "ERROR: No current scene.  Please create one." << G4endl;
+    }
+    return;
+  }
+
+  G4PSHitsModel* model = new G4PSHitsModel;
+  const G4String& currentSceneName = pScene -> GetName ();
+  G4bool successful = pScene -> AddEndOfEventModel (model, warn);
+  if (successful) {
+    if (verbosity >= G4VisManager::confirmations) {
+      G4cout << "Primitive Scorer hits will be drawn in scene \""
+             << currentSceneName << "\"."
+             << G4endl;
+    }
+  }
+  else G4VisCommandsSceneAddUnsuccessful(verbosity);
+  UpdateVisManagerScene (currentSceneName);
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.118 2009/03/09 12:42:00 allison Exp $
+// $Id: G4VisManager.cc,v 1.121 2009/10/30 16:03:41 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -656 +656 @@
         G4cout << "ERROR in G4VisManager::CreateSceneHandler during "
                << fpGraphicsSystem -> GetName ()
-               << " scene creation.\n  No action taken."
+               << " scene handler creation.\n  No action taken."
                << G4endl;
       }
@@ -669 +669 @@
   if (!fInitialised) Initialise ();
 
-  if (fpSceneHandler) {
-    printf("G4VisManager::CreateViewer 1-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
-    G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name);
-    printf("G4VisManager::CreateViewer 2-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
-
-    // Viewer is created, now we can set geometry parameters
-    // Before 12/2008, it was done in G4VViewer.cc but it did not have to be there!
+  if (!fpSceneHandler) {
+    PrintInvalidPointers ();
+    return;
+  }
+
+  printf("G4VisManager::CreateViewer 1-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
+  G4VViewer* p = fpGraphicsSystem -> CreateViewer (*fpSceneHandler, name);
+  printf("G4VisManager::CreateViewer 2-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
+
+  if (!p) {
+    if (fVerbosity >= errors) {
+      G4cout << "ERROR in G4VisManager::CreateViewer during "
+             << fpGraphicsSystem -> GetName ()
+             << " viewer creation.\n  No action taken."
+             << G4endl;
+    }
+    return;
+  }
+
+  if (p -> GetViewId() < 0) {
+    if (fVerbosity >= errors) {
+      G4cout << "ERROR in G4VisManager::CreateViewer during "
+             << fpGraphicsSystem -> GetName ()
+             << " viewer initialisation.\n  No action taken."
+             << G4endl;
+    }
+    return;
+  }
+
+  // Viewer is created, now we can set geometry parameters
+  // Before 12/2008, it was done in G4VViewer.cc but it did not have to be there!
     
-    //    printf("G4VisManager::CreateViewer 3-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
-    G4ViewParameters vp = p->GetViewParameters();
-    //    printf("G4VisManager::CreateViewer 4-------------------- %s ----%s\n",name.c_str(),XGeometry.c_str());
-    vp.SetXGeometryString(XGeometry);
-    p->SetViewParameters(vp); //parse string and store parameters
-
-    if (!p) {
-      if (fVerbosity >= errors) {
-        G4cout << "ERROR in G4VisManager::CreateViewer during "
-               << fpGraphicsSystem -> GetName ()
-               << " viewer creation.\n  No action taken."
-               << G4endl;
-      }
-    } else {
-      p -> Initialise ();
-      if (p -> GetViewId() < 0) {
-        if (fVerbosity >= errors) {
-        G4cout << "ERROR in G4VisManager::CreateViewer during "
-               << fpGraphicsSystem -> GetName ()
-               << " viewer initialisation.\n  No action taken."
-               << G4endl;
-        }
-      } else {
-        fpViewer = p;                             // Make current.
-        fpSceneHandler -> AddViewerToList (fpViewer);
-        fpSceneHandler -> SetCurrentViewer (fpViewer);
-
-        if (fVerbosity >= confirmations) {
-          G4cout << "G4VisManager::CreateViewer: new viewer created."
-                 << G4endl;
-        }
-
-        const G4ViewParameters& vp = fpViewer->GetViewParameters();
-        if (fVerbosity >= parameters) {
-          G4cout << " view parameters are:\n  " << vp << G4endl;
-        }
-
-        if (vp.IsCulling () && vp.IsCullingInvisible ()) {
-          static G4bool warned = false;
-          if (fVerbosity >= confirmations) {
-            if (!warned) {
-              G4cout <<
+  G4ViewParameters initialvp = p -> GetViewParameters();
+  initialvp.SetXGeometryString(XGeometry); //parse string and store parameters
+  p -> SetViewParameters(initialvp);
+  p -> Initialise ();  // (Viewer itself may change view parameters further.)
+
+  fpViewer = p;                             // Make current.
+  fpSceneHandler -> AddViewerToList (fpViewer);
+  fpSceneHandler -> SetCurrentViewer (fpViewer);
+  if (fVerbosity >= confirmations) {
+    G4cout << "G4VisManager::CreateViewer: new viewer created."
+           << G4endl;
+  }
+
+  const G4ViewParameters& vp = fpViewer->GetViewParameters();
+  if (fVerbosity >= parameters) {
+    G4cout << " view parameters are:\n  " << vp << G4endl;
+  }
+
+  if (vp.IsCulling () && vp.IsCullingInvisible ()) {
+    static G4bool warned = false;
+    if (fVerbosity >= confirmations) {
+      if (!warned) {
+        G4cout <<
   "NOTE: objects with visibility flag set to \"false\""
   " will not be drawn!"
   "\n  \"/vis/viewer/set/culling global false\" to Draw such objects."
   "\n  Also see other \"/vis/viewer/set\" commands."
-                     << G4endl;
-              warned = true;
-            }
-          }
-        }
-        if (vp.IsCullingCovered ()) {
-          static G4bool warned = false;
-          if (fVerbosity >= warnings) {
-            if (!warned) {
-              G4cout <<
+               << G4endl;
+        warned = true;
+      }
+    }
+  }
+  if (vp.IsCullingCovered ()) {
+    static G4bool warned = false;
+    if (fVerbosity >= warnings) {
+      if (!warned) {
+        G4cout <<
   "WARNING: covered objects in solid mode will not be rendered!"
   "\n  \"/vis/viewer/set/culling coveredDaughters false\" to reverse this."
   "\n  Also see other \"/vis/viewer/set\" commands."
-                     << G4endl;
-              warned = true;
-            }
-          }
-        }
-      }
-    }
-  }
-  else PrintInvalidPointers ();
+               << G4endl;
+        warned = true;
+      }
+    }
+  }
 }
 
@@ -1088 +1089 @@
   RegisterMessenger(new G4VisCommandSceneAddLogicalVolume);
   RegisterMessenger(new G4VisCommandSceneAddLogo);
+  RegisterMessenger(new G4VisCommandSceneAddPSHits);
   RegisterMessenger(new G4VisCommandSceneAddScale);
   RegisterMessenger(new G4VisCommandSceneAddText);
@@ -1331 +1333 @@
           printf("G4VisManager::EndOfEvent 7 \n");
           G4cout <<
-            "WARNING: G4VisManager::EndOfEvent: Event keeping suspended."
-            "\n  The number of events exceeds the maximum that may be kept, "
-                 << maxNumberOfKeptEvents << '.'
+ "WARNING: G4VisManager::EndOfEvent: Automatic event keeping suspended."
+ "\n  The number of events exceeds the maximum, "
+                 << maxNumberOfKeptEvents <<
+ ", that can be kept by the vis manager."
                  << G4endl;
         }
@@ -1371 +1374 @@
     if (fEventKeepingSuspended && fVerbosity >= warnings) {
       G4cout <<
-        "WARNING: G4VisManager::EndOfRun: Event keeping was suspended."
-        "\n  The number of events in the run exceeded the maximum to be kept, "
-             << fpScene->GetMaxNumberOfKeptEvents() << '.' <<
-        "\n  The number of events to be kept can be changed with"
-        "\n  \"/vis/scene/endOfEventAction accumulate <N>\", where N is the"
-        "\n  maximum number you wish to allow.  N < 0 means \"unlimited\"."
+ "WARNING: G4VisManager::EndOfRun: Automatic event keeping has been suspended."
+ "\n  The number of events in the run exceeded the maximum, "
+             << fpScene->GetMaxNumberOfKeptEvents() <<
+ ", that can be kept by the vis manager." <<
+ "\n  The number of events kept by the vis manager can be changed with"
+ "\n  \"/vis/scene/endOfEventAction accumulate <N>\", where N is the"
+ "\n  maximum number you wish to allow.  N < 0 means \"unlimited\"."
              << G4endl;
     }