Changeset 494 for trunk/geant4

Timestamp:

Jun 8, 2007, 4:43:45 PM (17 years ago)

Author:

garnier

Message:

r587@mac-90108: laurentgarnier | 2007-06-07 17:22:03 +0200
on avance

Location:

trunk/geant4/interfaces/basic

Files:

• GNUmakefile (modified) (1 diff)
• include/G4UIQt.hh (modified) (2 diffs)
• src/G4UIQt.cc (modified) (8 diffs)

trunk/geant4/interfaces/basic/GNUmakefile

@@ -3 +3 @@
 # GNUmakefile for interfaces/basic library.  John Allison, 6/7/98.
 
-ifdef G4UI_USE_QT
+#ifdef G4UI_USE_QT
 # This is not  good solution, we have to 'make' twice, but it works...
-moc :
-        @$(MOC) -DG4UI_USE_QT include/G4UIQt.hh -o src/G4UIQt_moc.cc
-endif
+#moc :
+#       @$(MOC) -DG4UI_USE_QT include/G4UIQt.hh -o src/G4UIQt_moc.cc
+#endif
 
 name := G4UIbasic

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

@@ -41 +41 @@
 #include <QtGui/qlineedit.h>
 #include <QtGui/qtextedit.h>
+#include <QtGui/qlabel.h>
 #include <QObject>
 
@@ -104 +105 @@
   G4bool fHelp;
   G4int fHelpChoice;
-  QMainWindow * mainWindow;
-  QLineEdit * promptArea;
-  QTextEdit *textArea;
+  QMainWindow * fMainWindow;
+  QLabel *fCommandLabel;
+  QLineEdit * fCommandArea;
+  QTextEdit *fTextArea;
+  QTextEdit *fCommandHistoryArea;
 
 private slots :
   void clearButtonCallback();
+  void commandEnteredCallback();
 };
 

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

@@ -77 +77 @@
       |     | clear |         |
       | +-------------------+ |
+      | |  promt history    | |
+      | +-------------------+ |
+      | +-------------------+ |
       | |> promt area       | |
       | +-------------------+ |
@@ -94 +97 @@
   G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");  // TO KEEP ?
 
-  mainWindow = new QMainWindow();
-  mainWindow->setWindowTitle( "G4UI Session" ); 
-  mainWindow->setBaseSize(300,200);
+  fMainWindow = new QMainWindow();
+  fMainWindow->setWindowTitle( "G4UI Session" ); 
+  fMainWindow->setBaseSize(300,200);
   QWidget* centralWidget = new QWidget();
   QVBoxLayout* vBox = new QVBoxLayout();
-  textArea = new QTextEdit();
-  QLabel *sessionLabel = new QLabel("Session : ");
+  fTextArea = new QTextEdit();
+  fCommandHistoryArea = new QTextEdit();
+  fCommandLabel = new QLabel();
+
   QPushButton *clearButton = new QPushButton("clear");
   connect(clearButton, SIGNAL(clicked()), SLOT(clearButtonCallback()));
 
+  fTextArea->setReadOnly(true);
+  fCommandHistoryArea->setReadOnly(true);
+
 //  QMenu *menuFile = new QMenu("File");
-//  mainWindow->menuBar()->addMenu(menuFile); 
-
-  promptArea = new QLineEdit();
-  textArea->setReadOnly(FALSE);
-  vBox->addWidget(textArea);
+//  fMainWindow->menuBar()->addMenu(menuFile); 
+
+  fCommandArea = new QLineEdit();
+  connect(fCommandArea, SIGNAL(returnPressed()), SLOT(commandEnteredCallback()));
+
+  vBox->addWidget(fTextArea);
   vBox->addWidget(clearButton);
-  vBox->addWidget(sessionLabel);
-  vBox->addWidget(promptArea);
+  vBox->addWidget(fCommandHistoryArea);
+  vBox->addWidget(fCommandLabel);
+  vBox->addWidget(fCommandArea);
   centralWidget->setLayout(vBox);
-  mainWindow->setCentralWidget(centralWidget);
+  fMainWindow->setCentralWidget(centralWidget);
 
 //  QMainWindow top = (QMainWindow)interactorManager->GetMainInteractor();
@@ -202 +212 @@
 
   
-  if (mainWindow!=NULL)
-    delete mainWindow;
+  if (fMainWindow!=NULL)
+    delete fMainWindow;
 }
 /***************************************************************************/
@@ -215 +225 @@
 {
 
-  mainWindow->show();
+  fMainWindow->show();
+  Prompt("session");
+  exitSession = false;
   qApp->exec();
 
-//   Prompt("session"); // TO KEEP
-//   exitSession = false; // TO KEEP
 //   interactorManager->DisableSecondaryLoop (); // TO KEEP
 //   void* event; // TO KEEP
@@ -230 +240 @@
 }
 /***************************************************************************/
+
 /**
   Display the prompt in the prompt area
@@ -239 +250 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-// TODO !
-//  Arg args[1];
-//  char* str = (char*)XtNewString(aPrompt.data());
-//  XmString cps = XmStringLtoRCreate(str,XmSTRING_DEFAULT_CHARSET);
-//  XtFree(str);
-//  XtSetArg(args[0],XmNpromptString,cps);
-//  XtSetValues(command,args,1);
-//  XmStringFree(cps);
+  fCommandLabel->setText((char*)aPrompt.data());
 }
 /***************************************************************************/
@@ -404 +408 @@
 /***************************************************************************/
 /***************************************************************************/
+
 /**
-  Callback call when "enter" clicked on the prompt zone.
+  Callback call when "enter" clicked on the command zone.
   Send the command to geant4
  */
 // TODO !
-//void G4UIQt::commandEnteredCallback (
-// Widget    a_widget
-//,XtPointer a_tag
-//,XtPointer a_data
-//)
-/***************************************************************************/
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-//{
-//  G4UIQt*  This = (G4UIQt*)a_tag;
-
-//   XmString cps  = ((XmCommandCallbackStruct*)a_data)->value;
-//   char*    ss = XmConvertCompoundStringToString(cps,0);
-//   G4String command (ss);
-//   XtFree   (ss);
-
-//   if(This->fHelp==true) {
-//     exitHelp = true;
-//     This->fHelp = ConvertStringToInt(command.data(),This->fHelpChoice);
-//   } else {
-//     This->ApplyShellCommand (command,exitSession,exitPause);
-//   }
-
-//   a_widget = NULL;
-//   a_tag    = NULL;
-//}
+void G4UIQt::commandEnteredCallback (
+)
+/***************************************************************************/
+/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+{
+  
+   G4String command (fCommandArea->text().toStdString().c_str());
+   if(fHelp==true) {
+     exitHelp = true;
+     fHelp = ConvertStringToInt(command.data(),fHelpChoice);
+   } else {
+printf("*******************3\n");
+     ApplyShellCommand (command,exitSession,exitPause);
+printf("*******************4\n");
+   }
+
+}
 // /***************************************************************************/
 // void G4UIXm::keyHandler (
@@ -461 +458 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  textArea->clear();
+  fTextArea->clear();
 }