Changeset 1087 for trunk

Timestamp:

Jul 24, 2009, 11:39:50 AM (15 years ago)

Author:

garnier

Message:

correction du ticket #41

Location:

trunk/source/visualization/management

Files:

• History (modified) (2 diffs)
• src/G4VisCommandsSceneAdd.cc (modified) (2 diffs)

trunk/source/visualization/management/History

@@ -1 @@
-$Id: History,v 1.121 2009/05/13 18:18:03 allison Exp $
+$Id: History,v 1.122 2009/07/24 09:20:52 lgarnier Exp $
 
 -------------------------------------------------------------------
@@ -26 +26 @@
 History file for visualization management sub-category
 ------------------------------------------------------
+
+24th July 2009  Laurent Garnier
+- G4VisCommandsSceneAdd::EventID::operator() : Add a protection if
+  CurrentSceneHandler has no model
 
 13th May 2009  John Allison  (visman-V09-02-02)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsSceneAdd.cc,v 1.73 2007/11/16 20:29:04 perl Exp $
+// $Id: G4VisCommandsSceneAdd.cc,v 1.74 2009/07/24 09:20:52 lgarnier Exp $
 // GEANT4 tag $Name:  $
 // /vis/scene commands - John Allison  9th August 1998
@@ -232 +232 @@
 
   G4VModel* model = fpVisManager->GetCurrentSceneHandler()->GetModel();
-  const G4ModelingParameters* mp = model->GetModelingParameters();
-  const G4Event* currentEvent = mp->GetEvent();
-
+  const G4ModelingParameters* mp;
+  const G4Event* currentEvent;
+  if (model) {
+   mp = model->GetModelingParameters();
+   currentEvent = mp->GetEvent();
+  } else {
+    G4VisManager::Verbosity verbosity = fpVisManager->GetVerbosity();
+    if (verbosity >= G4VisManager::errors) {
+      G4cout << "ERROR: No model defined for this SceneHandler : "<< fpVisManager->GetCurrentSceneHandler()->GetName() << G4endl;
+    }
+  }
   if (currentRun && currentEvent) {
     G4int runID = currentRun->GetRunID();