Changeset 488

Timestamp:

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

Author:

garnier

Message:

r581@mac-90108: laurentgarnier | 2007-06-07 10:29:52 +0200
version ok, mais sans signals slots

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (4 diffs)
• src/G4UIQt.cc (modified) (5 diffs)

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

@@ -40 +40 @@
 #include <QtGui/qmainwindow.h>
 #include <QtGui/qlineedit.h>
+#include <QtGui/qtextedit.h>
 class G4UIsession;
 
@@ -63 +64 @@
 
 class G4UIQt : public G4VBasicShell, public G4VInteractiveSession {
+//  Q_OBJECT
+
 public: // With description
   G4UIQt(int,char**);
@@ -92 +95 @@
   void ExitHelp();
 private:
+
   //  Widget form,shell,command,menuBar,text;
   //  std::map<Widget,G4String, std::less<Widget> > commands;
@@ -100 +104 @@
   QMainWindow * mainWindow;
   QLineEdit * promptArea;
+  QTextEdit *textArea;
   //  static void ButtonCallback(Widget,XtPointer,XtPointer);
+
 };
 

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

@@ -53 +53 @@
 #include <QtGui/qmenubar.h>
 #include <QtGui/qboxlayout.h>
-#include <QtGui/qtextedit.h>
+#include <QtGui/qpushbutton.h>
+#include <QtGui/qlabel.h>
 
 #include <stdlib.h>
@@ -74 +75 @@
       | |                   | |
       | +-------------------+ |
-      |                       |
+      |     | clear |         |
       | +-------------------+ |
       | |> promt area       | |
@@ -98 +99 @@
   QWidget* centralWidget = new QWidget();
   QVBoxLayout* vBox = new QVBoxLayout();
-  QTextEdit *textArea = new QTextEdit();
+  textArea = new QTextEdit();
+  QLabel *sessionLabel = new QLabel("Session : ");
+  QPushButton *clearButton = new QPushButton("clear");
+//  mainWindow->connect(clearButton, SIGNAL(clicked()), SLOT(textArea->clear()));
 
 //  QMenu *menuFile = new QMenu("File");
@@ -106 +110 @@
   textArea->setReadOnly(FALSE);
   vBox->addWidget(textArea);
+  vBox->addWidget(clearButton);
+  vBox->addWidget(sessionLabel);
   vBox->addWidget(promptArea);
   centralWidget->setLayout(vBox);
@@ -448 +454 @@
 //   XmTextSetInsertionPosition(a_widget,XmTextGetLastPosition(a_widget));
 //}
-// /***************************************************************************/
+
+ /***************************************************************************/
 // void clearButtonCallback (
-//  Widget
-// ,XtPointer a_tag
-// ,XtPointer
 // )
 /***************************************************************************/
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 //{
-//   XmTextSetString((Widget)a_tag,(char*)"");
 //}
 /***************************************************************************/