Changeset 856 for trunk/source/interfaces/common/src/G4Qt.cc

Timestamp:

Sep 24, 2008, 5:31:43 PM (16 years ago)

Author:

garnier

Message:

now we could have a external QApplication

File:

• trunk/source/interfaces/common/src/G4Qt.cc (modified) (2 diffs)

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

@@ -91 +91 @@
   printf("G4Qt::G4Qt try to inited Qt\n");
 #endif
-  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) {
-
-      G4cout        << "G4Qt : Unable to init Qt." << G4endl;
-    } else {
+  // Check if Qt already init in another external app
+  if(qApp) {
       QtInited  = TRUE;
       //#if QT_VERSION < 0x040000
@@ -114 +101 @@
       SetArguments      (a_argn,a_args);
 #ifdef GEANT4_QT_DEBUG
-      printf("G4Qt::G4Qt inited Qt END\n");
+      printf("G4Qt::G4Qt alredy inited in external \n");
 #endif
+  } else {
+
+    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) {
+        
+        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
+        printf("G4Qt::G4Qt inited Qt END\n");
+#endif
+      }
     }
   }