Changeset 490


Ignore:
Timestamp:
Jun 8, 2007, 4:43:30 PM (17 years ago)
Author:
garnier
Message:

r583@mac-90108: laurentgarnier | 2007-06-07 12:23:33 +0200
ca compile avec les moc

Location:
trunk/geant4/interfaces/basic
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/interfaces/basic/GNUmakefile

    r476 r490  
    1616CPPFLAGS += -I$(G4BASE)/interfaces/common/include
    1717CPPFLAGS += -I$(G4BASE)/intercoms/include
    18 
     18ifdef G4UI_USE_QT
     19  all := `/usr/local/Qt/4.2.2/bin/moc -DG4UI_USE_QT include/G4UIQt.hh -o src/G4UIQt_moc.cc`
     20endif
    1921include $(G4INSTALL)/config/common.gmk

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

    r489 r490  
    3131#define G4UIQt_h
    3232
    33 //#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT)
     33#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT)
    3434
    3535#include <map>
    … …  
    4242#include <QtGui/qtextedit.h>
    4343#include <QObject>
     44
    4445class G4UIsession;
    4546
    … …  
    6465// Class description - end :
    6566
    66 class G4UIQt : public G4VBasicShell, public G4VInteractiveSession {
     67class G4UIQt : public QObject, public G4VBasicShell, public G4VInteractiveSession {
     68  Q_OBJECT
    6769
    6870public: // With description
    … …  
    102104  G4bool fHelp;
    103105  G4int fHelpChoice;
    104   QMainWindow *fMainWindow;
    105   UIQtCentralWidget *fCentralWidget;
    106 };
    107 
    108 class UIQtCentralWidget : public QWidget, public QObject {
    109 
    110 Q_OBJECT
    111 
    112   QLineEdit *promptArea;
     106  QMainWindow * mainWindow;
     107  QLineEdit * promptArea;
    113108  QTextEdit *textArea;
    114 
    115 private slots:
    116   void clearButtonCallback();
     109  //  static void ButtonCallback(Widget,XtPointer,XtPointer);
    117110
    118111};
    119112
    120 //#endif
     113#endif
    121114
    122115#endif

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

    r489 r490  
    6464static G4bool exitPause = true;
    6565static G4bool exitHelp = true;
    66 
    67 
    68 UIQtCentralWidget::UIQtCentralWidget (
    69 ) : QWidget()
    70 /***************************************************************************/
    71 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
    72 {
    73   QVBoxLayout* vBox = new QVBoxLayout();
    74   textArea = new QTextEdit();
    75   QLabel *sessionLabel = new QLabel("Session : ");
    76   QPushButton *clearButton = new QPushButton("clear");
    77   connect(clearButton, SIGNAL(clicked()), SLOT(textArea->clear()));
    78 
    79 //  QMenu *menuFile = new QMenu("File");
    80 //  mainWindow->menuBar()->addMenu(menuFile);
    81 
    82   promptArea = new QLineEdit();
    83   textArea->setReadOnly(FALSE);
    84   vBox->addWidget(textArea);
    85   vBox->addWidget(clearButton);
    86   vBox->addWidget(sessionLabel);
    87   vBox->addWidget(promptArea);
    88   setLayout(vBox);
    89 }
    90 
    9166/***************************************************************************/
    9267/**
    … …  
    11994  G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");  // TO KEEP ?
    12095
    121   fMainWindow = new QMainWindow();
    122   fMainWindow->setWindowTitle( "G4UI Session" );
    123   fMainWindow->setBaseSize(300,200);
    124   centralWidget = new UIQtCentralWidget();
    125   fMainWindow->setCentralWidget(centralWidget);
     96  mainWindow = new QMainWindow();
     97  mainWindow->setWindowTitle( "G4UI Session" );
     98  mainWindow->setBaseSize(300,200);
     99  QWidget* centralWidget = new QWidget();
     100  QVBoxLayout* vBox = new QVBoxLayout();
     101  textArea = new QTextEdit();
     102  QLabel *sessionLabel = new QLabel("Session : ");
     103  QPushButton *clearButton = new QPushButton("clear");
     104  mainWindow->connect(clearButton, SIGNAL(clicked()), SLOT(textArea->clear()));
     105
     106//  QMenu *menuFile = new QMenu("File");
     107//  mainWindow->menuBar()->addMenu(menuFile);
     108
     109  promptArea = new QLineEdit();
     110  textArea->setReadOnly(FALSE);
     111  vBox->addWidget(textArea);
     112  vBox->addWidget(clearButton);
     113  vBox->addWidget(sessionLabel);
     114  vBox->addWidget(promptArea);
     115  centralWidget->setLayout(vBox);
     116  mainWindow->setCentralWidget(centralWidget);
    126117
    127118//  QMainWindow top = (QMainWindow)interactorManager->GetMainInteractor();
    … …  
    211202
    212203 
    213   if (fMainWindow!=NULL)
    214     delete fMainWindow;
     204  if (mainWindow!=NULL)
     205    delete mainWindow;
    215206}
    216207/***************************************************************************/
    … …  
    224215{
    225216
    226   fMainWindow->show();
     217  mainWindow->show();
    227218  qApp->exec();
    228219
    … …  
    464455//}
    465456
    466 /** Callback activated when user click on the clear button
    467 */
    468457 /***************************************************************************/
    469  void clearButtonCallback (
    470  )
    471 /***************************************************************************/
    472 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
    473 {
    474   textArea->clear()
    475 }
     458// void clearButtonCallback (
     459// )
     460/***************************************************************************/
     461/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
     462//{
     463//}
    476464/***************************************************************************/
    477465// TODO !
Note: See TracChangeset for help on using the changeset viewer.