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

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.128 2010/06/01 16:08:15 allison Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VisManager.cc,v 1.129 2010/06/03 10:16:11 allison Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -940 +940 @@
   assert (0 != trajectoryModel); // Should exist
 
-  G4TrajectoriesModel* trajectoriesModel =
-    dynamic_cast<G4TrajectoriesModel*>(fpSceneHandler->GetModel());
-  if (trajectoriesModel) {
-    if (trajectoriesModel->IsDrawingModeSet()) {
+  if (IsValidView()) {
+    G4TrajectoriesModel* trajectoriesModel =
+      dynamic_cast<G4TrajectoriesModel*>(fpSceneHandler->GetModel());
+    if (trajectoriesModel) {
+      if (trajectoriesModel->IsDrawingModeSet()) {
+        trajectoryModel->Draw(trajectory, i_mode, visible);
+      } else {
+        trajectoryModel->Draw(trajectory, visible);
+      }
+    } else {
+      // Just draw at user's request
       trajectoryModel->Draw(trajectory, i_mode, visible);
-    } else {
-      trajectoryModel->Draw(trajectory, visible);
-    }
-  } else {
-    // Just draw at user's request
-    trajectoryModel->Draw(trajectory, i_mode, visible);
+    }
   }
 }
@@ -1361 +1363 @@
     if (eventID < nEventsToBeProcessed - 1) {
       fpViewer->ShowView();
+      fpViewer->DrawView();
       fpSceneHandler->SetMarkForClearingTransientStore(true);
     } else {  // Last event...