Changeset 1086 for trunk/source

Timestamp:

Jul 22, 2009, 11:16:28 AM (15 years ago)

Author:

garnier

Message:

changes to have Qt on test19

File:

• trunk/source/visualization/test/test19.cc (modified) (2 diffs)

trunk/source/visualization/test/test19.cc

@@ -49 +49 @@
 
 #include "G4UIterminal.hh"
-#ifdef G4UI_USE_TCSH
-#include "G4UItcsh.hh"
-#endif
-#include "G4UIGAG.hh"
-#ifdef G4UI_USE_WO
+#if defined(G4UI_USE_GAG)
+  #include "G4UIGAG.hh"
+#elif defined(G4UI_USE_TCSH)
+  #include "G4UItcsh.hh"
+#elif defined(G4UI_USE_WO)
   #include "G4UIWo.hh"
-#endif
-#ifdef G4UI_USE_XM
+#elif defined(G4UI_USE_XM)
   #include "G4UIXm.hh"
-#endif
-#ifdef G4UI_USE_XAW
+#elif defined(G4UI_USE_XAW)
   #include "G4UIXaw.hh"
-#endif
-#ifdef G4UI_USE_WIN32
+#elif defined(G4UI_USE_WIN32)
   #include "G4UIWin32.hh"
-#endif
-#ifdef G4UI_USE_QT
+#elif defined(G4UI_USE_QT)
   #include "G4UIQt.hh"
 #endif
@@ -103 +99 @@
 #else
   if (argc >= 2) {
-#ifdef G4UI_USE_TCSH
+  #if defined(G4UI_USE_TCSH)
     if (strcmp (argv[1], "tcsh")==0)     session =
-                                           new G4UIterminal(new G4UItcsh);
+      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
-#endif
-#ifdef G4UI_USE_WO
-    if (strcmp (argv[1], "Wo")==0)  session = new G4UIWo (argc, argv);
-    else
-#endif
-#ifdef G4UI_USE_XM
-    if (strcmp (argv[1], "Xm")==0)  session = new G4UIXm (argc, argv);
-    else
-#endif
-#ifdef G4UI_USE_XAW
-    if (strcmp (argv[1], "Xaw")==0) session = new G4UIXaw (argc, argv);
-    else
-#endif
-#ifdef G4UI_USE_GAG
-    if (strcmp (argv[1], "gag")==0) session = new G4UIGAG ;
-    else
-#endif
-#ifdef G4UI_USE_QT
-      if (strcmp (argv[1], "Qt")==0) session = new G4UIQt(argc, argv) ;
-    else
-#endif
-                                    session =
-                                           new G4UIterminal();
+      session = new G4UIterminal();
   }
   else                                   
-#ifdef G4UI_USE_TCSH
-                                    session =  new G4UIterminal(new G4UItcsh);
-#else
   {
     G4cerr << "You should define a UI in order to interact with test" << G4endl;
     return 0;
   }
-#endif
 #endif
   G4UImanager::GetUIpointer()->SetSession(session);  //So that Pause works..