Changeset 1341

Timestamp:

Nov 5, 2010, 4:03:47 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/examples/novice/N03

Files:

• G4History.macro (modified) (3 diffs)
• N03 (deleted)
• currentEvent.rndm (modified) (1 diff)
• exampleN03.cc (modified) (2 diffs)

trunk/examples/novice/N03/G4History.macro

@@ -1 +1 @@
 /run/verbose 2
+/vis/open OGL 600x600-0+0
+/vis/sceneHandler/create OGL
+/vis/viewer/create ! ! 600x600-0+0
+/vis/viewer/refresh
+/vis/viewer/set/autoRefresh false
+/vis/verbose errors
+/vis/drawVolume
 /vis/scene/create
-/vis/open OGLSQt 600x600
-/vis/sceneHandler/create OGLSQt
+/vis/scene/add/volume world
 /vis/sceneHandler/attach
-/vis/viewer/create ! ! 600x600
-/vis/viewer/refresh
-/vis/scene/notifyHandlers
-/vis/viewer/flush
-/vis/viewer/refresh viewer-0
-/vis/viewer/update viewer-0
 /vis/scene/add/trajectories smooth
 /tracking/storeTrajectory 2
@@ -19 +19 @@
 /vis/scene/notifyHandlers scene-0
 /vis/scene/endOfEventAction accumulate
+/vis/viewer/set/autoRefresh true
+/vis/viewer/refresh
+/vis/verbose warnings
+/run/beamOn 1
+/vis/ogl/printEPS
 /control/execute visTutor/gui.mac
 /gui/addMenu file File
@@ -54 +59 @@
 /gui/addButton vis Vis15(OGLSQt) "/control/execute visTutor/exN03Vis15.mac"
 /gui/addMenu viewer Viewer
-/gui/addButton viewer "Set style solid" "/vis/viewer/set/style solid"
+/gui/addButton viewer "Set style surface" "/vis/viewer/set/style surface"
 /gui/addButton viewer "Set style wireframe" "/vis/viewer/set/style wire"
 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
 /N03/event/printModulo 100
+/run/beamOn 1
+/vis/open OGL
+/vis/sceneHandler/create OGL
+/vis/sceneHandler/attach
+/vis/viewer/create ! ! 600
+/vis/viewer/refresh
+/gun/energy 1 GeV
+/run/beamOn 1
+/vis/viewer/select viewer-0 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/open OGL
+/vis/sceneHandler/create OGL
+/vis/sceneHandler/attach
+/vis/viewer/create ! ! 600
+/vis/viewer/refresh
+/vis/viewer/select viewer-1 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/viewer/select viewer-0 (OpenGLStoredQt)
+/vis/viewer/refresh
+/run/beamOn  1
+/vis/viewer/select viewer-1 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/viewer/select viewer-2 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/viewer/select viewer-0 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/open OGL
+/vis/sceneHandler/create OGL
+/vis/sceneHandler/attach
+/vis/viewer/create ! ! 600
+/vis/viewer/refresh
+/vis/viewer/select viewer-1 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/open OGL
+/vis/sceneHandler/create OGL
+/vis/sceneHandler/attach
+/vis/viewer/create ! ! 600
+/vis/viewer/refresh
+/run/beamOn  1
+/vis/open OGL
+/vis/sceneHandler/create OGL
+/vis/sceneHandler/attach
+/vis/viewer/create ! ! 600
+/vis/viewer/refresh
+/vis/open OGL
+/vis/sceneHandler/create OGL
+/vis/sceneHandler/attach
+/vis/viewer/create ! ! 600
+/vis/viewer/refresh
 /gun/energy 10 GeV
-/run/beamOn 1
+/run/beamOn  1
+/vis/viewer/select viewer-5 (OpenGLStoredQt)
+/vis/viewer/refresh
+/run/beamOn  1
+/vis/viewer/select viewer-4 (OpenGLStoredQt)
+/vis/viewer/refresh
+/run/beamOn  1
+/vis/viewer/select viewer-5 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/viewer/select viewer-4 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/viewer/select viewer-5 (OpenGLStoredQt)
+/vis/viewer/refresh
+/vis/viewer/select viewer-6 (OpenGLStoredQt)
+/vis/viewer/refresh

trunk/examples/novice/N03/currentEvent.rndm

@@ -2 +2 @@
 1878463799
 0
-9876
-54321
+40191164
+528406071

trunk/examples/novice/N03/exampleN03.cc

@@ -52 +52 @@
 #include "G4UIExecutive.hh"
 #endif
+
+#include "qcoreapplication.h" 
+
+#define MAC_OSX_APP 1 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -107 +111 @@
   //
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
-  
+   
+#ifdef MAC_OSX_APP 
+  std::string progName = argv[0]; 
+  std::string::size_type pos = progName.find(".app/Contents/MacOS/",0); 
+  if (pos != std::string::npos) { 
+    std::string progDir = progName.substr(0,pos+4); 
+    chdir((progDir+"/Contents/macros").c_str()); 
+    argc = 1; 
+  } 
+#endif 
+
   if (argc!=1)   // batch mode
     {
-      G4String command = "/control/execute ";
+     G4String command = "/control/execute ";
       G4String fileName = argv[1];
       UImanager->ApplyCommand(command+fileName);