Changeset 578
- Timestamp:
- Sep 18, 2007, 2:16:20 PM (17 years ago)
- Location:
- trunk/geant4
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/interfaces/G4History.macro
r571 r578 59 59 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers" 60 60 /N03/event/printModulo 100 61 /gun/energy 10 GeV 62 /run/beamOn 1 63 /run/beamOn 64 /run/beamOn -
trunk/geant4/interfaces/basic/src/G4UIQt.cc
r577 r578 114 114 fCommandArea->activateWindow(); 115 115 connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback())); 116 //fCommandArea->setFocusPolicy ( Qt::StrongFocus );117 //fCommandArea->setFocus(Qt::TabFocusReason);116 fCommandArea->setFocusPolicy ( Qt::StrongFocus ); 117 fCommandArea->setFocus(Qt::TabFocusReason); 118 118 fTextArea->setReadOnly(true); 119 119 … … 295 295 { 296 296 if (!aString) return 0; 297 // printf(" **************** G4 Cout : %s \n",(char*)aString.data()); 297 G4Qt* interactorManager = G4Qt::getInstance (); 298 if (!interactorManager) return 0; 299 300 printf(" **************** G4 Cout : %s ---***---%d\n",(char*)aString.data(),fTextArea->isVisible ()); 298 301 fTextArea->append(QString((char*)aString.data()).trimmed()); 299 302 fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum()); 303 interactorManager->FlushAndWaitExecution(); 300 304 return 0; 301 305 } … … 312 316 { 313 317 if (!aString) return 0; 318 G4Qt* interactorManager = G4Qt::getInstance (); 319 if (!interactorManager) return 0; 314 320 315 321 QColor previousColor = fTextArea->textColor(); … … 318 324 fTextArea->setTextColor(previousColor); 319 325 fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum()); 326 interactorManager->FlushAndWaitExecution(); 320 327 return 0; 321 328 } … … 383 390 // Create the help dialog 384 391 if (!fHelpDialog) { 385 fHelpDialog = new QDialog ;392 fHelpDialog = new QDialog(fMainWindow); 386 393 387 394 QSplitter *splitter = new QSplitter(Qt::Horizontal); … … 753 760 fCommandHistoryArea->addItem(fCommandArea->text()); 754 761 fCommandHistoryArea->clearSelection(); 755 fCommandHistoryArea->item(fCommandHistoryArea->count()-1)->setSelected(true); 756 fCommandHistoryArea->setCurrentItem(fCommandHistoryArea->item(fCommandHistoryArea->count()-1)); 757 762 fCommandHistoryArea->setCurrentItem(NULL); 763 fCommandArea->setText(""); 764 765 G4Qt* interactorManager = G4Qt::getInstance (); 766 if (interactorManager) { 767 interactorManager->FlushAndWaitExecution(); 768 } 758 769 if (command(0,4) != "help") { 759 770 ApplyShellCommand (command,exitSession,exitPause); … … 761 772 TerminalHelp(command); 762 773 } 774 printf("after \n"); 763 775 if(exitSession==true) 764 776 SessionTerminate(); 765 777 } 766 fCommandArea->setText("");767 778 } 768 779 -
trunk/geant4/interfaces/common/src/G4Qt.cc
r571 r578 142 142 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/ 143 143 { 144 //FIXME 145 G4cout << "G4Qt : Rien compris a cette fonction G4Qt::FlushAndWaitExecution." << G4endl; 146 // if(mainApp==NULL) return; 147 // XSync(QtDisplay(mainApp),False); 144 printf("G4Qt::FlushAndWaitExecution :: Flush ....\n"); 145 if(!qApp) return; 146 qApp->processEvents(); 148 147 } 149 148 -
trunk/geant4/interfaces/currentEvent.rndm
r562 r578 2 2 1878463799 3 3 0 4 9876 5 54321 4 2080926437 5 1745300735 -
trunk/geant4/interfaces/currentRun.rndm
r562 r578 2 2 1878463799 3 3 0 4 1180857998 5 1 229384924 2080926437 5 1745300735 -
trunk/geant4/visualization/G4History.macro
r571 r578 59 59 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers" 60 60 /N03/event/printModulo 100 61 /gun/energy 10 GeV 62 /run/beamOn -
trunk/geant4/visualization/currentEvent.rndm
r573 r578 2 2 1878463799 3 3 0 4 414412625 5 12485226514 9876 5 54321
Note: See TracChangeset
for help on using the changeset viewer.