Changeset 567 for trunk/geant4

Timestamp:

Aug 16, 2007, 3:27:57 PM (17 years ago)

Author:

garnier

Message:

r574@mac-90108: laurentgarnier | 2007-08-16 12:39:46 +0200
changement pour en faire un .app

Location:

trunk/geant4/N03

Files:

• G4History.macro (modified) (2 diffs)
• exampleN03.cc (modified) (5 diffs)

trunk/geant4/N03/G4History.macro

@@ -5 +5 @@
 /vis/sceneHandler/attach
 /vis/viewer/create ! ! 600
-/vis/open OGLIQT
-/vis/sceneHandler/create OGLIQT
+/vis/open OGLSQT
+/vis/sceneHandler/create OGLSQT
 /vis/sceneHandler/attach
 /vis/viewer/create ! ! 600
@@ -45 +45 @@
 /gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
 /gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
+/gui/addButton vis Vis12(OGLIQT) "/control/execute visTutor/exN03Vis12.mac"
+/gui/addButton vis Vis14(OGLSQT) "/control/execute visTutor/exN03Vis14.mac"
 /gui/addButton vis Vis5(OIX)   "/control/execute visTutor/exN03Vis5.mac"
 /gui/addButton vis Vis6(VRML2FILE) "/control/execute visTutor/exN03Vis6.mac"

trunk/geant4/N03/exampleN03.cc

@@ -32 +32 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
+
+/** Environnement definition for app launch for mac
+*/
+#define MOSX_APP
+#ifdef MOSX_APP
+#define G4UI_BUILD_QT_SESSION
+#define G4UI_USE_QT
+#define G4VIS_BUILD_OPENGLQT_DRIVER
+#define G4VIS_USE_OPENGLQT
+#endif
+/** End of Environnement definition for app launch for mac
+*/
+
+
+
+
+
+
+
 #include "G4RunManager.hh"
 #include "G4UImanager.hh"
@@ -43 +62 @@
 #ifdef G4UI_USE_QT
 #include "G4UIQt.hh"
+#include "G4Qt.hh"
 #endif
 
@@ -90 +110 @@
   G4UIsession* session=0;
   
+#ifndef MOSX_APP
   if (argc==1)   // Define UI session for interactive mode.
     {
+#endif
       // G4UIterminal is a (dumb) terminal
       //
@@ -105 +127 @@
       session = new G4UIterminal();
 #endif
+#ifndef MOSX_APP
     }
+#endif
   
 #ifdef G4VIS_USE
@@ -141 +165 @@
       // G4UIterminal is a (dumb) terminal
       //
-      UI->ApplyCommand("/control/execute vis.mac");    
+#ifdef MOSX_APP
+      G4Qt* interactorManager = G4Qt::getInstance (); 
+      G4String vis = QString("/control/execute "+((QApplication*)interactorManager->GetMainInteractor())->applicationDirPath ()+"/../Resources/vis.mac").toStdString().c_str();
+#else
+      G4String vis = "/control/execute vis.mac";    
+#endif
+      UI->ApplyCommand(vis);    
 #if defined(G4UI_USE_XM) || defined(G4UI_USE_WIN32) || defined(G4UI_USE_QT)
       // Customize the G4UIXm,Win32 menubar with a macro file
       //
-      UI->ApplyCommand("/control/execute visTutor/gui.mac");
+#ifdef MOSX_APP
+      G4String visTutor = QString("/control/execute "+((QApplication*)interactorManager->GetMainInteractor())->applicationDirPath ()+"/../Resources/visTutor/gui.mac").toStdString().c_str();
+#else
+      G4String visTutor = "/control/execute visTutor/gui.mac";    
+#endif
+      UI->ApplyCommand(visTutor);
 #endif
       session->SessionStart();