Changeset 1118 for trunk/source/interfaces

Timestamp:

Oct 6, 2009, 5:05:23 PM (15 years ago)

Author:

garnier

Message:

en test

Location:

trunk/source/interfaces

Files:

• History (modified) (3 diffs)
• basic/GNUmakefile (modified) (1 diff)
• basic/src/G4UIQt.cc (modified) (7 diffs)

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.111 2009/05/15 09:34:36 lgarnier Exp $
+$Id: History,v 1.113 2009/05/28 06:13:21 kmura Exp $
 -------------------------------------------------------------------
 
@@ -19 +19 @@
 
 =======
+6 October, 2009 L. Garnier
+ - Change GEANT4_QT_DEBUG flag for G4DEBUG_INTERFACES_BASIC and 
+   G4DEBUG_INTERFACES_COMMON
+
+28 May, 2009 K. Murakami (interfaces-V09-02-03)
+ - G4UIExecutive: add  IsGUI() method / add GetSession() method
+
+18 May, 2009 K. Murakami (interfaces-V09-02-02)
+ - G4UIExecutive : fixed wrong #ifdef condition
+ - include changes by Laurent (7/May)
+
 15 May, 2009 K. Murakami (interfaces-V09-02-01)
  - G4UIExecutive : Remove batch mode handling
@@ -29 +40 @@
  - G4UIQt.cc : Fix Compilation warning 
  - G4VBasicShell.cc : Better command completion in command Line 
-   (need intercoms-V09-02-00)
 
 31, March, 2009 L.Garnier

trunk/source/interfaces/basic/GNUmakefile

@@ -12 +12 @@
 MOC_MACRO = -DG4UI_BUILD_QT_SESSION
 
+# For debug mode
+CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC
+
 include $(G4INSTALL)/config/architecture.gmk
 include $(G4INSTALL)/config/G4UI_BUILD.gmk

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

@@ -142 +142 @@
   fMainWindow = new QMainWindow();
 
-#ifdef G4DEBUG
+#ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::Initialise after main window creation\n");
 #endif
@@ -155 +155 @@
 #endif
 
-  QSplitter *splitter = new QSplitter(Qt::Vertical,fMainWindow);
+  QWidget *mainWidget = new QWidget(fMainWindow);
+  QSplitter *splitter = new QSplitter(mainWidget);
+  splitter->setOrientation(Qt::Vertical);
 
   // Set layouts
@@ -208 +210 @@
 
 #if QT_VERSION >= 0x040000
-  topWidget->setLayout(layoutTop);
+  //  topWidget->setLayout(layoutTop);
 #endif
 
@@ -216 +218 @@
 #if QT_VERSION >= 0x040000
 
-  bottomWidget->setLayout(layoutBottom);
+  //  bottomWidget->setLayout(layoutBottom);
+  QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
+
   splitter->addWidget(topWidget);
   splitter->addWidget(bottomWidget);
-#endif
-
-
-  fMainWindow->setCentralWidget(splitter);
+
+  mainLayout->addWidget(splitter);
+
+#endif
+
+    fMainWindow->setCentralWidget(mainWidget);
+    //fMainWindow->setCentralWidget(splitter);
 
 #if QT_VERSION < 0x040000
@@ -257 +264 @@
   QList<int> vals = splitter->sizes();
 #endif
-  if(vals.size()==2) {
-    vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
-    vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
-    splitter->setSizes(vals);
-  }
+//    if(vals.size()==2) {
+//      vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
+//      vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
+//      splitter->setSizes(vals);
+//    }
 
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
@@ -997 +1004 @@
 )
 {
-#ifdef G4DEBUG
+#ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::GetHelpChoice SHOULD NEVER GO HERE");
 #endif
@@ -1009 +1016 @@
 )
 {
-#ifdef G4DEBUG
+#ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::ExitHelp SHOULD NEVER GO HERE");
 #endif