Changeset 610 for trunk/geant4/interfaces

Timestamp:

Nov 22, 2007, 6:07:00 PM (17 years ago)

Author:

garnier

Message:

r661@mac-90108: laurentgarnier | 2007-11-22 18:10:43 +0100
en debug

Location:

trunk/geant4/interfaces

Files:

• GAG/GNUmakefile (modified) (1 diff)
• basic/src/G4UIQt.cc (modified) (11 diffs)
• common/src/G4Qt.cc (modified) (4 diffs)

trunk/geant4/interfaces/GAG/GNUmakefile

@@ -10 +10 @@
 
 include $(G4INSTALL)/config/architecture.gmk
-include $(G4INSTALL)/config/G4UI_BUILD.gmk
+#include $(G4INSTALL)/config/G4UI_BUILD.gmk
 include $(G4INSTALL)/config/interactivity.gmk
 

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

@@ -30 +30 @@
 // L. Garnier
 
-//#define DEBUG
+#define GEANT4_QT_DEBUG
 
 #ifdef G4UI_BUILD_QT_SESSION
@@ -128 +128 @@
 #endif
 
+  // Set layouts
+
+#if QT_VERSION < 0x040000
   QSplitter *splitter = new QSplitter(Qt::Vertical);
-  fTextArea = new QTextEdit(fMainWindow);
-  QPushButton *clearButton = new QPushButton("clear",fMainWindow);
+
+  QWidget* topWidget = new QWidget(splitter);
+  QWidget* bottomWidget = new QWidget(splitter);
+
+  QVBoxLayout *layoutTop = new QVBoxLayout(topWidget);
+  QVBoxLayout *layoutBottom = new QVBoxLayout(bottomWidget);
+#else
+  QWidget* topWidget = new QWidget();
+  QWidget* bottomWidget = new QWidget();
+
+  QVBoxLayout *layoutTop = new QVBoxLayout;
+  QVBoxLayout *layoutBottom = new QVBoxLayout;
+#endif
+
+  // fill them
+
+  fTextArea = new QTextEdit(topWidget);
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt:: end\n");
+#endif
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::PushButton 1\n");
+#endif
+  QPushButton *clearButton = new QPushButton("clear",topWidget);
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::end1\n");
+#endif
   connect(clearButton, SIGNAL(clicked()), SLOT(ClearButtonCallback()));
 
 #if QT_VERSION < 0x040000
-  fCommandHistoryArea = new QListView();
+  fCommandHistoryArea = new QListView(bottomWidget);
   fCommandHistoryArea->setSelectionMode(QListView::Single);
   connect(fCommandHistoryArea, SIGNAL(selectionChanged()), SLOT(CommandHistoryCallback()));
@@ -143 +171 @@
 #endif
   fCommandHistoryArea->installEventFilter(this);
-  fCommandLabel = new QLabel("",fMainWindow);
-
-  fCommandArea = new QLineEdit(fMainWindow);
+  fCommandLabel = new QLabel("",bottomWidget);
+
+  fCommandArea = new QLineEdit(bottomWidget);
   fCommandArea->installEventFilter(this);
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   1\n");
+#endif
 #if QT_VERSION < 0x040000
   fCommandArea->setActiveWindow();
@@ -163 +194 @@
 
 
-  // Set layouts
-
-#if QT_VERSION < 0x040000
-  QWidget* topWidget = new QWidget(splitter);
-  QWidget* bottomWidget = new QWidget(splitter);
-
-  QVBoxLayout *layoutTop = new QVBoxLayout(topWidget);
-  QVBoxLayout *layoutBottom = new QVBoxLayout(bottomWidget);
-#else
-  QWidget* topWidget = new QWidget();
-  QWidget* bottomWidget = new QWidget();
-
-  QVBoxLayout *layoutTop = new QVBoxLayout;
-  QVBoxLayout *layoutBottom = new QVBoxLayout;
-#endif
-
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   2\n");
+#endif
+
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   3\n");
+#endif
 
 
@@ -188 +210 @@
 #endif
 
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   4\n");
+#endif
   layoutBottom->addWidget(fCommandHistoryArea);
   layoutBottom->addWidget(fCommandLabel);
@@ -199 +224 @@
 
 
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   5\n");
+#endif
   fMainWindow->setCentralWidget(splitter);
 
@@ -213 +241 @@
   fMainWindow->menuBar()->insertItem( QString("&Help"), helpMenu );
 
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   6\n");
+#endif
 
 #else
@@ -223 +254 @@
   QMenu *helpMenu = fMainWindow->menuBar()->addMenu("Help");
   helpMenu->addAction("Show Help", this, SLOT(ShowHelpCallback()));
+#endif
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   7\n");
 #endif
 
@@ -236 +270 @@
     splitter->setSizes(vals);
   }
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   8\n");
+#endif
 
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
@@ -282 +319 @@
 #endif
   interactorManager->DisableSecondaryLoop (); // TO KEEP
-  ((QApplication*)interactorManager->GetMainInteractor())->exec(); 
+  if ((QApplication*)interactorManager->GetMainInteractor())
+    ((QApplication*)interactorManager->GetMainInteractor())->exec();
+
   // on ne passe pas le dessous ? FIXME ????
   // je ne pense pas 13/06
@@ -548 +587 @@
 
 #if QT_VERSION < 0x040000
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::QTextEdit 1\n");
+#endif
     fHelpArea = new QTextEdit(splitter);
-#else
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::end 1\n");
+#endif
+#else
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::QTextEdit 2\n");
+#endif
     fHelpArea = new QTextEdit();
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::end 2\n");
+#endif
 #endif
     fHelpArea->setReadOnly(true);

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

@@ -32 +32 @@
 #if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT)
 
+#define GEANT4_QT_DEBUG
+
 #include <stdlib.h>
 #include <string.h>
@@ -40 +42 @@
 
 #include <qapplication.h>
+#include <qpushbutton.h> // EN TEST
 
 
@@ -96 +99 @@
 #endif
 #if QT_VERSION < 0x040000
-    qApp = new QApplication (a_argn, a_args);
+    // EN TEST    qApp = new QApplication (a_argn, a_args);
     //    QApplication qApp(a_argn, a_args);
     //    if(&qApp == NULL) {
@@ -119 +122 @@
   }
 #ifdef GEANT4_QT_DEBUG
-  if (qApp) {
+  //  if (qApp) {
     printf("G4Qt::qApp exist\n");
-  }  else {
-    printf("G4Qt::qApp not exist\n");
-  }
+    //  =================== EN TEST ==============
+    new QApplication ( a_argn, a_args );
+
+    QPushButton hello( "Hello world!", 0 );
+    hello.resize( 100, 30 );
+
+    qApp->setMainWidget( &hello );
+    hello.show();
+    qApp->exec();
+    printf("G4Qt::qApp exist END\n");
+    //  =================== EN TEST ==============
+    //  }  else {
+    //    printf("G4Qt::qApp not exist\n");
+    //  }
 #endif
   //  AddDispatcher     ((G4DispatchFunction)XtDispatchEvent);