- Timestamp:
- Oct 6, 2009, 5:05:23 PM (15 years ago)
- Location:
- trunk/source/interfaces
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/History
r1043 r1118 1 $Id: History,v 1.11 1 2009/05/15 09:34:36 lgarnierExp $1 $Id: History,v 1.113 2009/05/28 06:13:21 kmura Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 19 19 20 20 ======= 21 6 October, 2009 L. Garnier 22 - Change GEANT4_QT_DEBUG flag for G4DEBUG_INTERFACES_BASIC and 23 G4DEBUG_INTERFACES_COMMON 24 25 28 May, 2009 K. Murakami (interfaces-V09-02-03) 26 - G4UIExecutive: add IsGUI() method / add GetSession() method 27 28 18 May, 2009 K. Murakami (interfaces-V09-02-02) 29 - G4UIExecutive : fixed wrong #ifdef condition 30 - include changes by Laurent (7/May) 31 21 32 15 May, 2009 K. Murakami (interfaces-V09-02-01) 22 33 - G4UIExecutive : Remove batch mode handling … … 29 40 - G4UIQt.cc : Fix Compilation warning 30 41 - G4VBasicShell.cc : Better command completion in command Line 31 (need intercoms-V09-02-00)32 42 33 43 31, March, 2009 L.Garnier -
trunk/source/interfaces/basic/GNUmakefile
r790 r1118 12 12 MOC_MACRO = -DG4UI_BUILD_QT_SESSION 13 13 14 # For debug mode 15 CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC 16 14 17 include $(G4INSTALL)/config/architecture.gmk 15 18 include $(G4INSTALL)/config/G4UI_BUILD.gmk -
trunk/source/interfaces/basic/src/G4UIQt.cc
r1043 r1118 142 142 fMainWindow = new QMainWindow(); 143 143 144 #ifdef G4DEBUG 144 #ifdef G4DEBUG_INTERFACES_BASIC 145 145 printf("G4UIQt::Initialise after main window creation\n"); 146 146 #endif … … 155 155 #endif 156 156 157 QSplitter *splitter = new QSplitter(Qt::Vertical,fMainWindow); 157 QWidget *mainWidget = new QWidget(fMainWindow); 158 QSplitter *splitter = new QSplitter(mainWidget); 159 splitter->setOrientation(Qt::Vertical); 158 160 159 161 // Set layouts … … 208 210 209 211 #if QT_VERSION >= 0x040000 210 topWidget->setLayout(layoutTop);212 // topWidget->setLayout(layoutTop); 211 213 #endif 212 214 … … 216 218 #if QT_VERSION >= 0x040000 217 219 218 bottomWidget->setLayout(layoutBottom); 220 // bottomWidget->setLayout(layoutBottom); 221 QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); 222 219 223 splitter->addWidget(topWidget); 220 224 splitter->addWidget(bottomWidget); 221 #endif 222 223 224 fMainWindow->setCentralWidget(splitter); 225 226 mainLayout->addWidget(splitter); 227 228 #endif 229 230 fMainWindow->setCentralWidget(mainWidget); 231 //fMainWindow->setCentralWidget(splitter); 225 232 226 233 #if QT_VERSION < 0x040000 … … 257 264 QList<int> vals = splitter->sizes(); 258 265 #endif 259 if(vals.size()==2) {260 vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;261 vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;262 splitter->setSizes(vals);263 }266 // if(vals.size()==2) { 267 // vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4; 268 // vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4; 269 // splitter->setSizes(vals); 270 // } 264 271 265 272 if(UI!=NULL) UI->SetCoutDestination(this); // TO KEEP … … 997 1004 ) 998 1005 { 999 #ifdef G4DEBUG 1006 #ifdef G4DEBUG_INTERFACES_BASIC 1000 1007 printf("G4UIQt::GetHelpChoice SHOULD NEVER GO HERE"); 1001 1008 #endif … … 1009 1016 ) 1010 1017 { 1011 #ifdef G4DEBUG 1018 #ifdef G4DEBUG_INTERFACES_BASIC 1012 1019 printf("G4UIQt::ExitHelp SHOULD NEVER GO HERE"); 1013 1020 #endif
Note: See TracChangeset
for help on using the changeset viewer.