Ignore:
Timestamp:
Sep 10, 2008, 5:40:37 PM (17 years ago)
Author:
garnier
Message:

geant4.8.2 beta

Location:
trunk/source/interfaces
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/interfaces/GAG/include/G4UIGAG.hh

    r688 r850  
    2626//
    2727// $Id: G4UIGAG.hh,v 1.7 2006/06/29 19:09:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G4UIGAG.hh

  • trunk/source/interfaces/GAG/include/G4UIGainServer.hh

    r688 r850  
    2626//
    2727// $Id: G4UIGainServer.hh,v 1.5 2006/06/29 19:09:21 gunter Exp $
    28 // $Name: $
     28// $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/GAG/src/G4UIGAG.cc

    r609 r850  
    2626//
    2727// $Id: G4UIGAG.cc,v 1.19 2007/10/30 10:14:34 kmura Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G4UIGAG.cc

  • trunk/source/interfaces/GAG/src/G4UIGainServer.cc

    r631 r850  
    2626//
    2727// 12/06/2002 G4UIGainServer H. MInamimoto and H. Yoshida created
    28 // $Id: G4UIGainServer.cc,v 1.11 2007/11/16 14:59:35 kmura Exp $
    29 // $Name: $
     28// $Id: G4UIGainServer.cc,v 1.12 2008/07/18 06:39:43 kmura Exp $
     29// $Name: HEAD $
    3030//
    3131#ifndef WIN32
    … …  
    414414#endif
    415415            G4cerr<<"accept:"<<i<<G4endl;
    416             exit(1);
     416            //exit(1);
     417            G4Exception("G4UIGainServer::WaitingConnection", "Invalid Socket",
     418                        FatalException, "Cannot establish connection");
     419
     420
    417421        }
    418422    }

  • trunk/source/interfaces/History

    r835 r850  
    1 $Id: History,v 1.96 2008/04/30 10:01:41 lgarnier Exp $
     1$Id: History,v 1.98 2008/07/22 04:14:31 kmura Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
    20 30th May, Laurent Garnier
    21  - Possiblibilty to have another Qapp launch outside G4Qt.
     2022 July, 2008 K.Murakami (interfaces-V09-01-02)
     21 - tagged
     22 - direct exit calls are replaced with G4Exception/another way of exit
     23   G4UIGainServer.cc, G4UIterminal.cc : call G4Exception
     24   G4UItcsh.cc : nomal exit instead of direct calling exit()
     25
     2614 June, 2008 K.Murakami (interfaces-V09-01-01)
     27 - tagged
    2228
    232930th April, Laurent Garnier

  • trunk/source/interfaces/basic/include/G4UIArrayString.hh

    r688 r850  
    2626//
    2727// $Id: G4UIArrayString.hh,v 1.3 2006/06/29 19:09:27 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/basic/include/G4UIQt.hh

    r785 r850  
    2626//
    2727// $Id: G4UIQt.hh,v 1.12 2008/03/10 17:03:16 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030#ifndef G4UIQt_h

  • trunk/source/interfaces/basic/include/G4UIWin32.hh

    r688 r850  
    2626//
    2727// $Id: G4UIWin32.hh,v 1.14 2006/06/29 19:09:29 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030#ifndef G4UIWin32_h

  • trunk/source/interfaces/basic/include/G4UIXaw.hh

    r688 r850  
    2626//
    2727// $Id: G4UIXaw.hh,v 1.6 2006/06/29 19:09:31 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030#ifndef G4UIXaw_h

  • trunk/source/interfaces/basic/include/G4UIXm.hh

    r688 r850  
    2626//
    2727// $Id: G4UIXm.hh,v 1.13 2006/06/29 19:09:33 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030#ifndef G4UIXm_h

  • trunk/source/interfaces/basic/include/G4UIcsh.hh

    r688 r850  
    2626//
    2727// $Id: G4UIcsh.hh,v 1.4 2006/06/29 19:09:35 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/basic/include/G4UItcsh.hh

    r688 r850  
    2626//
    2727// $Id: G4UItcsh.hh,v 1.8 2007/06/14 05:44:58 kmura Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/basic/include/G4UIterminal.hh

    r688 r850  
    2525//
    2626// $Id: G4UIterminal.hh,v 1.10 2007/05/22 01:51:05 kmura Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: HEAD $
    2828//
    2929// ====================================================================

  • trunk/source/interfaces/basic/include/G4VUIshell.hh

    r688 r850  
    2626//
    2727// $Id: G4VUIshell.hh,v 1.7 2007/06/14 05:44:58 kmura Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/basic/src/G4UIArrayString.cc

    r688 r850  
    2626//
    2727// $Id: G4UIArrayString.cc,v 1.8 2006/06/29 19:09:43 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

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

    r836 r850  
    2626//
    2727// $Id: G4UIQt.cc,v 1.17 2008/05/05 13:24:00 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// L. Garnier
    3131
    32 #define GEANT4_QT_DEBUG
     32//define GEANT4_QT_DEBUG
    3333
    3434#ifdef G4UI_BUILD_QT_SESSION
    … …  
    285285#endif
    286286  interactorManager->DisableSecondaryLoop (); // TO KEEP
    287 
    288   // launch app
    289287  if ((QApplication*)interactorManager->GetMainInteractor())
    290288    ((QApplication*)interactorManager->GetMainInteractor())->exec();
    291  
    292  
    293   void* event;
    294   while((event = interactorManager->GetEvent())!=NULL) {
    295     interactorManager->DispatchEvent(event);
    296     if(exitSession==true) break;
    297   }
    298  
     289
     290  // on ne passe pas le dessous ? FIXME ????
     291  // je ne pense pas 13/06
     292
     293  //   void* event; // TO KEEP
     294  //   while((event = interactorManager->GetEvent())!=NULL) {  // TO KEEP
     295  //     interactorManager->DispatchEvent(event); // TO KEEP
     296  //     if(exitSession==true) break; // TO KEEP
     297  //   } // TO KEEP
     298
    299299  interactorManager->EnableSecondaryLoop ();
    300300#ifdef GEANT4_QT_DEBUG
    … …  
    307307/**   Display the prompt in the prompt area
    308308   @param aPrompt : string to display as the promt label
     309   //FIXME : probablement inutile puisque le seul a afficher qq chose d'autre
     310   que "session" est SecondaryLoop()
    309311*/
    310312void G4UIQt::Prompt (

  • trunk/source/interfaces/basic/src/G4UIWin32.cc

    r688 r850  
    2626//
    2727// $Id: G4UIWin32.cc,v 1.13 2006/06/29 19:09:45 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/basic/src/G4UIXaw.cc

    r688 r850  
    2626//
    2727// $Id: G4UIXaw.cc,v 1.6 2006/06/29 19:09:47 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/basic/src/G4UIXm.cc

    r688 r850  
    2626//
    2727// $Id: G4UIXm.cc,v 1.14 2006/06/29 19:09:49 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/basic/src/G4UIcsh.cc

    r688 r850  
    2626//
    2727// $Id: G4UIcsh.cc,v 1.8 2006/06/29 19:09:51 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/basic/src/G4UItcsh.cc

    r688 r850  
    2525//
    2626//
    27 // $Id: G4UItcsh.cc,v 1.16 2008/01/15 08:13:34 kmura Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4UItcsh.cc,v 1.17 2008/07/18 06:37:06 kmura Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030
    … …  
    559559      if(commandLine.length()!=0 && IsCursorLast()) ListMatchedCommand();
    560560      else if (commandLine.empty()) {
    561         G4cout << G4endl;
    562         RestoreTerm();
    563         exit(0);
     561        return G4String("exit");       
    564562      } else DeleteCharacter();
    565563      break;

  • trunk/source/interfaces/basic/src/G4UIterminal.cc

    r593 r850  
    2525//
    2626//
    27 // $Id: G4UIterminal.cc,v 1.27 2007/10/29 18:49:45 asaim Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4UIterminal.cc,v 1.28 2008/07/18 06:38:59 kmura Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ====================================================================
    … …  
    7070           << "Session terminated." << G4endl;
    7171    theshell-> ResetTerminal();
    72     exit(0);
     72    G4Exception("G4UIterminal/SignalHandler", "KeyboardInterrupt",
     73                FatalException, "Interrupt with Ctrl-C");
    7374  }
    7475

  • trunk/source/interfaces/basic/src/G4VUIshell.cc

    r688 r850  
    2626//
    2727// $Id: G4VUIshell.cc,v 1.10 2007/06/14 05:44:58 kmura Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/common/include/G4Qt.hh

    r593 r850  
    2626//
    2727// $Id: G4Qt.hh,v 1.2 2007/11/08 17:00:09 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//  To unify Qt event treatment between

  • trunk/source/interfaces/common/include/G4VBasicShell.hh

    r631 r850  
    2626//
    2727// $Id: G4VBasicShell.hh,v 1.7 2006/06/29 19:10:03 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/common/include/G4VInteractorManager.hh

    r631 r850  
    2626//
    2727// $Id: G4VInteractorManager.hh,v 1.9 2006/06/29 19:10:08 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/common/include/G4Win32.hh

    r631 r850  
    2626//
    2727// $Id: G4Win32.hh,v 1.8 2006/06/29 19:10:11 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//  To unify Windows message treatment between

  • trunk/source/interfaces/common/include/G4Xt.hh

    r631 r850  
    2626//
    2727// $Id: G4Xt.hh,v 1.6 2006/06/29 19:10:14 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//  To unify X11 event treatment between

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

    r836 r850  
    2626//
    2727// $Id: G4Qt.cc,v 1.7 2007/11/15 18:24:28 lgarnier Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// L. Garnier
    31 
    32 #define GEANT4_QT_DEBUG
    3331
    3432#if defined(G4INTY_BUILD_QT) || defined(G4INTY_USE_QT)
    … …  
    9593  if(QtInited==FALSE) {  //Qt should be Inited once !
    9694#ifdef GEANT4_QT_DEBUG
     95    printf("G4Qt::G4Qt inited Qt\n");
     96#endif
     97#if QT_VERSION < 0x040000
     98    qApp = new QApplication (a_argn, a_args);
     99    //    QApplication qApp(a_argn, a_args);
     100    //    if(&qApp == NULL) {
     101#else
     102    new QApplication (a_argn, a_args);
    97103#endif
    98104    if(!qApp) {
    99 #if QT_VERSION < 0x040000
    100       qApp = new QApplication (a_argn, a_args);
    101       //    QApplication qApp(a_argn, a_args);
    102       //    if(&qApp == NULL) {
    103 #else
    104       new QApplication (a_argn, a_args);
    105 #endif
    106     }
    107     if(!qApp) {
     105
    108106      G4cout        << "G4Qt : Unable to init Qt." << G4endl;
    109107    } else {
    110108      QtInited  = TRUE;
     109      //#if QT_VERSION < 0x040000
     110      //      SetMainInteractor (&qApp);
     111      //#else
    111112      SetMainInteractor (qApp);
     113      //#endif
    112114      SetArguments      (a_argn,a_args);
    113115#ifdef GEANT4_QT_DEBUG
    … …  
    144146}
    145147/***************************************************************************/
    146 // Should do nothing in Qt
     148/**
     149  Si j'ai bien compris, cette fonction ne sert à rien
     150 */
    147151void* G4Qt::GetEvent (
    148152)
    … …  
    150154/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
    151155{
     156//FIXME
     157//   G4cout        << "G4Qt : Rien compris a cette fonction G4Qt::GetEvent." << G4endl;
     158//  static XEvent  event;
     159//  if(appContext==NULL) return NULL;
     160//  if(mainApp==NULL) return NULL;
     161//  QtAppNextEvent (appContext, &event);
     162//  return         &event;
     163  printf("*");
    152164  return 0;
    153165}
    … …  
    158170/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
    159171{
     172  //  printf("G4Qt::FlushAndWaitExecution ::  Flush ....\n");
    160173  if(!qApp) return;
    161174  qApp->processEvents();

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

    r631 r850  
    2626//
    2727// $Id: G4VBasicShell.cc,v 1.12 2006/06/29 19:10:20 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030

  • trunk/source/interfaces/common/src/G4VInteractorManager.cc

    r631 r850  
    2626//
    2727// $Id: G4VInteractorManager.cc,v 1.13 2006/06/29 19:10:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/common/src/G4Win32.cc

    r631 r850  
    2626//
    2727// $Id: G4Win32.cc,v 1.9 2006/06/29 19:10:26 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G.Barrand

  • trunk/source/interfaces/common/src/G4Xt.cc

    r631 r850  
    2626//
    2727// $Id: G4Xt.cc,v 1.11 2006/06/29 19:10:28 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// G.Barrand
Note: See TracChangeset for help on using the changeset viewer.