Changeset 1139
- Timestamp:
- Nov 2, 2009, 4:38:34 PM (15 years ago)
- Location:
- trunk/source/interfaces
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/basic/include/G4UIQt.hh
r922 r1139 31 31 #define G4UIQt_h 32 32 33 #if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT) 33 #if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT) || defined(G4INTY_BUILD_QT) 34 34 35 35 #include <map> … … 104 104 // G4String GetCommand(Widget); 105 105 QMainWindow * getMainWindow(); 106 QWidget * getViewWidget(); 107 106 108 107 109 private: … … 138 140 // static void keyHandler(Widget,XtPointer,XEvent*,Boolean*); 139 141 QMainWindow * fMainWindow; 142 QWidget *fViewWidget; 140 143 QLabel *fCommandLabel; 141 144 QLineEdit * fCommandArea; … … 149 152 QTreeWidget *fHelpTreeWidget; 150 153 #endif 151 QDialog *fHelpDialog; 154 // QDialog *fHelpDialog; 155 QWidget *fHelpDialog; 152 156 QLineEdit *helpLine; 153 157 -
trunk/source/interfaces/basic/src/G4UIQt.cc
r1134 r1139 112 112 G4UImanager* UI = G4UImanager::GetUIpointer(); 113 113 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 114 117 115 118 // Check if already define in external app QMainWindow … … 156 159 157 160 QWidget *mainWidget = new QWidget(fMainWindow); 158 QSplitter *splitter = new QSplitter(Qt::Vertical,mainWidget); 161 QSplitter *bottomSplitter = new QSplitter(Qt::Vertical,mainWidget); 162 QSplitter *topSplitter = new QSplitter(Qt::Vertical,mainWidget); 163 fViewWidget = new QWidget(); 159 164 160 165 // Set layouts 161 166 162 QWidget* topWidget = new QWidget(splitter); 163 QWidget* bottomWidget = new QWidget(splitter); 167 QWidget* topWidget = new QWidget(bottomSplitter); 168 QWidget* bottomWidget = new QWidget(bottomSplitter); 169 170 171 ...finir de mettre de QGL dans le splitter du haut 172 173 164 174 165 175 QVBoxLayout *layoutTop = new QVBoxLayout(topWidget); … … 220 230 QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget); 221 231 222 splitter->addWidget(topWidget); 223 splitter->addWidget(bottomWidget); 224 225 mainLayout->addWidget(splitter); 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 226 240 227 241 #endif 228 242 229 243 fMainWindow->setCentralWidget(mainWidget); 230 //fMainWindow->setCentralWidget( splitter);244 //fMainWindow->setCentralWidget(bottomSplitter); 231 245 232 246 #if QT_VERSION < 0x040000 … … 254 268 #endif 255 269 270 #ifdef G4DEBUG_INTERFACES_BASIC 271 printf("G4UIQt::G4UIQt end %d \n",fMainWindow); 272 #endif 273 256 274 AddInteractor ("file",(G4Interactor)fileMenu); 257 275 AddInteractor ("help",(G4Interactor)helpMenu); … … 259 277 // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow 260 278 #if QT_VERSION < 0x040000 261 QValueList<int> vals = splitter->sizes();262 #else 263 QList<int> vals = splitter->sizes();279 QValueList<int> vals = bottomSplitter->sizes(); 280 #else 281 QList<int> vals = bottomSplitter->sizes(); 264 282 #endif 265 283 // if(vals.size()==2) { 266 // vals[0] = ( splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;267 // vals[1] = ( splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;268 // splitter->setSizes(vals);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); 269 287 // } 270 288 271 289 if(UI!=NULL) UI->SetCoutDestination(this); // TO KEEP 272 } 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 273 308 274 309 … … 283 318 } 284 319 320 #ifdef G4DEBUG_INTERFACES_BASIC 321 printf("G4UIQt::DELETE ALL\n"); 322 #endif 285 323 if (fMainWindow!=NULL) 286 324 delete fMainWindow; … … 339 377 ) 340 378 { 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 341 383 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; 342 394 } 343 395 … … 547 599 fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax ); 548 600 #else 549 fHelpDialog = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint); 601 // fHelpDialog = new QDialog(fMainWindow,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint); 602 fHelpDialog = new QWidget(0,Qt::Window | Qt::Popup); 550 603 #endif 551 604 QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog); -
trunk/source/interfaces/common/src/G4Qt.cc
r1134 r1139 133 133 if (a_argn != 0) { 134 134 SetMainInteractor (qApp); 135 #ifdef G4DEBUG_INTERFACES_COMMON 136 printf("G4Qt::G4Qt SetMainInteractor %d .....................................\n",qApp); 137 #endif 135 138 } 136 139 SetArguments (a_argn,a_args); -
trunk/source/interfaces/common/src/G4VInteractorManager.cc
r1026 r1139 123 123 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ 124 124 { 125 #ifdef G4DEBUG_INTERFACES_COMMON 126 printf("G4VInteractorManager::SetMainInteractor new ! %d\n",a_main); 127 #endif 125 128 mainInteractor = a_main; 126 129 }
Note: See TracChangeset
for help on using the changeset viewer.