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

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

Location:

trunk/source/visualization/management/src

Files:

• G4VisCommandsGeometrySet.cc (modified) (2 diffs)
• G4VisCommandsSceneAdd.cc (modified) (2 diffs)
• G4VisManager.cc (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsGeometrySet.cc,v 1.7 2007/01/05 16:24:19 allison Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VisCommandsGeometrySet.cc,v 1.8 2010/06/15 16:34:30 allison Exp $
+// GEANT4 tag $Name: vis-V09-03-08 $
 
 // /vis/geometry commands - John Allison  31st January 2006
@@ -64 +64 @@
   }
   if (fpVisManager->GetCurrentViewer()) {
-    G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/rebuild");
+    G4UImanager::GetUIpointer()->ApplyCommand("/vis/scene/notifyHandlers");
   }
 }

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsSceneAdd.cc,v 1.81 2010/06/01 16:08:15 allison Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VisCommandsSceneAdd.cc,v 1.82 2010/06/03 10:17:44 allison Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -162 +162 @@
 
 G4VisCommandSceneAddDigis::G4VisCommandSceneAddDigis () {
-  fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/add/digitisations", this);
+  fpCommand = new G4UIcmdWithoutParameter ("/vis/scene/add/digis", this);
   fpCommand -> SetGuidance ("Adds digis to current scene.");
   fpCommand -> SetGuidance
     ("Digis are drawn at end of event when the scene in which"
      "\nthey are added is current.");
-
-  fpCommandUS = new G4UIcmdWithoutParameter ("/vis/scene/add/digitizations", this);
-  fpCommandUS -> SetGuidance ("Adds digis to current scene.");
-  fpCommandUS -> SetGuidance
-    ("Digis are drawn at end of event when the scene in which"
-     "\nthey are added is current.");
 }
 
 G4VisCommandSceneAddDigis::~G4VisCommandSceneAddDigis () {
-  delete fpCommandUS;
   delete fpCommand;
 }

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...