Changeset 1239 for trunk/source/interfaces/basic
- Timestamp:
- Mar 3, 2010, 6:02:20 PM (15 years ago)
- Location:
- trunk/source/interfaces/basic
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/basic/include/G4UIQt.hh
r1237 r1239 185 185 QWidget* fVisParametersTBWidget; 186 186 QWidget* fViewComponentsTBWidget; 187 QLineEdit* helpLine;187 QLineEdit* fHelpLine; 188 188 G4QTabWidget* fTabWidget; 189 189 QString fCoutText; 190 QLabel *fEmptyViewerTabLabel; 191 QSplitter * fMyVSplitter; 190 192 191 193 private slots : … … 202 204 void ResizeTabWidget( QResizeEvent* ); 203 205 void CoutFilterCallback(const QString&); 206 void TabCloseCallback(int); 207 void CurrentChangedCallback(int); 204 208 }; 205 209 -
trunk/source/interfaces/basic/src/G4UIQt.cc
r1237 r1239 116 116 ,fTabWidget(NULL) 117 117 ,fCoutText("Output") 118 118 119 { 119 120 … … 161 162 QWidget *mainWidget = new QWidget(fMainWindow); 162 163 #if QT_VERSION < 0x040000 163 QSplitter *myVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);164 fToolBox = new QToolBox(Qt::Horizontal, myVSplitter);165 #else 166 QSplitter *myVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);164 fMyVSplitter = new QSplitter(Qt::Horizontal,fMainWindow); 165 fToolBox = new QToolBox(Qt::Horizontal,fMyVSplitter); 166 #else 167 fMyVSplitter = new QSplitter(Qt::Horizontal,fMainWindow); 167 168 fToolBox = new QToolBox(mainWidget); 168 169 #endif … … 171 172 172 173 // Add a empty tabwidget 173 fTabWidget = new G4QTabWidget( myVSplitter);174 fTabWidget = new G4QTabWidget(fMyVSplitter); 174 175 #if QT_VERSION >= 0x040500 175 176 fTabWidget->setTabsClosable (true); … … 246 247 fTabWidget->setSizePolicy(policy); 247 248 248 myVSplitter->addWidget(fToolBox); 249 myVSplitter->addWidget(fTabWidget); 249 fEmptyViewerTabLabel = new QLabel(" If you want to have a Viewer, please use /vis/open commands. "); 250 251 fMyVSplitter->addWidget(fToolBox); 252 fMyVSplitter->addWidget(fEmptyViewerTabLabel); 253 // fMyVSplitter->addWidget(fTabWidget); 254 255 // unset parent fot TabWidget 256 #if QT_VERSION < 0x040000 257 fTabWidget->reparent(0,0,QPoint(0,0)); 258 #else 259 fTabWidget->setParent(0); 260 #endif 261 250 262 251 263 #if QT_VERSION >= 0x040000 … … 253 265 #endif 254 266 commandLineWidget->setSizePolicy (QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum)); 255 mainLayout->addWidget( myVSplitter,1);267 mainLayout->addWidget(fMyVSplitter,1); 256 268 mainLayout->addWidget(commandLineWidget); 257 269 … … 287 299 288 300 connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback())); 289 301 connect(fTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int))); 302 // connect(fTabWidget, SIGNAL(currentChanged(int)), this, SLOT(CurrentChangedCallback(int))); 303 connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 290 304 if(UI!=NULL) UI->SetCoutDestination(this); // TO KEEP 291 305 … … 388 402 QSplitter *splitter = new QSplitter(Qt::Horizontal); 389 403 #endif 390 helpLine = new QLineEdit(fHelpTBWidget);404 fHelpLine = new QLineEdit(fHelpTBWidget); 391 405 helpLayout->addWidget(new QLabel("Search :",helpWidget)); 392 helpLayout->addWidget( helpLine);393 #if QT_VERSION < 0x040000 394 connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( LookForHelpStringCallback() ) );395 #else 396 connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( LookForHelpStringCallback() ) );406 helpLayout->addWidget(fHelpLine); 407 #if QT_VERSION < 0x040000 408 connect( fHelpLine, SIGNAL( returnPressed () ), this, SLOT( LookForHelpStringCallback() ) ); 409 #else 410 connect( fHelpLine, SIGNAL( editingFinished () ), this, SLOT( LookForHelpStringCallback() ) ); 397 411 #endif 398 412 … … 509 523 if (!aWidget) return false; 510 524 525 // Remove QLabel 526 if ( fMyVSplitter->indexOf(fEmptyViewerTabLabel) != -1) { 527 #if QT_VERSION < 0x040000 528 fEmptyViewerTabLabel->reparent(0,0,QPoint(0,0)); 529 #else 530 fEmptyViewerTabLabel->setParent(0); 531 #endif 532 fMyVSplitter->addWidget(fTabWidget); 533 #if QT_VERSION < 0x040000 534 aWidget->reparent(fTabWidget,0,QPoint(0,0)); 535 #else 536 aWidget->setParent(fTabWidget); 537 #endif 538 } 539 540 541 511 542 #ifdef G4DEBUG_INTERFACES_BASIC 512 543 printf("G4UIQt::AddTabWidget ADD %d %d + %d %d---------------------------------------------------\n",sizeX, sizeY,sizeX-fTabWidget->width(),sizeY-fTabWidget->height()); 513 544 #endif 514 545 515 #if QT_VERSION < 0x040000516 aWidget->reparent(fTabWidget,0,QPoint(0,0));517 #else518 aWidget->setParent(fTabWidget);519 #endif520 546 #ifdef G4DEBUG_INTERFACES_BASIC 521 547 printf("G4UIQt::AddTabWidget resize VVVVVVVVVVVG4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt \n"); … … 529 555 530 556 fTabWidget->insertTab(fTabWidget->count(),aWidget,name); 531 532 if (fTabWidget->count() == 1) { 533 connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 534 // connect(fTabWidget, SIGNAL(resizeEvent ( QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*))); 535 } 557 558 // if (fTabWidget->count() == 1) { 559 // connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 560 // connect(fTabWidget, SIGNAL(resizeEvent ( QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*))); 561 // } 562 563 fTabWidget->setCurrentIndex(fTabWidget->count()-1); 564 // UpdateTabWidget(fTabWidget->count()-1); 536 565 // Set visible 537 566 #if QT_VERSION >= 0x040000 … … 582 611 void G4UIQt::UpdateTabWidget(int tabNumber) { 583 612 #ifdef G4DEBUG_INTERFACES_BASIC 584 printf("G4UIQt::UpdateTabWidget \n");613 printf("G4UIQt::UpdateTabWidget %d\n",tabNumber); 585 614 #endif 586 615 if ( fTabWidget == NULL) { … … 588 617 } 589 618 619 590 620 #ifdef G4DEBUG_INTERFACES_BASIC 591 621 printf("G4UIQt::UpdateTabWidget CALL REPAINT tabGL\n"); 592 622 #endif 593 623 624 fTabWidget->setCurrentIndex(tabNumber); 594 625 fTabWidget->setTabSelected(); 595 626 … … 1575 1606 ) 1576 1607 { 1577 QString searchText = helpLine->text();1608 QString searchText = fHelpLine->text(); 1578 1609 1579 1610 #if QT_VERSION < 0x040200 … … 1847 1878 1848 1879 1880 1881 void G4UIQt::TabCloseCallback(int a){ 1882 #ifdef G4DEBUG_INTERFACES_BASIC 1883 printf("G4UIQt::TabCloseCallback %d ---------------------------------\n",a); 1884 #endif 1885 QWidget* temp = fTabWidget->widget(a); 1886 fTabWidget->removeTab (a); 1887 delete temp; 1888 1889 if (fTabWidget->count() == 0) { 1890 fMyVSplitter->addWidget(fEmptyViewerTabLabel); 1891 #if QT_VERSION < 0x040000 1892 fTabWidget->reparent(0,0,QPoint(0,0)); 1893 #else 1894 fTabWidget->setParent(0); 1895 #endif 1896 } 1897 } 1898 1899 1900 void G4UIQt::CurrentChangedCallback(int a){ 1901 #ifdef G4DEBUG_INTERFACES_BASIC 1902 printf("G4UIQt::CurrentChangeCallback %d ---------------------------------\n",a); 1903 #endif 1904 1905 } 1849 1906 1850 1907 void G4QTabWidget::paintEvent( … … 1852 1909 ) 1853 1910 { 1854 QCoreApplication::sendPostedEvents () ;1855 1911 1856 1912 if (currentWidget()) { … … 1858 1914 printf("G4QTabWidget::paintEvent repaint type : %d -- rect %d %d region:%d %d page : %d %d ________________________ for = %d i= %d w: %d\n", event->type(),event->rect().height(),event->rect().width(),event->region().boundingRect().width(),event->region().boundingRect().height(),currentWidget()->width(),currentWidget()->height(),this,currentIndex(),currentWidget()); 1859 1915 #endif 1860 1861 1916 if ( isTabSelected()) { 1917 1918 QCoreApplication::sendPostedEvents () ; 1862 1919 #ifdef G4DEBUG_INTERFACES_BASIC 1863 1920 printf("G4QTabWidget::paintEvent OK\n"); … … 1865 1922 QString text = tabText (currentIndex()); 1866 1923 QString paramSelect = QString("/vis/viewer/select ")+text; 1867 // QString paramFlush = QString("/vis/viewer/flush ")+text;1868 1924 G4UImanager* UI = G4UImanager::GetUIpointer(); 1869 1925 if(UI!=NULL) { 1870 1926 UI->ApplyCommand(paramSelect.toStdString().c_str()); 1871 // UI->ApplyCommand(paramFlush.toStdString().c_str());1872 1927 } 1873 1874 1928 unselectTab(); 1875 1929 repaint();
Note: See TracChangeset
for help on using the changeset viewer.