Changeset 1156 for trunk


Ignore:
Timestamp:
Nov 5, 2009, 4:31:30 PM (15 years ago)
Author:
garnier
Message:

append qt3 fix

Location:
trunk/source/interfaces/basic
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/interfaces/basic/include/G4UIArrayString.hh

    r989 r1156  
    2626//
    2727// $Id: G4UIArrayString.hh,v 1.3 2006/06/29 19:09:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030

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

    r1139 r1156  
    3131#define G4UIQt_h
    3232
    33 #if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT) || defined(G4INTY_BUILD_QT)
     33#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT)
    3434
    3535#include <map>
    … …  
    104104  //   G4String GetCommand(Widget);
    105105  QMainWindow * getMainWindow();
    106   QWidget * getViewWidget();
    107 
    108106
    109107private:
    … …  
    140138  //  static void keyHandler(Widget,XtPointer,XEvent*,Boolean*);
    141139  QMainWindow * fMainWindow;
    142   QWidget *fViewWidget;
    143140  QLabel *fCommandLabel;
    144141  QLineEdit * fCommandArea;
    … …  
    152149  QTreeWidget *fHelpTreeWidget;
    153150#endif
    154   //  QDialog *fHelpDialog;
    155   QWidget *fHelpDialog;
     151  QDialog *fHelpDialog;
    156152  QLineEdit *helpLine;
    157153 

  • trunk/source/interfaces/basic/include/G4UIWin32.hh

    r989 r1156  
    2626//
    2727// $Id: G4UIWin32.hh,v 1.14 2006/06/29 19:09:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030#ifndef G4UIWin32_h

  • trunk/source/interfaces/basic/include/G4UIXaw.hh

    r989 r1156  
    2626//
    2727// $Id: G4UIXaw.hh,v 1.6 2006/06/29 19:09:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030#ifndef G4UIXaw_h

  • trunk/source/interfaces/basic/include/G4UIcsh.hh

    r989 r1156  
    2626//
    2727// $Id: G4UIcsh.hh,v 1.4 2006/06/29 19:09:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/interfaces/basic/include/G4UItcsh.hh

    r989 r1156  
    2626//
    2727// $Id: G4UItcsh.hh,v 1.8 2007/06/14 05:44:58 kmura Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/interfaces/basic/include/G4UIterminal.hh

    r989 r1156  
    2525//
    2626// $Id: G4UIterminal.hh,v 1.10 2007/05/22 01:51:05 kmura Exp $
    27 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     27// GEANT4 tag $Name: $
    2828//
    2929// ====================================================================

  • trunk/source/interfaces/basic/src/G4UIArrayString.cc

    r989 r1156  
    2626//
    2727// $Id: G4UIArrayString.cc,v 1.8 2006/06/29 19:09:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030

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

    r1140 r1156  
    2525//
    2626//
    27 // $Id: G4UIQt.cc,v 1.27 2009/10/07 09:12:35 lgarnier Exp $
     27// $Id: G4UIQt.cc,v 1.28 2009/11/05 14:34:18 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    112112  G4UImanager* UI = G4UImanager::GetUIpointer();
    113113  if(UI!=NULL) UI->SetSession(this);
    114 #ifdef G4DEBUG_INTERFACES_BASIC
    115   printf("G4UIQt::G4UIQt SetSession UI:%d G4UIQt:%d\n",UI,this);
    116 #endif
    117114
    118115  // Check if already define in external app QMainWindow
    … …  
    159156
    160157  QWidget *mainWidget = new QWidget(fMainWindow);
    161   QSplitter *bottomSplitter = new QSplitter(Qt::Vertical,mainWidget);
    162   QSplitter *topSplitter = new QSplitter(Qt::Vertical,mainWidget);
    163   fViewWidget = new QWidget();
     158#if QT_VERSION < 0x040000
     159  QSplitter *splitter = new QSplitter(Qt::Vertical,fMainWindow);
     160#else
     161  QSplitter *splitter = new QSplitter(Qt::Vertical,mainWidget);
     162#endif
    164163
    165164  // Set layouts
    166165
    167   QWidget* topWidget = new QWidget(bottomSplitter);
    168   QWidget* bottomWidget = new QWidget(bottomSplitter);
    169 
    170 
    171   // FIXME ...finir de mettre de QGL dans le splitter du haut
    172 
    173 
     166  QWidget* topWidget = new QWidget(splitter);
     167  QWidget* bottomWidget = new QWidget(splitter);
    174168
    175169  QVBoxLayout *layoutTop = new QVBoxLayout(topWidget);
    … …  
    230224  QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
    231225
    232   bottomSplitter->addWidget(topWidget);
    233   bottomSplitter->addWidget(bottomWidget);
    234 
    235   mainLayout->addWidget(fViewWidget);
    236   mainLayout->addWidget(bottomSplitter);
    237 #ifdef G4DEBUG_INTERFACES_BASIC
    238   printf("G4UIQt::Initialise ViewWidget :%d\n",fViewWidget);
    239 #endif
    240 
    241 #endif
    242 
    243     fMainWindow->setCentralWidget(mainWidget);
    244     //fMainWindow->setCentralWidget(bottomSplitter);
     226  splitter->addWidget(topWidget);
     227  splitter->addWidget(bottomWidget);
     228
     229  mainLayout->addWidget(splitter);
     230
     231#endif
     232
     233#if QT_VERSION >= 0x040000
     234  fMainWindow->setCentralWidget(mainWidget);
     235#else
     236  fMainWindow->setCentralWidget(splitter);
     237#endif
    245238
    246239#if QT_VERSION < 0x040000
    … …  
    268261#endif
    269262
    270 #ifdef G4DEBUG_INTERFACES_BASIC
    271   printf("G4UIQt::G4UIQt end %d \n",fMainWindow);
    272 #endif
    273 
    274263  AddInteractor ("file",(G4Interactor)fileMenu);
    275264  AddInteractor ("help",(G4Interactor)helpMenu);
    … …  
    277266  // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow
    278267#if QT_VERSION < 0x040000
    279   QValueList<int> vals = bottomSplitter->sizes();
    280 #else
    281   QList<int> vals = bottomSplitter->sizes();
     268  QValueList<int> vals = splitter->sizes();
     269#else
     270  QList<int> vals = splitter->sizes();
    282271#endif
    283272//    if(vals.size()==2) {
    284 //      vals[0] = (bottomSplitter->orientation()==Qt::Vertical ? bottomSplitter->height() : bottomSplitter->width())*3/4;
    285 //      vals[1] = (bottomSplitter->orientation()==Qt::Vertical ? bottomSplitter->height() : bottomSplitter->width())*1/4;
    286 //      bottomSplitter->setSizes(vals);
     273//      vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
     274//      vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
     275//      splitter->setSizes(vals);
    287276//    }
    288277
    289278  if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
    290 #ifdef G4DEBUG_INTERFACES_BASIC
    291   printf("G4UIQt::Initialise end of interface creation \n");
    292 #endif
    293 
    294 
    295 
    296 //   /////////////////
    297 //   QLabel *test = new QLabel("test",fViewWidget);
    298 //   QHBoxLayout *mainLayout2 = new QHBoxLayout;
    299 //   mainLayout2->setMargin(0);
    300 //   mainLayout2->setSpacing(0);
    301 //   mainLayout2->addWidget(test);
    302 
    303 //   fViewWidget->setLayout(mainLayout2);
    304 
    305 
    306 }
    307 
     279}
    308280
    309281
    … …  
    318290  }
    319291 
    320 #ifdef G4DEBUG_INTERFACES_BASIC
    321   printf("G4UIQt::DELETE ALL\n");
    322 #endif
    323292  if (fMainWindow!=NULL)
    324293    delete fMainWindow;
    … …  
    335304  G4Qt* interactorManager = G4Qt::getInstance ();
    336305
     306#if QT_VERSION >= 0x040000
     307#if QT_VERSION >= 0x040200
     308  fMainWindow->setVisible(true);
     309#else
    337310  fMainWindow->show();
    338 
     311#endif
     312#else
     313  fMainWindow->show();
     314#endif
    339315  Prompt("session");
    340316  exitSession = false;
    … …  
    377353)
    378354{
    379 #ifdef G4DEBUG_INTERFACES_BASIC
    380   G4UImanager* UI = G4UImanager::GetUIpointer();
    381   printf("G4UIQt::getMainWindow UI:%d fMa:%d this:%d\n",UI,fMainWindow,this);
    382 #endif
    383355  return fMainWindow;
    384 }
    385 
    386 QWidget * G4UIQt::getViewWidget (
    387 )
    388 {
    389 #ifdef G4DEBUG_INTERFACES_BASIC
    390   G4UImanager* UI = G4UImanager::GetUIpointer();
    391   printf("G4UIQt::getViewWidget %d\n",fViewWidget);
    392 #endif
    393   return fViewWidget;
    394356}
    395357
    … …  
    599561    fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
    600562#else
    601     //    fHelpDialog = new QDialog(fMainWindow,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
    602     fHelpDialog = new QWidget(0,Qt::Window | Qt::Popup);
     563    fHelpDialog = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
    603564#endif
    604565    QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);

  • trunk/source/interfaces/basic/src/G4UIWin32.cc

    r989 r1156  
    2626//
    2727// $Id: G4UIWin32.cc,v 1.13 2006/06/29 19:09:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/basic/src/G4UIXaw.cc

    r989 r1156  
    2626//
    2727// $Id: G4UIXaw.cc,v 1.6 2006/06/29 19:09:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/basic/src/G4UIcsh.cc

    r989 r1156  
    2626//
    2727// $Id: G4UIcsh.cc,v 1.8 2006/06/29 19:09:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/interfaces/basic/src/G4UItcsh.cc

    r989 r1156  
    2626//
    2727// $Id: G4UItcsh.cc,v 1.17 2008/07/18 06:37:06 kmura Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030

  • trunk/source/interfaces/basic/src/G4UIterminal.cc

    r989 r1156  
    2626//
    2727// $Id: G4UIterminal.cc,v 1.28 2008/07/18 06:38:59 kmura Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030// ====================================================================

  • trunk/source/interfaces/basic/src/G4VUIshell.cc

    r1032 r1156  
    2626//
    2727// $Id: G4VUIshell.cc,v 1.10 2007/06/14 05:44:58 kmura Exp $
    28 // GEANT4 tag $Name: geant4-09-02-ref-02 $
     28// GEANT4 tag $Name: $
    2929//
    3030
Note: See TracChangeset for help on using the changeset viewer.