Changeset 1258 for trunk/source/visualization/management/src/G4VisManager.cc

Timestamp:

May 20, 2010, 11:49:26 AM (14 years ago)

Author:

garnier

Message:

cvs update

File:

• trunk/source/visualization/management/src/G4VisManager.cc (modified) (2 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.123 2010/03/08 16:34:17 lgarnier Exp $
+// $Id: G4VisManager.cc,v 1.124 2010/05/11 11:02:19 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -889 +889 @@
   assert (0 != fpTrajDrawModelMgr);
 
-  const G4VTrajectoryModel* model = CurrentTrajDrawModel();
-
-  assert (0 != model); // Should exist
-
-  model->Draw(trajectory, i_mode, visible);
+  const G4VTrajectoryModel* trajectoryModel = CurrentTrajDrawModel();
+
+  assert (0 != trajectoryModel); // Should exist
+
+  G4TrajectoriesModel* trajectoriesModel =
+    dynamic_cast<G4TrajectoriesModel*>(fpSceneHandler->GetModel());
+  if (trajectoriesModel) {
+    if (trajectoriesModel->IsDrawingModeSet()) {
+      trajectoryModel->Draw(trajectory, i_mode, visible);
+    } else {
+      trajectoryModel->Draw(trajectory, visible);
+    }
+  } else {
+    //G4Exception("G4VisManager::DispatchToModel: Not a G4TrajectoriesModel.");
+    // Just draw at user's request
+    trajectoryModel->Draw(trajectory, i_mode, visible);
+    static G4bool warnedAboutIMode = false;
+    if (!warnedAboutIMode) {
+      G4Exception
+        ("G4VisManager::DispatchToModel",
+         "",
+         JustWarning,
+  "WARNING: DEPRECATED: The use of the i_mode argument in DrawTrajectory"
+  "\n  is deprecated and will be removed at the next major release.");
+      warnedAboutIMode = true;
+    }
+   }
 }