Changeset 1274 for trunk/source/visualization/management/src/G4VisCommandsCompound.cc

Timestamp:

May 27, 2010, 10:36:45 AM (14 years ago)

Author:

garnier

Message:

update...

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsCompound.cc,v 1.39 2007/11/16 20:29:04 perl Exp $
+// $Id: G4VisCommandsCompound.cc,v 1.40 2010/05/20 07:54:01 allison Exp $
 // GEANT4 tag $Name:  $
 
@@ -66 +66 @@
   is >> pvname >> system;
 
+  G4VGraphicsSystem* keepSystem = fpVisManager->GetCurrentGraphicsSystem();
+  G4Scene* keepScene = fpVisManager->GetCurrentScene();
+  G4VSceneHandler* keepSceneHandler = fpVisManager->GetCurrentSceneHandler();
+  G4VViewer* keepViewer = fpVisManager->GetCurrentViewer();
+
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
   G4int keepVerbose = UImanager->GetVerboseLevel();
@@ -77 +82 @@
   UImanager->ApplyCommand("/vis/viewer/flush");
   UImanager->SetVerboseLevel(keepVerbose);
+
+  if (keepViewer) {
+    if (fpVisManager->GetVerbosity() >= G4VisManager::warnings) {
+      G4cout << "Reverting to " << keepViewer->GetName() << G4endl;
+    }
+    fpVisManager->SetCurrentGraphicsSystem(keepSystem);
+    fpVisManager->SetCurrentScene(keepScene);
+    fpVisManager->SetCurrentSceneHandler(keepSceneHandler);
+    fpVisManager->SetCurrentViewer(keepViewer);
+  }
 }