Changeset 1288 for trunk/source/visualization/management/src/G4VSceneHandler.cc

Timestamp:

Jun 1, 2010, 6:36:22 PM (14 years ago)

Author:

garnier

Message:

update from CVS

File:

• trunk/source/visualization/management/src/G4VSceneHandler.cc (modified) (8 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VSceneHandler.cc,v 1.92 2010/05/11 10:55:07 allison Exp $
+// $Id: G4VSceneHandler.cc,v 1.95 2010/06/01 16:08:15 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -75 +75 @@
 #include "G4HitsModel.hh"
 #include "G4VHit.hh"
+#include "G4VDigi.hh"
 #include "G4ScoringManager.hh"
 #include "G4DefaultLinearColorMap.hh"
@@ -263 +264 @@
   if (!trajectoriesModel) G4Exception
     ("G4VSceneHandler::AddCompound(const G4VTrajectory&): Not a G4TrajectoriesModel.");
-  G4VVisManager::IsDefaultDrawTrajectory = false;
   if (trajectoriesModel->IsDrawingModeSet()) {
     traj.DrawTrajectory(trajectoriesModel->GetDrawingMode());
@@ -269 +269 @@
     traj.DrawTrajectory();
   }
-  if (!G4VVisManager::IsDefaultDrawTrajectory) {
-    static G4bool warnedAboutIMode = false;
-    if (!warnedAboutIMode) {
-      G4Exception
-        ("G4VSceneHandler::AddCompound(const G4VTrajectory&)",
-         "",
-         JustWarning,
-  "WARNING: DEPRECATED: The use of the i_mode argument in DrawTrajectory"
-  "\n  is deprecated and will be removed in a future major release.");
-      warnedAboutIMode = true;
-    }
-  }
 }
 
@@ -286 +274 @@
   // Cast away const because Draw is non-const!!!!
   const_cast<G4VHit&>(hit).Draw();
+}
+
+void G4VSceneHandler::AddCompound (const G4VDigi& digi) {
+  // Cast away const because Draw is non-const!!!!
+  const_cast<G4VDigi&>(digi).Draw();
 }
 
@@ -498 +491 @@
     }
     else {
-      G4VisManager::Verbosity verbosity =
-        G4VisManager::GetInstance()->GetVerbosity();
+      G4VisManager::Verbosity verbosity = G4VisManager::GetVerbosity();
       if (verbosity >= G4VisManager::errors) {
         G4cout <<
@@ -519 +511 @@
     }
     else {
-      G4VisManager::Verbosity verbosity =
-        G4VisManager::GetInstance()->GetVerbosity();
+      G4VisManager::Verbosity verbosity = G4VisManager::GetVerbosity();
       if (verbosity >= G4VisManager::errors) {
         G4cout <<
@@ -754 +745 @@
 
   pModelingParams->SetWarning
-    (G4VisManager::GetInstance()->GetVerbosity() >= G4VisManager::warnings);
+    (G4VisManager::GetVerbosity() >= G4VisManager::warnings);
 
   pModelingParams->SetExplodeFactor(vp.GetExplodeFactor());