Changeset 1278

Timestamp:

May 28, 2010, 11:36:37 AM (14 years ago)

Author:

garnier

Message:

bug fix on window

Location:

trunk/source/interfaces

Files:

• History (modified) (2 diffs)
• basic/GNUmakefile (modified) (1 diff)
• basic/include/G4UIExecutive.icc (modified) (7 diffs)
• basic/src/G4UIQt.cc (modified) (2 diffs)
• common/GNUmakefile (modified) (1 diff)
• common/src/G4VBasicShell.cc (modified) (1 diff)

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.135 2010/05/26 14:27:14 lgarnier Exp $
+$Id: History,v 1.138 2010/05/28 09:14:41 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      ----------------------------------------------------------
 
-26 May, L. Garnier
+28 May, L. Garnier
+ - G4UIQt : Bug fix when compiling on windows
+
+28 May, K. Murakami (interfaces-V09-03-04)
+ - G4UIExective : session type order is changed.
+                  GUI session is prioritized.
+
+26 May, L. Garnier (interfaces-V09-03-03)
  - G4UIQt: Fix some compil errors with qt3
 

trunk/source/interfaces/basic/GNUmakefile

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

trunk/source/interfaces/basic/include/G4UIExecutive.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIExecutive.icc,v 1.6 2009/11/20 22:10:31 kmura Exp $
+// $Id: G4UIExecutive.icc,v 1.7 2010/05/28 08:12:27 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -35 +35 @@
 #include "G4UImanager.hh"
 
-#if defined(G4UI_USE_TCSH)
-#include "G4UIterminal.hh"
-#include "G4UItcsh.hh"
+#if defined(G4UI_USE_QT)
+#include "G4UIQt.hh"
+#include "G4Qt.hh"
 
 #elif defined(G4UI_USE_XM)
@@ -45 +45 @@
 #include "G4UIWin32.hh"
 
-#elif defined(G4UI_USE_QT)
-#include "G4UIQt.hh"
-#include "G4Qt.hh"
+#elif defined(G4UI_USE_TCSH)
+#include "G4UIterminal.hh"
+#include "G4UItcsh.hh"
 
 #else
@@ -62 +62 @@
 /////////////////////////////////////////////////////
 {
-#if defined(G4UI_USE_TCSH)
-  DISCARD_PARAMETER(argc);
-  DISCARD_PARAMETER(argv);
-
-  shell = new G4UItcsh;
-  session = new G4UIterminal(shell);
+#if defined(G4UI_USE_QT)
+  session = new G4UIQt(argc, argv);
+  isGUI = true;
 
 #elif defined(G4UI_USE_XM)
@@ -79 +76 @@
   session = new G4UIWin32();
 
-#elif defined(G4UI_USE_QT)
-  session = new G4UIQt(argc, argv);
-  isGUI = true;
-    
+#elif defined(G4UI_USE_TCSH)
+  DISCARD_PARAMETER(argc);
+  DISCARD_PARAMETER(argv);
+
+  shell = new G4UItcsh;
+  session = new G4UIterminal(shell);
+
 #else
   DISCARD_PARAMETER(argc);
@@ -121 +121 @@
 
 //////////////////////////////////////////////////////////////
-inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor, 
+inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor,
                                       TermColorIndex cmdColor)
 //////////////////////////////////////////////////////////////
@@ -133 +133 @@
 {
   session-> SessionStart();
-  delete session;  
+  delete session;
 }
 

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

@@ -67 +67 @@
 #include <qlistwidget.h>
 #include <qtreewidget.h>
+#include <QResizeEvent>
 #else
 #include <qaction.h>
@@ -324 +325 @@
   // Connect signal
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
-#if QT_VERSION >= 0x040500
   connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
-#endif
   connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
   connect(fToolBox, SIGNAL(currentChanged(int)), SLOT(ToolBoxActivated(int)));

trunk/source/interfaces/common/GNUmakefile

@@ -10 +10 @@
 
 # For debug mode
-CPPFLAGS += -DG4DEBUG_INTERFACES_COMMON
+# CPPFLAGS += -DG4DEBUG_INTERFACES_COMMON
 
 include $(G4INSTALL)/config/architecture.gmk

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VBasicShell.cc,v 1.13 2009/05/15 09:34:36 lgarnier Exp $
+// $Id: G4VBasicShell.cc,v 1.15 2010/01/06 14:04:13 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //