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

Timestamp:

Oct 30, 2008, 5:48:40 PM (16 years ago)

Author:

garnier

Message:

update to G4 DEBUG official messages

File:

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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.9 2008/10/15 09:09:47 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.10 2008/10/24 13:23:22 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -56 +56 @@
 /***************************************************************************/
 G4Qt* G4Qt::getInstance (
- int*    a_argn
+ int    a_argn
 ,char** a_args
 ,char*  a_class
@@ -70 +70 @@
 /***************************************************************************/
 G4Qt::G4Qt (
- int*    a_argn
+ int    a_argn
 ,char** a_args
 ,char*  a_class
@@ -77 +77 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
   printf("G4Qt::G4Qt try to inited Qt\n");
 #endif
@@ -88 +88 @@
       SetMainInteractor (qApp);
       //#endif
-      SetArguments      (*a_argn,a_args);
-#ifdef GEANT4_QT_DEBUG
+      SetArguments      (a_argn,a_args);
+
+#ifdef G4DEBUG
       printf("G4Qt::G4Qt alredy inited in external \n");
 #endif
@@ -95 +96 @@
 
     if(QtInited==FALSE) {  //Qt should be Inited once !
-#ifdef GEANT4_QT_DEBUG
-      printf("G4Qt::G4Qt inited Qt\n");
-#endif
+      // Then two cases :
+      // - It is the first time we create G4UI  (argc!=0)
+      //   -> Inited and register
+      // - It is the first time we create G4VIS  (arc == 0)
+      //   -> Inited and NOT register
+
+      int argc;
+      char ** test;
+      if (a_argn != 0) {
+        SetArguments      (a_argn,a_args);
+#ifdef G4DEBUG
+      printf("G4Qt::G4Qt inited, first time creating UI \n");
+#endif
+      } else { //argc = 0
+        test = GetArguments(&argc);
+
+#ifdef G4DEBUG
+
+        printf("G4Qt::G4Qt inited, create new QtVis\n");
+        printf("G4Qt::G4Qt arguments avant %s\n",a_args[0]);
+        printf("G4Qt::G4Qt arguments avant %s\n",a_args[1]);
+        printf("G4Qt::G4Qt arguments avant %s\n",a_args[2]);
+        printf("G4Qt::G4Qt arguments avant %s\n",a_args[3]);
+        printf("G4Qt::G4Qt arguments apres %d\n",argc);
+        printf("G4Qt::G4Qt arguments apres %s \n",test[0]);
+        printf("G4Qt::G4Qt arguments apres %s \n",test[1]);
+        printf("G4Qt::G4Qt arguments apres %s \n",test[2]);
+        printf("G4Qt::G4Qt arguments apres %s \n",test[3]);
+#endif
+        if (argc == 0) {
+          G4cout        << "G4Qt : Unable to init Qt." << G4endl;
+          return;
+        }
+      }
 #if QT_VERSION < 0x040000
-      qApp = new QApplication (*a_argn, a_args);
+      qApp = new QApplication (a_argn, a_args);
       //    QApplication qApp(a_argn, a_args);
       //    if(&qApp == NULL) {
 #else
-      new QApplication (*a_argn, a_args);
-#endif
+      new QApplication (a_argn, a_args);
+#endif
+      
       if(!qApp) {
         
         G4cout        << "G4Qt : Unable to init Qt." << G4endl;
       } else {
+        if (a_argn != 0) {
+          SetMainInteractor (qApp);
+          SetArguments      (a_argn,a_args);
+        }
         QtInited  = TRUE;
-        //#if QT_VERSION < 0x040000
-        //      SetMainInteractor (&qApp);
-        //#else
-        SetMainInteractor (qApp);
-        //#endif
-        SetArguments      (*a_argn,a_args);
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
         printf("G4Qt::G4Qt inited Qt END\n");
 #endif
@@ -122 +153 @@
     }
   }
-#ifdef GEANT4_QT_DEBUG
+#ifdef G4DEBUG
   if (qApp) {
     printf("G4Qt::qApp exist\n");