Changeset 578 for trunk/geant4/interfaces

Timestamp:

Sep 18, 2007, 2:16:20 PM (17 years ago)

Author:

garnier

Message:

r597@mac-90108: laurentgarnier | 2007-09-18 14:20:01 +0200
correction du ticket #71 par le codage de la fonction FlushAndWaitExecution

Location:

trunk/geant4/interfaces

Files:

• G4History.macro (modified) (1 diff)
• basic/src/G4UIQt.cc (modified) (7 diffs)
• common/src/G4Qt.cc (modified) (1 diff)
• currentEvent.rndm (modified) (1 diff)
• currentRun.rndm (modified) (1 diff)

trunk/geant4/interfaces/G4History.macro

@@ -59 +59 @@
 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
 /N03/event/printModulo 100
+/gun/energy 10 GeV
+/run/beamOn 1
+/run/beamOn
+/run/beamOn

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

@@ -114 +114 @@
   fCommandArea->activateWindow();
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
-  //  fCommandArea->setFocusPolicy ( Qt::StrongFocus );
-  //  fCommandArea->setFocus(Qt::TabFocusReason);
+  fCommandArea->setFocusPolicy ( Qt::StrongFocus );
+  fCommandArea->setFocus(Qt::TabFocusReason);
   fTextArea->setReadOnly(true);
 
@@ -295 +295 @@
 {
   if (!aString) return 0;
-  //  printf(" **************** G4 Cout : %s \n",(char*)aString.data());
+  G4Qt* interactorManager = G4Qt::getInstance ();
+  if (!interactorManager) return 0;
+  
+  printf(" **************** G4 Cout : %s ---***---%d\n",(char*)aString.data(),fTextArea->isVisible ());
   fTextArea->append(QString((char*)aString.data()).trimmed());
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
+  interactorManager->FlushAndWaitExecution();
   return 0;
 }
@@ -312 +316 @@
 {
   if (!aString) return 0;
+  G4Qt* interactorManager = G4Qt::getInstance ();
+  if (!interactorManager) return 0;
 
   QColor previousColor = fTextArea->textColor();
@@ -318 +324 @@
   fTextArea->setTextColor(previousColor);
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
+  interactorManager->FlushAndWaitExecution();
   return 0;
 }
@@ -383 +390 @@
   // Create the help dialog
   if (!fHelpDialog) {
-    fHelpDialog = new QDialog;
+    fHelpDialog = new QDialog(fMainWindow);
 
     QSplitter *splitter = new QSplitter(Qt::Horizontal);
@@ -753 +760 @@
     fCommandHistoryArea->addItem(fCommandArea->text());
     fCommandHistoryArea->clearSelection();
-    fCommandHistoryArea->item(fCommandHistoryArea->count()-1)->setSelected(true);
-    fCommandHistoryArea->setCurrentItem(fCommandHistoryArea->item(fCommandHistoryArea->count()-1));
-
+    fCommandHistoryArea->setCurrentItem(NULL);
+    fCommandArea->setText("");
+
+    G4Qt* interactorManager = G4Qt::getInstance ();
+    if (interactorManager) { 
+      interactorManager->FlushAndWaitExecution();
+    }
     if (command(0,4) != "help") {
       ApplyShellCommand (command,exitSession,exitPause);
@@ -761 +772 @@
       TerminalHelp(command);
     }
+    printf("after \n");
     if(exitSession==true) 
       SessionTerminate();
   }
-  fCommandArea->setText("");
 }
 

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

@@ -142 +142 @@
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
-//FIXME
-   G4cout        << "G4Qt : Rien compris a cette fonction G4Qt::FlushAndWaitExecution." << G4endl;
-//  if(mainApp==NULL) return;
-//  XSync(QtDisplay(mainApp),False);
+  printf("G4Qt::FlushAndWaitExecution ::  Flush ....\n");
+  if(!qApp) return;
+  qApp->processEvents();
 }
 

trunk/geant4/interfaces/currentEvent.rndm

@@ -2 +2 @@
 1878463799
 0
-9876
-54321
+2080926437
+1745300735

trunk/geant4/interfaces/currentRun.rndm

@@ -2 +2 @@
 1878463799
 0
-1180857998
-122938492
+2080926437
+1745300735