Changeset 1163 for trunk/source/interfaces/basic/src
- Timestamp:
- Nov 13, 2009, 10:33:58 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/basic/src/G4UIQt.cc
r1158 r1163 104 104 ,char** argv 105 105 ) 106 :fHelpDialog(NULL), 107 fTabWidget(NULL) 106 :fHelpDialog(NULL) 107 ,fTabWidget(NULL) 108 ,fCoutText("Output") 108 109 { 109 110 G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt"); … … 162 163 QWidget *mainWidget = new QWidget(fMainWindow); 163 164 #if QT_VERSION < 0x040000 164 QSplitter *visCoutSplitter = new QSplitter(Qt::Vertical,fMainWindow); 165 QSplitter *coutHistorySplitter = new QSplitter(Qt::Vertical,fMainWindow); 165 QSplitter *visHistorySplitter = new QSplitter(Qt::Vertical,fMainWindow); 166 166 QSplitter *historyCommandLineSplitter = new QSplitter(Qt::Vertical,fMainWindow); 167 167 #else 168 QSplitter *visCoutSplitter = new QSplitter(Qt::Vertical,mainWidget); 169 QSplitter *coutHistorySplitter = new QSplitter(Qt::Vertical,mainWidget); 168 QSplitter *visHistorySplitter = new QSplitter(Qt::Vertical,mainWidget); 170 169 QSplitter *historyCommandLineSplitter = new QSplitter(Qt::Vertical,mainWidget); 171 170 #endif … … 176 175 // Set layouts 177 176 178 visWidget = new QWidget(visCoutSplitter); 179 QWidget* coutWidget = new QWidget(coutHistorySplitter); 177 fTabWidget = new QTabWidget; 178 connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 179 180 visWidget = new QWidget(visHistorySplitter); 181 QWidget* coutWidget = new QWidget(fTabWidget); 180 182 QWidget* historyWidget = new QWidget(historyCommandLineSplitter); 181 183 QWidget* commandLineWidget = new QWidget(historyCommandLineSplitter); … … 188 190 // fill them 189 191 192 fTabWidget->addTab(coutWidget,fCoutText); 193 190 194 fTextArea = new QTextEdit(coutWidget); 191 195 QPushButton *clearButton = new QPushButton("clear",coutWidget); … … 252 256 historyCommandLineSplitter->addWidget(commandLineWidget); 253 257 254 // The splitter for Cout/History255 coutHistorySplitter->addWidget(coutWidget);256 coutHistorySplitter->addWidget(historyCommandLineSplitter);257 258 258 // The splitter for Vis/Cout 259 vis CoutSplitter->addWidget(visWidget);260 vis CoutSplitter->addWidget(coutHistorySplitter);261 262 mainLayout->addWidget(vis CoutSplitter);259 visHistorySplitter->addWidget(visWidget); 260 visHistorySplitter->addWidget(historyCommandLineSplitter); 261 262 mainLayout->addWidget(visHistorySplitter); 263 263 264 264 #endif … … 270 270 fMainWindow->setCentralWidget(mainWidget); 271 271 #else 272 fMainWindow->setCentralWidget(vis CoutSplitter);272 fMainWindow->setCentralWidget(visHistorySplitter); 273 273 #endif 274 274 … … 348 348 ) 349 349 { 350 if (fTabWidget == NULL) { 351 fTabWidget = new QTabWidget; 352 } 353 if (!aWidget) return; 354 355 #if QT_VERSION < 0x040000 356 aWidget->reparent(visWidget,0,QPoint(0,0)); 357 #else 358 aWidget->setParent(visWidget); 359 #endif 360 361 fTabWidget->addTab(aWidget,name); 362 QHBoxLayout *mainLayout = new QHBoxLayout(visWidget); 363 mainLayout->setMargin(0); 364 mainLayout->setSpacing(0); 365 mainLayout->addWidget(fTabWidget); 366 } 350 if (fTabWidget != NULL) { 351 if (!aWidget) return; 352 353 #if QT_VERSION < 0x040000 354 aWidget->reparent(visWidget,0,QPoint(0,0)); 355 #else 356 aWidget->setParent(visWidget); 357 #endif 358 359 fTabWidget->addTab(aWidget,name); 360 QHBoxLayout *mainLayout = new QHBoxLayout(visWidget); 361 mainLayout->setMargin(0); 362 mainLayout->setSpacing(0); 363 mainLayout->addWidget(fTabWidget); 364 } 365 } 366 367 368 void G4UIQt::UpdateTabWidget(int tabNumber) { 369 QString text = fTabWidget->tabText (tabNumber); 370 if ( text != fCoutText) { 371 372 // Then we have to do /vis/viewer/select on the selelected tab 373 QString paramSelect = QString("/vis/viewer/select ")+text; 374 QString paramFlush = QString("/vis/viewer/flush ")+text; 375 G4UImanager* UI = G4UImanager::GetUIpointer(); 376 if(UI!=NULL) { 377 UI->ApplyCommand(paramSelect.toStdString().c_str()); 378 UI->ApplyCommand(paramFlush.toStdString().c_str()); 379 } 380 fTabWidget->currentWidget()->repaint(); 381 } 382 } 383 367 384 368 385
Note: See TracChangeset
for help on using the changeset viewer.