Changeset 487

Timestamp:

Jun 6, 2007, 4:21:22 PM (17 years ago)

Author:

garnier

Message:

r579@mac-90108: laurentgarnier | 2007-06-06 16:24:44 +0200
on avance...

Location:

trunk/geant4

Files:

• N03/G4History.macro (modified) (1 diff)
• interfaces/basic/include/G4UIQt.hh (modified) (2 diffs)
• interfaces/basic/src/G4UIQt.cc (modified) (2 diffs)

trunk/geant4/N03/G4History.macro

@@ -22 +22 @@
 /vis/scene/endOfEventAction accumulate
 /vis/scene/notifyHandlers
+/control/execute visTutor/gui.mac
+/gui/addMenu file File
+/gui/addButton file Continue continue
+/gui/addButton file Exit "exit"
+/gui/addMenu run Run
+/gui/addButton run "beamOn 1" "/run/beamOn 1"
+/gui/addButton run run1 "/control/execute run1.mac"
+/gui/addButton run run2 "/control/execute run2.mac"
+/gui/addMenu gun Gun
+/gui/addButton gun "50 MeV"  "/gun/energy 50 MeV"
+/gui/addButton gun "1 GeV"   "/gun/energy 1 GeV"
+/gui/addButton gun "10 GeV"  "/gun/energy 10 GeV"
+/gui/addButton gun "e-"      "/gun/particle e-"
+/gui/addButton gun "pi0"     "/gun/particle pi0"
+/gui/addButton gun "pi+"     "/gun/particle pi+"
+/gui/addButton gun "neutron" "/gun/particle neutron"
+/gui/addButton gun "proton"  "/gun/particle proton"
+/gui/addMenu vis Vis
+/gui/addButton vis Vis0(OGLIX) "/control/execute visTutor/exN03Vis0.mac"
+/gui/addButton vis Vis1(OGLSX) "/control/execute visTutor/exN03Vis1.mac"
+/gui/addButton vis Vis2(OGLSX) "/control/execute visTutor/exN03Vis2.mac"
+/gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
+/gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
+/gui/addButton vis Vis5(OIX)   "/control/execute visTutor/exN03Vis5.mac"
+/gui/addButton vis Vis6(VRML2FILE) "/control/execute visTutor/exN03Vis6.mac"
+/gui/addButton vis Vis7(DAWNFILE) "/control/execute visTutor/exN03Vis7.mac"
+/gui/addButton vis Vis8(DAWNFILE) "/control/execute visTutor/exN03Vis8.mac"
+/gui/addButton vis Vis9(OGLIWIN) "/control/execute visTutor/exN03Vis9.mac"
+/gui/addButton vis Vis10(OIWin32) "/control/execute visTutor/exN03Vis10.mac"
+/gui/addButton vis Vis11(OGLSXm) "/control/execute visTutor/exN03Vis11.mac"
+/gui/addMenu viewer Viewer
+/gui/addButton viewer "Set style solid" "/vis/viewer/set/style solid"
+/gui/addButton viewer "Set style wireframe" "/vis/viewer/set/style wire"
+/gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
+/N03/event/printModulo 100

trunk/geant4/interfaces/basic/include/G4UIQt.hh

@@ -39 +39 @@
 
 #include <QtGui/qmainwindow.h>
-
+#include <QtGui/qlineedit.h>
 class G4UIsession;
 
@@ -99 +99 @@
   G4int fHelpChoice;
   QMainWindow * mainWindow;
+  QLineEdit * promptArea;
   //  static void ButtonCallback(Widget,XtPointer,XtPointer);
 };

trunk/geant4/interfaces/basic/src/G4UIQt.cc

@@ -50 +50 @@
 #include <QtGui/qapplication.h>
 #include <QtGui/qwidget.h>
+#include <QtGui/qmenu.h>
+#include <QtGui/qmenubar.h>
+#include <QtGui/qboxlayout.h>
+#include <QtGui/qtextedit.h>
 
 #include <stdlib.h>
@@ -90 +94 @@
 
   mainWindow = new QMainWindow();
-
+  mainWindow->setWindowTitle( "G4UI Session" ); 
+  mainWindow->setBaseSize(300,200);
+  QWidget* centralWidget = new QWidget();
+  QVBoxLayout* vBox = new QVBoxLayout();
+  QTextEdit *textArea = new QTextEdit();
+
+//  QMenu *menuFile = new QMenu("File");
+//  mainWindow->menuBar()->addMenu(menuFile); 
+
+  promptArea = new QLineEdit();
+  textArea->setReadOnly(FALSE);
+  vBox->addWidget(textArea);
+  vBox->addWidget(promptArea);
+  centralWidget->setLayout(vBox);
+  mainWindow->setCentralWidget(centralWidget);
 
 //  QMainWindow top = (QMainWindow)interactorManager->GetMainInteractor();