Changeset 624

Timestamp:

Nov 29, 2007, 5:13:27 PM (17 years ago)

Author:

garnier

Message:

corrections de bugs

Location:

trunk/geant4

Files:

• interfaces/basic/src/G4UIQt.cc (modified) (4 diffs)
• interfaces/basic/src/G4UIQt_moc.cc (modified) (3 diffs)
• specific-geant4-dev.sh (modified) (1 diff)
• visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (1 diff)

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

@@ -237 +237 @@
 #endif
   fMainWindow->setCentralWidget(splitter);
+  ((QApplication*)interactorManager->GetMainInteractor())->setMainWidget(fMainWindow);
 
 #if QT_VERSION < 0x040000
@@ -448 +449 @@
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
 #endif
+  // Slow down everything : disababled
   interactorManager->FlushAndWaitExecution();
   return 0;
@@ -543 +545 @@
   QAction *action = new QAction(QString(aLabel),QKeySequence::QKeySequence (),signalMapper, SLOT(map()));
   action->addTo(parent);
- connect(action,SIGNAL(clicked()),signalMapper,SLOT(map()));
+ connect(action,SIGNAL(activated()),signalMapper,SLOT(map()));
 
 #else
@@ -570 +572 @@
   if (!fHelpDialog) {
 #if QT_VERSION < 0x040000
-    fHelpDialog = new QDialog(fMainWindow,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
+    fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
     QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);
     QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);

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

@@ -15 +15 @@
 #include <qapplication.h>
 
-#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 26)
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 26)
 
 #include <private/qucomextra_p.h>
@@ -159 +159 @@
 
 
-#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 58)
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 58)
 
 /****************************************************************************
@@ -262 +262 @@
 #else
 
-#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 59)
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 59)
 
 /****************************************************************************

trunk/geant4/specific-geant4-dev.sh

@@ -28 +28 @@
   export G4LEDATA=$G4DATA/G4EMLOW3.0
 #  export QTHOME=/usr/local/Qt/3.3.8
-  export QTHOME=/usr/local/Qt/4.2.2
+#  export QTHOME=/usr/local/Qt/4.2.2
+  export QTHOME=/sw
+  export QTLIBS="-L/sw/lib -lqt-mt"
+
   #//////////////////////////////////////////////////////////
   # GUI, Visualization :

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -171 +171 @@
     bool found = false;
 #if QT_VERSION < 0x040000
-    QWidgetList  *list = QApplication::allWidgets();
-    QWidgetListIt it( *list );         // iterate over the widgets
-    QWidget * widget;
-    while ( (widget=it.current()) != 0 ) {  // for each widget...
-      ++it;
-      if ((found== false) && (widget->inherits("QMainWindow"))) {
-#ifdef GEANT4_QT_DEBUG
-        printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
-#endif
-        GLWindow = new QDialog(widget,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
-        found = true;
-      }
-    }
-    delete list;                      // delete the list, not the widgets
-#else
-    foreach (QWidget *widget, QApplication::allWidgets()) {
-      if ((found== false) && (widget->inherits("QMainWindow"))) {
-#ifdef GEANT4_QT_DEBUG
-        printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n");
-#endif
-        GLWindow = new QDialog(widget,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
-        found = true;
-      }
-    }
+    //    QWidgetList  *list = QApplication::allWidgets();
+    //    QWidgetListIt it( *list );         // iterate over the widgets
+    //    QWidget * widget;
+    //    while ( (widget=it.current()) != 0 ) {  // for each widget...
+    //      ++it;
+    //      if ((found== false) && (widget->inherits("QMainWindow"))) {
+    GLWindow = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
+    //        found = true;
+    //      }
+    //    }
+    //    delete list;                      // delete the list, not the widgets
+#else
+    //    foreach (QWidget *widget, QApplication::allWidgets()) {
+    //      if ((found== false) && (widget->inherits("QMainWindow"))) {
+    GLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
+    //        found = true;
+    //      }
+    //    }
 #endif