Changeset 836

Timestamp:

Jun 11, 2008, 2:29:46 PM (16 years ago)

Author:

garnier

Message:

import all except CVS

Location:

trunk/source/interfaces

Files:

• basic/src/G4UIQt.cc (modified) (3 diffs)
• common/src/G4Qt.cc (modified) (5 diffs)

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.16 2008/03/10 17:03:16 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.17 2008/05/05 13:24:00 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
 // L. Garnier
 
-//define GEANT4_QT_DEBUG
+#define GEANT4_QT_DEBUG
 
 #ifdef G4UI_BUILD_QT_SESSION
@@ -285 +285 @@
 #endif
   interactorManager->DisableSecondaryLoop (); // TO KEEP
+
+  // launch app
   if ((QApplication*)interactorManager->GetMainInteractor())
     ((QApplication*)interactorManager->GetMainInteractor())->exec();
-
-  // on ne passe pas le dessous ? FIXME ????
-  // je ne pense pas 13/06
-
-  //   void* event; // TO KEEP
-  //   while((event = interactorManager->GetEvent())!=NULL) {  // TO KEEP
-  //     interactorManager->DispatchEvent(event); // TO KEEP
-  //     if(exitSession==true) break; // TO KEEP
-  //   } // TO KEEP
-
+  
+  
+  void* event;
+  while((event = interactorManager->GetEvent())!=NULL) {
+    interactorManager->DispatchEvent(event);
+    if(exitSession==true) break;
+  }
+  
   interactorManager->EnableSecondaryLoop ();
 #ifdef GEANT4_QT_DEBUG
@@ -307 +307 @@
 /**   Display the prompt in the prompt area
    @param aPrompt : string to display as the promt label
-   //FIXME : probablement inutile puisque le seul a afficher qq chose d'autre
-   que "session" est SecondaryLoop()
 */
 void G4UIQt::Prompt (

trunk/source/interfaces/common/src/G4Qt.cc

@@ -29 +29 @@
 //
 // L. Garnier
+
+#define GEANT4_QT_DEBUG
 
 #if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT)
@@ -93 +95 @@
   if(QtInited==FALSE) {  //Qt should be Inited once !
 #ifdef GEANT4_QT_DEBUG
-    printf("G4Qt::G4Qt inited Qt\n");
-#endif
-#if QT_VERSION < 0x040000
-    qApp = new QApplication (a_argn, a_args);
-    //    QApplication qApp(a_argn, a_args);
-    //    if(&qApp == NULL) {
-#else
-    new QApplication (a_argn, a_args);
 #endif
     if(!qApp) {
-
+#if QT_VERSION < 0x040000
+      qApp = new QApplication (a_argn, a_args);
+      //    QApplication qApp(a_argn, a_args);
+      //    if(&qApp == NULL) {
+#else
+      new QApplication (a_argn, a_args);
+#endif
+    }
+    if(!qApp) {
       G4cout        << "G4Qt : Unable to init Qt." << G4endl;
     } else {
       QtInited  = TRUE;
-      //#if QT_VERSION < 0x040000
-      //      SetMainInteractor (&qApp);
-      //#else
       SetMainInteractor (qApp);
-      //#endif
       SetArguments      (a_argn,a_args);
 #ifdef GEANT4_QT_DEBUG
@@ -146 +144 @@
 }
 /***************************************************************************/
-/**
-  Si j'ai bien compris, cette fonction ne sert à rien
- */
+// Should do nothing in Qt
 void* G4Qt::GetEvent (
 ) 
@@ -154 +150 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-//FIXME
-//   G4cout        << "G4Qt : Rien compris a cette fonction G4Qt::GetEvent." << G4endl;
-//  static XEvent  event;
-//  if(appContext==NULL) return NULL;
-//  if(mainApp==NULL) return NULL;
-//  QtAppNextEvent (appContext, &event);
-//  return         &event;
-  printf("*");
   return 0;
 }
@@ -170 +158 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-  //  printf("G4Qt::FlushAndWaitExecution ::  Flush ....\n");
   if(!qApp) return;
   qApp->processEvents();