Changeset 1117 for trunk/source/interfaces

Timestamp:

Oct 6, 2009, 5:03:22 PM (15 years ago)

Author:

garnier

Message:

Geant4 update

Location:

trunk/source/interfaces/basic/include

Files:

• G4UIExecutive.hh (modified) (3 diffs)
• G4UIExecutive.icc (modified) (5 diffs)

trunk/source/interfaces/basic/include/G4UIExecutive.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4UIExecutive.hh,v 1.2 2009/05/15 07:15:16 kmura Exp $
+// $Id: G4UIExecutive.hh,v 1.3 2009/05/28 06:13:03 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -42 +42 @@
 //     ...
 //     G4UIExecutive* myapp = new G4UIExecutive(argc, argv);
+//     if (session->IsGUI())
+//       // Do any extra for a GUI session
+//
 //     myapp-> SessionStart();
 //     ...
@@ -59 +62 @@
   G4UIsession* session;
   G4VUIshell* shell;
+  G4bool isGUI;
 
 public:
   G4UIExecutive(G4int argc=1, char** argv=0);
   ~G4UIExecutive();
+
+  G4bool IsGUI() const;
+  G4UIsession* GetSession() const;
 
   void SetPrompt(const G4String& prompt);

trunk/source/interfaces/basic/include/G4UIExecutive.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIExecutive.icc,v 1.2 2009/05/15 07:15:16 kmura Exp $
+// $Id: G4UIExecutive.icc,v 1.4 2009/05/28 06:13:03 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -55 +55 @@
 #endif
 
-
 /////////////////////////////////////////////////////
-#if defined(G4UI_USE_XM) || defined(G4UI_USE_WIN32) || defined(G4UI_USE_QT)
+#if defined(G4UI_USE_XM) || defined(G4UI_USE_QT)
 G4UIExecutive::G4UIExecutive(G4int argc, char** argv)
 #else
 G4UIExecutive::G4UIExecutive(G4int, char**)
 #endif
-  : session(0), shell(0)
+  : session(0), shell(0),isGUI(false)
 /////////////////////////////////////////////////////
 {
@@ -71 +70 @@
 #elif defined(G4UI_USE_XM)
   session = new G4UIXm(argc, argv);
+  isGUI = true;
 
 #elif defined(G4UI_USE_WIN32)
@@ -77 +77 @@
 #elif defined(G4UI_USE_QT)
   session = new G4UIQt(argc, argv);
+  isGUI = true;
     
 #else
@@ -89 +90 @@
 ///////////////////////////////
 {
+}
+
+//////////////////////////////////////////
+inline G4bool G4UIExecutive::IsGUI() const
+//////////////////////////////////////////
+{
+  return isGUI;
+}
+
+/////////////////////////////////////////////////////
+inline G4UIsession* G4UIExecutive::GetSession() const
+/////////////////////////////////////////////////////
+{
+  return session;
 }