Changeset 1243 for trunk/source

Timestamp:

Apr 21, 2010, 3:51:50 PM (14 years ago)

Author:

garnier

Message:

update

Location:

trunk/source/interfaces

Files:

• basic/include/G4UIExecutive.hh (modified) (2 diffs)
• basic/include/G4UIExecutive.icc (modified) (3 diffs)
• basic/src/G4UIQt.cc (modified) (8 diffs)
• common/src/G4Qt.cc (modified) (2 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4UIExecutive.hh,v 1.3 2009/05/28 06:13:03 kmura Exp $
+// $Id: G4UIExecutive.hh,v 1.4 2009/11/20 22:10:31 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -65 +65 @@
 
 public:
-  G4UIExecutive(G4int argc=1, char** argv=0);
+  G4UIExecutive(G4int argc, char** argv);
   ~G4UIExecutive();
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIExecutive.icc,v 1.4 2009/05/28 06:13:03 kmura Exp $
+// $Id: G4UIExecutive.icc,v 1.6 2009/11/20 22:10:31 kmura Exp $
 // GEANT4 tag $Name:  $
 //
@@ -55 +55 @@
 #endif
 
+#define DISCARD_PARAMETER(p) (void)p
+
 /////////////////////////////////////////////////////
-#if defined(G4UI_USE_XM) || defined(G4UI_USE_QT)
 G4UIExecutive::G4UIExecutive(G4int argc, char** argv)
-#else
-G4UIExecutive::G4UIExecutive(G4int, char**)
-#endif
   : session(0), shell(0),isGUI(false)
 /////////////////////////////////////////////////////
 {
 #if defined(G4UI_USE_TCSH)
+  DISCARD_PARAMETER(argc);
+  DISCARD_PARAMETER(argv);
+
   shell = new G4UItcsh;
   session = new G4UIterminal(shell);
@@ -73 +74 @@
 
 #elif defined(G4UI_USE_WIN32)
+  DISCARD_PARAMETER(argc);
+  DISCARD_PARAMETER(argv);
+
   session = new G4UIWin32();
 
 #elif defined(G4UI_USE_QT)
-//  G4int argc2 = 0;
-//  char** argv2 = 0;
   session = new G4UIQt(argc, argv);
-//  session = new G4UIQt(argc2, argv2);
   isGUI = true;
     
 #else
+  DISCARD_PARAMETER(argc);
+  DISCARD_PARAMETER(argv);
+
   shell = new G4UIcsh;
   session = new G4UIterminal(shell);

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

@@ -116 +116 @@
 ,fTabWidget(NULL)
 ,fCoutText("Output")
-
 {
 
@@ -249 +248 @@
   fEmptyViewerTabLabel = new QLabel("         If you want to have a Viewer, please use /vis/open commands. ");
 
+  // Only at creation. Will be set visible when sessionStart();
+  fTabWidget->setVisible(false);
+  fEmptyViewerTabLabel->setVisible(false);
+
   fMyVSplitter->addWidget(fToolBox);
   fMyVSplitter->addWidget(fEmptyViewerTabLabel);
@@ -300 +303 @@
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
   connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
-  //  connect(fTabWidget,   SIGNAL(currentChanged(int)), this, SLOT(CurrentChangedCallback(int)));
   connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
@@ -517 +519 @@
 )
 {
-
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY);
 #endif
-  if (!aWidget) return false;
-  
+  if (!aWidget) {
+    return false;
+  }
+
   // Remove QLabel 
   if ( fMyVSplitter->indexOf(fEmptyViewerTabLabel) != -1) {
@@ -605 +608 @@
 // // #endif
   
+  fTabWidget->setVisible(true);
+
   return true;
 }
@@ -623 +628 @@
 
   fTabWidget->setCurrentIndex(tabNumber);
+
+  // Send this signal to unblock graphic updates !
+  fTabWidget->setVisible(true);
+
+  // This will send a paintEvent to OGL Viewers
   fTabWidget->setTabSelected();
 
@@ -657 +667 @@
   exitSession = false;
 
+  fTabWidget->setVisible(true);
+  fEmptyViewerTabLabel->setVisible(true);
+
 #if QT_VERSION >= 0x040000
 #if QT_VERSION >= 0x040200
@@ -666 +679 @@
   fMainWindow->show();
 #endif
+
+  QCoreApplication::sendPostedEvents () ;
 
 #ifdef G4DEBUG_INTERFACES_BASIC

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

@@ -131 +131 @@
 #else
 #ifdef G4DEBUG_INTERFACES_COMMON
-      printf("G4Qt::G4Qt QAppl \n");
+    printf("G4Qt::G4Qt QAppl \n");
 #endif
       new QApplication (*p_argn, args);
-#ifdef G4DEBUG_INTERFACES_COMMON
-        printf("G4Qt::G4Qt 0\n");
-#endif
 #endif
       if(!qApp) {
@@ -142 +139 @@
         G4cout        << "G4Qt : Unable to init Qt." << G4endl;
       } else {
-#ifdef G4DEBUG_INTERFACES_COMMON
-        printf("G4Qt::G4Qt 1\n");
-#endif
         QtInited  = TRUE;
         if (a_argn != 0) {