Changeset 836 for trunk/source/interfaces
- Timestamp:
- Jun 11, 2008, 2:29:46 PM (16 years ago)
- Location:
- trunk/source/interfaces
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/basic/src/G4UIQt.cc
r793 r836 25 25 // 26 26 // 27 // $Id: G4UIQt.cc,v 1.1 6 2008/03/10 17:03:16lgarnier Exp $27 // $Id: G4UIQt.cc,v 1.17 2008/05/05 13:24:00 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // 30 30 // L. Garnier 31 31 32 //define GEANT4_QT_DEBUG32 #define GEANT4_QT_DEBUG 33 33 34 34 #ifdef G4UI_BUILD_QT_SESSION … … 285 285 #endif 286 286 interactorManager->DisableSecondaryLoop (); // TO KEEP 287 288 // launch app 287 289 if ((QApplication*)interactorManager->GetMainInteractor()) 288 290 ((QApplication*)interactorManager->GetMainInteractor())->exec(); 289 290 // on ne passe pas le dessous ? FIXME ???? 291 // je ne pense pas 13/06 292 293 // void* event; // TO KEEP 294 // while((event = interactorManager->GetEvent())!=NULL) { // TO KEEP 295 // interactorManager->DispatchEvent(event); // TO KEEP 296 // if(exitSession==true) break; // TO KEEP 297 // } // TO KEEP 298 291 292 293 void* event; 294 while((event = interactorManager->GetEvent())!=NULL) { 295 interactorManager->DispatchEvent(event); 296 if(exitSession==true) break; 297 } 298 299 299 interactorManager->EnableSecondaryLoop (); 300 300 #ifdef GEANT4_QT_DEBUG … … 307 307 /** Display the prompt in the prompt area 308 308 @param aPrompt : string to display as the promt label 309 //FIXME : probablement inutile puisque le seul a afficher qq chose d'autre310 que "session" est SecondaryLoop()311 309 */ 312 310 void G4UIQt::Prompt ( -
trunk/source/interfaces/common/src/G4Qt.cc
r632 r836 29 29 // 30 30 // L. Garnier 31 32 #define GEANT4_QT_DEBUG 31 33 32 34 #if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT) … … 93 95 if(QtInited==FALSE) { //Qt should be Inited once ! 94 96 #ifdef GEANT4_QT_DEBUG 95 printf("G4Qt::G4Qt inited Qt\n");96 #endif97 #if QT_VERSION < 0x04000098 qApp = new QApplication (a_argn, a_args);99 // QApplication qApp(a_argn, a_args);100 // if(&qApp == NULL) {101 #else102 new QApplication (a_argn, a_args);103 97 #endif 104 98 if(!qApp) { 105 99 #if QT_VERSION < 0x040000 100 qApp = new QApplication (a_argn, a_args); 101 // QApplication qApp(a_argn, a_args); 102 // if(&qApp == NULL) { 103 #else 104 new QApplication (a_argn, a_args); 105 #endif 106 } 107 if(!qApp) { 106 108 G4cout << "G4Qt : Unable to init Qt." << G4endl; 107 109 } else { 108 110 QtInited = TRUE; 109 //#if QT_VERSION < 0x040000110 // SetMainInteractor (&qApp);111 //#else112 111 SetMainInteractor (qApp); 113 //#endif114 112 SetArguments (a_argn,a_args); 115 113 #ifdef GEANT4_QT_DEBUG … … 146 144 } 147 145 /***************************************************************************/ 148 /** 149 Si j'ai bien compris, cette fonction ne sert à rien 150 */ 146 // Should do nothing in Qt 151 147 void* G4Qt::GetEvent ( 152 148 ) … … 154 150 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ 155 151 { 156 //FIXME157 // G4cout << "G4Qt : Rien compris a cette fonction G4Qt::GetEvent." << G4endl;158 // static XEvent event;159 // if(appContext==NULL) return NULL;160 // if(mainApp==NULL) return NULL;161 // QtAppNextEvent (appContext, &event);162 // return &event;163 printf("*");164 152 return 0; 165 153 } … … 170 158 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ 171 159 { 172 // printf("G4Qt::FlushAndWaitExecution :: Flush ....\n");173 160 if(!qApp) return; 174 161 qApp->processEvents();
Note: See TracChangeset
for help on using the changeset viewer.