lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 9.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 15:58:43 +02:00
parent 96c8bcd0af
commit b79225fb37
7544 changed files with 245407 additions and 91099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/interfaces/common/include/G4Qt.hh
+4 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Qt.hh,v 1.2 2007/11/08 17:00:09 lgarnier Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4Qt.hh,v 1.4 2008/11/06 10:06:33 lgarnier Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// To unify Qt event treatment between
// G4/interfaces Qt sessions and G4/visualizations Qt drivers.
@@ -58,6 +58,8 @@ public:
private:
G4Qt (int,char**,char*);
static G4Qt* instance; // Pointer to single instance.
int argn;
char** args;
};
#endif //HAS_QT
source/interfaces/common/include/G4VBasicShell.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VBasicShell.hh,v 1.7 2006/06/29 19:10:03 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
#ifndef G4VBasicShell_H
source/interfaces/common/include/G4VInteractorManager.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VInteractorManager.hh,v 1.9 2006/06/29 19:10:08 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// G.Barrand
source/interfaces/common/include/G4Win32.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Win32.hh,v 1.8 2006/06/29 19:10:11 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4Win32.hh,v 1.9 2008/11/14 16:21:42 lgarnier Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// To unify Windows message treatment between
// G4/interfaces Windows sessions and G4/visualizations Windows drivers.
@@ -56,7 +56,7 @@ public:
G4bool Inited ();
void* GetEvent ();
void FlushAndWaitExecution ();
static G4bool dispatchWin32Event (void*);
static G4bool DispatchWin32Event (void*);
virtual ~G4Win32 ();
private:
G4Win32();
source/interfaces/common/include/G4Xt.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Xt.hh,v 1.6 2006/06/29 19:10:14 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// To unify X11 event treatment between
// G4/interfaces Xt sessions and G4/visualizations Xt drivers.
source/interfaces/common/src/G4Qt.cc
+60 -37
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Qt.cc,v 1.7 2007/11/15 18:24:28 lgarnier Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4Qt.cc,v 1.12 2008/11/19 16:11:52 lgarnier Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// L. Garnier
@@ -41,20 +41,9 @@
#include <qapplication.h>
#define NewString(str) \
((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : NULL)
//static void XWidgetIconify (Widget);
//static void XWidgetUniconify (Widget);
//static void XDisplaySetWindowToNormalState (Display*,Window);
G4Qt* G4Qt::instance = NULL;
static G4bool QtInited = FALSE;
//static int argn = 0;
//static char** args = NULL;
// static QtAppContext appContext = NULL;
//static QApplication app = NULL;
/***************************************************************************/
G4Qt* G4Qt::getInstance (
@@ -87,37 +76,71 @@ G4Qt::G4Qt (
/***************************************************************************/
/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
{
#ifdef GEANT4_QT_DEBUG
argn = 0;
args = NULL;
#ifdef G4DEBUG
printf("G4Qt::G4Qt try to inited Qt\n");
#endif
if(QtInited==FALSE) { //Qt should be Inited once !
#ifdef GEANT4_QT_DEBUG
printf("G4Qt::G4Qt inited Qt\n");
// Check if Qt already init in another external app
if(qApp) {
QtInited = TRUE;
//#if QT_VERSION < 0x040000
// SetMainInteractor (&qApp);
//#else
SetMainInteractor (qApp);
//#endif
SetArguments (a_argn,a_args);
#ifdef G4DEBUG
printf("G4Qt::G4Qt alredy inited in external \n");
#endif
#if QT_VERSION < 0x040000
qApp = new QApplication (a_argn, a_args);
// QApplication qApp(a_argn, a_args);
// if(&qApp == NULL) {
#else
new QApplication (a_argn, a_args);
#endif
if(!qApp) {
} else {
if(QtInited==FALSE) { //Qt should be Inited once !
// Then two cases :
// - It is the first time we create G4UI (argc!=0)
// -> Inited and register
// - It is the first time we create G4VIS (argc == 0)
// -> Inited and NOT register
if (a_argn != 0) {
argn = a_argn;
args = a_args;
G4cout << "G4Qt : Unable to init Qt." << G4endl;
} else {
QtInited = TRUE;
//#if QT_VERSION < 0x040000
// SetMainInteractor (&qApp);
//#else
SetMainInteractor (qApp);
//#endif
SetArguments (a_argn,a_args);
#ifdef GEANT4_QT_DEBUG
printf("G4Qt::G4Qt inited Qt END\n");
} else { //argc = 0
// FIXME : That's not the good arguments, but I don't know how to get args from other Interactor.
// Ex: How to get them from G4Xt ?
argn = 1;
args = (char **)malloc( 1 * sizeof(char *) );
args[0] = (char *)malloc(10 * sizeof(char));
strncpy(args[0], "my_app \0", 9);
}
int *p_argn = (int*)malloc(sizeof(int));
*p_argn = argn;
#if QT_VERSION < 0x040000
qApp = new QApplication (*p_argn, args);
#else
new QApplication (*p_argn, args);
#endif
if(!qApp) {
G4cout << "G4Qt : Unable to init Qt." << G4endl;
} else {
QtInited = TRUE;
if (a_argn != 0) {
SetMainInteractor (qApp);
}
SetArguments (a_argn,a_args);
#ifdef G4DEBUG
printf("G4Qt::G4Qt inited Qt END\n");
#endif
}
}
}
#ifdef GEANT4_QT_DEBUG
#ifdef G4DEBUG
if (qApp) {
printf("G4Qt::qApp exist\n");
} else {
source/interfaces/common/src/G4VBasicShell.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VBasicShell.cc,v 1.12 2006/06/29 19:10:20 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
#include "G4VBasicShell.hh"
source/interfaces/common/src/G4VInteractorManager.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VInteractorManager.cc,v 1.13 2006/06/29 19:10:24 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// G.Barrand
source/interfaces/common/src/G4Win32.cc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Win32.cc,v 1.9 2006/06/29 19:10:26 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// $Id: G4Win32.cc,v 1.10 2008/11/14 16:21:42 lgarnier Exp $
// GEANT4 tag $Name: geant4-09-02 $
//
// G.Barrand
@@ -88,7 +88,7 @@ G4Win32::G4Win32 (
Win32Inited = TRUE;
}
AddDispatcher((G4DispatchFunction)G4Win32::dispatchWin32Event);
AddDispatcher((G4DispatchFunction)G4Win32::DispatchWin32Event);
SetMainInteractor(topWindow);
}
/***************************************************************************/
@@ -133,7 +133,7 @@ void G4Win32::FlushAndWaitExecution (
}
}
/***************************************************************************/
G4bool G4Win32::dispatchWin32Event (
G4bool G4Win32::DispatchWin32Event (
void* a_event
)
/***************************************************************************/
source/interfaces/common/src/G4Xt.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Xt.cc,v 1.11 2006/06/29 19:10:28 gunter Exp $
// GEANT4 tag $Name: geant4-09-01 $
// GEANT4 tag $Name: geant4-09-02 $
//
// G.Barrand