Changeset 1140 for trunk/source/visualization/test

Timestamp:

Nov 3, 2009, 11:17:28 AM (16 years ago)

Author:

garnier

Message:

update to CVS

Location:

trunk/source/visualization/test

Files:

• History (modified) (2 diffs)
• test19.cc (modified) (6 diffs)

trunk/source/visualization/test/History

@@ -1 @@
-$Id: History,v 1.117 2009/07/28 12:50:51 lgarnier Exp $
+$Id: History,v 1.119 2009/09/29 21:36:38 allison Exp $
 
 History file for visualization/test subdirectory
@@ -5 +5 @@
 
 $Log: History,v $
+Revision 1.119  2009/09/29 21:36:38  allison
+vistest-V09-02-00
+
+Revision 1.118  2009/09/29 21:35:56  allison
+Changed main program, test19.cc, to use G4UIExecutive.
+
 Revision 1.117  2009/07/28 12:50:51  lgarnier
 Adding Qt support for test19

trunk/source/visualization/test/test19.cc

@@ -25 +25 @@
 //
 //
-// $Id: test19.cc,v 1.30 2009/07/28 12:50:51 lgarnier Exp $
+// $Id: test19.cc,v 1.31 2009/09/29 21:35:56 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -48 +48 @@
 #include "MySteppingAction.hh"
 
-#include "G4UIterminal.hh"
-#if defined(G4UI_USE_GAG)
-  #include "G4UIGAG.hh"
-#elif defined(G4UI_USE_TCSH)
-  #include "G4UItcsh.hh"
-#elif defined(G4UI_USE_WO)
-  #include "G4UIWo.hh"
-#elif defined(G4UI_USE_XM)
-  #include "G4UIXm.hh"
-#elif defined(G4UI_USE_XAW)
-  #include "G4UIXaw.hh"
-#elif defined(G4UI_USE_WIN32)
-  #include "G4UIWin32.hh"
-#elif defined(G4UI_USE_QT)
-  #include "G4UIQt.hh"
+#ifdef G4UI_USE
+#include "G4UIExecutive.hh"
 #endif
 
@@ -93 +80 @@
 #endif
 
+#ifdef G4UI_USE
   // Choose (G)UI.
-  G4UIsession* session;
-#ifdef G4UI_USE_WIN32
-  session = new G4UIWin32 (hInstance,hPrevInstance,lpszCmdLine,nCmdShow);
-#else
-  if (argc >= 2) {
-  #if defined(G4UI_USE_TCSH)
-    if (strcmp (argv[1], "tcsh")==0)     session =
-      new G4UIterminal(new G4UItcsh);
-  #elif defined(G4UI_USE_WO)
-    if (strcmp (argv[1], "Wo")==0)  session = new G4UIWo (argc, argv);
-  #elif defined(G4UI_USE_XM)
-    if (strcmp (argv[1], "Xm")==0)  session = new G4UIXm (argc, argv);
-  #elif defined(G4UI_USE_XAW)
-    if (strcmp (argv[1], "Xaw")==0) session = new G4UIXaw (argc, argv);
-  #elif defined(G4UI_USE_GAG)
-    if (strcmp (argv[1], "gag")==0) session = new G4UIGAG ;
-  #elif defined(G4UI_USE_QT)
-    if (strcmp (argv[1], "Qt")==0)  session = new G4UIQt (argc, argv);
-  #else
-    session = new G4UIterminal();
-  #endif
-    else  session = new G4UIterminal();
-  }
-  else                                   
-  {
-    G4cerr << "You should define a UI in order to interact with test" << G4endl;
-    return 0;
-  }
+  G4UIExecutive* UIexecutive = new G4UIExecutive(argc, argv);
+  G4UImanager::GetUIpointer()->SetSession(UIexecutive->GetSession());  //So that Pause works..
 #endif
-  G4UImanager::GetUIpointer()->SetSession(session);  //So that Pause works..
 
   // Run manager
@@ -159 +120 @@
 
   G4UImanager* UI = G4UImanager::GetUIpointer ();
-
 #ifdef G4UI_USE_WIN32
   G4cout << "Reading win32.g4m file...." << G4endl;
@@ -173 +133 @@
        << G4endl;
 
+#ifdef G4UI_USE
   // Start an interactive session.
-  session -> SessionStart();
+  UIexecutive -> SessionStart();
+#endif
 
 #ifdef G4VIS_USE
@@ -185 +147 @@
   G4cout << "vis_test19: Run manager deleted." << G4endl;
   G4cout << "vis_test19: Deleting session..." << G4endl;
-  delete session;
+#ifdef G4UI_USE
+  delete UIexecutive;
   G4cout << "vis_test19: Session deleted." << G4endl;
+#endif
 
   return 0;