Changeset 1156 for trunk/source/interfaces/basic/src
- Timestamp:
- Nov 5, 2009, 4:31:30 PM (15 years ago)
- Location:
- trunk/source/interfaces/basic/src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/basic/src/G4UIArrayString.cc
r989 r1156 26 26 // 27 27 // $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: $ 29 29 // 30 30 -
trunk/source/interfaces/basic/src/G4UIQt.cc
r1140 r1156 25 25 // 26 26 // 27 // $Id: G4UIQt.cc,v 1.2 7 2009/10/07 09:12:35lgarnier Exp $27 // $Id: G4UIQt.cc,v 1.28 2009/11/05 14:34:18 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 112 112 G4UImanager* UI = G4UImanager::GetUIpointer(); 113 113 if(UI!=NULL) UI->SetSession(this); 114 #ifdef G4DEBUG_INTERFACES_BASIC115 printf("G4UIQt::G4UIQt SetSession UI:%d G4UIQt:%d\n",UI,this);116 #endif117 114 118 115 // Check if already define in external app QMainWindow … … 159 156 160 157 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 164 163 165 164 // Set layouts 166 165 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); 174 168 175 169 QVBoxLayout *layoutTop = new QVBoxLayout(topWidget); … … 230 224 QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); 231 225 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 245 238 246 239 #if QT_VERSION < 0x040000 … … 268 261 #endif 269 262 270 #ifdef G4DEBUG_INTERFACES_BASIC271 printf("G4UIQt::G4UIQt end %d \n",fMainWindow);272 #endif273 274 263 AddInteractor ("file",(G4Interactor)fileMenu); 275 264 AddInteractor ("help",(G4Interactor)helpMenu); … … 277 266 // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow 278 267 #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(); 282 271 #endif 283 272 // 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); 287 276 // } 288 277 289 278 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 } 308 280 309 281 … … 318 290 } 319 291 320 #ifdef G4DEBUG_INTERFACES_BASIC321 printf("G4UIQt::DELETE ALL\n");322 #endif323 292 if (fMainWindow!=NULL) 324 293 delete fMainWindow; … … 335 304 G4Qt* interactorManager = G4Qt::getInstance (); 336 305 306 #if QT_VERSION >= 0x040000 307 #if QT_VERSION >= 0x040200 308 fMainWindow->setVisible(true); 309 #else 337 310 fMainWindow->show(); 338 311 #endif 312 #else 313 fMainWindow->show(); 314 #endif 339 315 Prompt("session"); 340 316 exitSession = false; … … 377 353 ) 378 354 { 379 #ifdef G4DEBUG_INTERFACES_BASIC380 G4UImanager* UI = G4UImanager::GetUIpointer();381 printf("G4UIQt::getMainWindow UI:%d fMa:%d this:%d\n",UI,fMainWindow,this);382 #endif383 355 return fMainWindow; 384 }385 386 QWidget * G4UIQt::getViewWidget (387 )388 {389 #ifdef G4DEBUG_INTERFACES_BASIC390 G4UImanager* UI = G4UImanager::GetUIpointer();391 printf("G4UIQt::getViewWidget %d\n",fViewWidget);392 #endif393 return fViewWidget;394 356 } 395 357 … … 599 561 fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax ); 600 562 #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); 603 564 #endif 604 565 QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog); -
trunk/source/interfaces/basic/src/G4UIWin32.cc
r989 r1156 26 26 // 27 27 // $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: $ 29 29 // 30 30 // G.Barrand -
trunk/source/interfaces/basic/src/G4UIXaw.cc
r989 r1156 26 26 // 27 27 // $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: $ 29 29 // 30 30 // G.Barrand -
trunk/source/interfaces/basic/src/G4UIcsh.cc
r989 r1156 26 26 // 27 27 // $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: $ 29 29 // 30 30 -
trunk/source/interfaces/basic/src/G4UItcsh.cc
r989 r1156 26 26 // 27 27 // $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: $ 29 29 // 30 30 -
trunk/source/interfaces/basic/src/G4UIterminal.cc
r989 r1156 26 26 // 27 27 // $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: $ 29 29 // 30 30 // ==================================================================== -
trunk/source/interfaces/basic/src/G4VUIshell.cc
r1032 r1156 26 26 // 27 27 // $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: $ 29 29 // 30 30
Note: See TracChangeset
for help on using the changeset viewer.