Changeset 850 for trunk/source/interfaces/common/src

Timestamp:

Sep 10, 2008, 5:40:37 PM (16 years ago)

Author:

garnier

Message:

geant4.8.2 beta

Location:

trunk/source/interfaces/common/src

Files:

• G4Qt.cc (modified) (5 diffs)
• G4VBasicShell.cc (modified) (1 diff)
• G4VInteractorManager.cc (modified) (1 diff)
• G4Win32.cc (modified) (1 diff)
• G4Xt.cc (modified) (1 diff)

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

@@ -26 +26 @@
 //
 // $Id: G4Qt.cc,v 1.7 2007/11/15 18:24:28 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // L. Garnier
-
-#define GEANT4_QT_DEBUG
 
 #if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT)
@@ -95 +93 @@
   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
@@ -144 +146 @@
 }
 /***************************************************************************/
-// Should do nothing in Qt
+/**
+  Si j'ai bien compris, cette fonction ne sert à rien
+ */
 void* G4Qt::GetEvent (
 ) 
@@ -150 +154 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+//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;
 }
@@ -158 +170 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
+  //  printf("G4Qt::FlushAndWaitExecution ::  Flush ....\n");
   if(!qApp) return;
   qApp->processEvents();

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

@@ -26 +26 @@
 //
 // $Id: G4VBasicShell.cc,v 1.12 2006/06/29 19:10:20 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 

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

@@ -26 +26 @@
 //
 // $Id: G4VInteractorManager.cc,v 1.13 2006/06/29 19:10:24 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // G.Barrand

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

@@ -26 +26 @@
 //
 // $Id: G4Win32.cc,v 1.9 2006/06/29 19:10:26 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // G.Barrand

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

@@ -26 +26 @@
 //
 // $Id: G4Xt.cc,v 1.11 2006/06/29 19:10:28 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // G.Barrand