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

Import Geant4 10.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/interfaces/History
+17 -1
View File
@@ -1,4 +1,4 @@
$Id: History 90762 2015-06-09 07:52:57Z gcosmo $
$Id: History 97524 2016-06-03 14:26:34Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,22 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
3rd June 2016 Laurent Garnier (interfaces-V10-02-02)
- G4UIWin32: Re-Fixed compilation warnings on Win32 about HMENU.
1st June 2016 Laurent Garnier (interfaces-V10-02-01)
- G4UIWin32 :Fixed compilation warnings on Win32 about LONG_PTR and HMENU.
27th May 2016 Gabriele Cosmo (interfaces-V10-02-00)
- Fixed compilation warnings on MacOS for conversion to char* in G4UIXm.cc.
3rd November 2015 Laurent Garnier
- G4UIQt : Minor change in CreateViewerWidget method
24th July 2015 Laurent Garnier
- Clean debug statements
- Fix DEV-8: Qt driver : in parameter box, Ok button is on the left, it should be on the right.
8nd June 2015 Laurent Garnier (interfaces-V10-01-01)
- Tagged
source/interfaces/basic/include/G4UIQt.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIQt.hh 90762 2015-06-09 07:52:57Z gcosmo $
// $Id: G4UIQt.hh 97174 2016-05-27 12:41:02Z gcosmo $
//
#ifndef G4UIQt_h
#define G4UIQt_h
@@ -263,7 +263,7 @@ private:
QWidget* CreateHistoryTBWidget();
G4UIDockWidget* CreateUITabWidget();
QWidget* CreateSceneTreeComponentsTBWidget();
QWidget* CreateViewerWidget();
void CreateViewerWidget();
void OpenHelpTreeOnCommand(const QString &);
QString GetShortCommandPath(QString);
QString GetLongCommandPath(QTreeWidgetItem*);
source/interfaces/basic/moc/G4UIQt_moc.cc
+159
View File
@@ -0,0 +1,159 @@
/****************************************************************************
** Meta object code from reading C++ file 'G4UIQt.hh'
**
** Created: Fri Jun 3 16:33:38 2016
** by: The Qt Meta Object Compiler version 63 (Qt 4.8.4)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include "../include/G4UIQt.hh"
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'G4UIQt.hh' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 63
#error "This file was generated using the moc from 4.8.4. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
QT_BEGIN_MOC_NAMESPACE
static const uint qt_meta_data_G4UIQt[] = {
// content:
6, // revision
0, // classname
0, 0, // classinfo
23, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
// slots: signature, parameters, type, tag, flags
8, 7, 7, 7, 0x08,
22, 7, 7, 7, 0x08,
44, 7, 7, 7, 0x08,
74, 69, 7, 7, 0x08,
105, 7, 7, 7, 0x08,
129, 7, 7, 7, 0x08,
152, 7, 7, 7, 0x08,
181, 7, 7, 7, 0x08,
200, 7, 7, 7, 0x08,
225, 7, 7, 7, 0x08,
253, 7, 7, 7, 0x08,
274, 7, 7, 7, 0x08,
305, 7, 7, 7, 0x08,
333, 7, 7, 7, 0x08,
361, 7, 7, 7, 0x08,
383, 7, 7, 7, 0x08,
405, 7, 7, 7, 0x08,
436, 7, 7, 7, 0x08,
466, 7, 7, 7, 0x08,
493, 7, 7, 7, 0x08,
521, 7, 7, 7, 0x08,
547, 7, 7, 7, 0x08,
573, 7, 7, 7, 0x08,
0 // eod
};
static const char qt_meta_stringdata_G4UIQt[] = {
"G4UIQt\0\0ExitSession()\0ClearButtonCallback()\0"
"CommandEnteredCallback()\0text\0"
"CommandEditedCallback(QString)\0"
"ButtonCallback(QString)\0HelpTreeClicCallback()\0"
"HelpTreeDoubleClicCallback()\0"
"ShowHelpCallback()\0CommandHistoryCallback()\0"
"LookForHelpStringCallback()\0"
"UpdateTabWidget(int)\0"
"ResizeTabWidget(QResizeEvent*)\0"
"CoutFilterCallback(QString)\0"
"ThreadComboBoxCallback(int)\0"
"TabCloseCallback(int)\0ToolBoxActivated(int)\0"
"VisParameterCallback(QWidget*)\0"
"ChangeColorCallback(QWidget*)\0"
"ChangeCursorStyle(QString)\0"
"ChangeSurfaceStyle(QString)\0"
"OpenIconCallback(QString)\0"
"SaveIconCallback(QString)\0"
"ChangePerspectiveOrtho(QString)\0"
};
void G4UIQt::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
if (_c == QMetaObject::InvokeMetaMethod) {
Q_ASSERT(staticMetaObject.cast(_o));
G4UIQt *_t = static_cast<G4UIQt *>(_o);
switch (_id) {
case 0: _t->ExitSession(); break;
case 1: _t->ClearButtonCallback(); break;
case 2: _t->CommandEnteredCallback(); break;
case 3: _t->CommandEditedCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 4: _t->ButtonCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 5: _t->HelpTreeClicCallback(); break;
case 6: _t->HelpTreeDoubleClicCallback(); break;
case 7: _t->ShowHelpCallback(); break;
case 8: _t->CommandHistoryCallback(); break;
case 9: _t->LookForHelpStringCallback(); break;
case 10: _t->UpdateTabWidget((*reinterpret_cast< int(*)>(_a[1]))); break;
case 11: _t->ResizeTabWidget((*reinterpret_cast< QResizeEvent*(*)>(_a[1]))); break;
case 12: _t->CoutFilterCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 13: _t->ThreadComboBoxCallback((*reinterpret_cast< int(*)>(_a[1]))); break;
case 14: _t->TabCloseCallback((*reinterpret_cast< int(*)>(_a[1]))); break;
case 15: _t->ToolBoxActivated((*reinterpret_cast< int(*)>(_a[1]))); break;
case 16: _t->VisParameterCallback((*reinterpret_cast< QWidget*(*)>(_a[1]))); break;
case 17: _t->ChangeColorCallback((*reinterpret_cast< QWidget*(*)>(_a[1]))); break;
case 18: _t->ChangeCursorStyle((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 19: _t->ChangeSurfaceStyle((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 20: _t->OpenIconCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 21: _t->SaveIconCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 22: _t->ChangePerspectiveOrtho((*reinterpret_cast< const QString(*)>(_a[1]))); break;
default: ;
}
}
}
const QMetaObjectExtraData G4UIQt::staticMetaObjectExtraData = {
0, qt_static_metacall
};
const QMetaObject G4UIQt::staticMetaObject = {
{ &QObject::staticMetaObject, qt_meta_stringdata_G4UIQt,
qt_meta_data_G4UIQt, &staticMetaObjectExtraData }
};
#ifdef Q_NO_DATA_RELOCATION
const QMetaObject &G4UIQt::getStaticMetaObject() { return staticMetaObject; }
#endif //Q_NO_DATA_RELOCATION
const QMetaObject *G4UIQt::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
}
void *G4UIQt::qt_metacast(const char *_clname)
{
if (!_clname) return 0;
if (!strcmp(_clname, qt_meta_stringdata_G4UIQt))
return static_cast<void*>(const_cast< G4UIQt*>(this));
if (!strcmp(_clname, "G4VBasicShell"))
return static_cast< G4VBasicShell*>(const_cast< G4UIQt*>(this));
if (!strcmp(_clname, "G4VInteractiveSession"))
return static_cast< G4VInteractiveSession*>(const_cast< G4UIQt*>(this));
return QObject::qt_metacast(_clname);
}
int G4UIQt::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QObject::qt_metacall(_c, _id, _a);
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 23)
qt_static_metacall(this, _c, _id, _a);
_id -= 23;
}
return _id;
}
QT_END_MOC_NAMESPACE
source/interfaces/basic/src/G4UIQt.cc
+7 -23
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIQt.cc 87700 2014-12-17 09:52:39Z gcosmo $
// $Id: G4UIQt.cc 97174 2016-05-27 12:41:02Z gcosmo $
//
// L. Garnier
@@ -184,7 +184,7 @@ G4UIQt::G4UIQt (
fMainWindow->setCorner( Qt::BottomLeftCorner, Qt::LeftDockWidgetArea );
fMainWindow->setCorner( Qt::BottomRightCorner, Qt::RightDockWidgetArea );
fMainWindow->setCentralWidget(CreateViewerWidget());
CreateViewerWidget();
fMainWindow->addDockWidget(Qt::LeftDockWidgetArea, CreateUITabWidget());
fMainWindow->addDockWidget(Qt::BottomDockWidgetArea, CreateCoutTBWidget());
@@ -542,7 +542,7 @@ QWidget* G4UIQt::CreateSceneTreeComponentsTBWidget(){
}
QWidget* G4UIQt::CreateViewerWidget(){
void G4UIQt::CreateViewerWidget(){
// Set layouts
@@ -576,6 +576,7 @@ QWidget* G4UIQt::CreateViewerWidget(){
// fill right splitter
if (fViewerTabWidget == NULL) {
fViewerTabWidget = new G4QTabWidget();
fMainWindow->setCentralWidget(fViewerTabWidget);
#if QT_VERSION < 0x040500
#else
fViewerTabWidget->setTabsClosable (true);
@@ -599,8 +600,6 @@ QWidget* G4UIQt::CreateViewerWidget(){
fViewerTabWidget->setSizePolicy(policy);
fViewerTabWidget->setMinimumSize(40,40);
return fViewerTabWidget;
}
@@ -681,7 +680,7 @@ bool G4UIQt::AddTabWidget(
#if QT_VERSION >= 0x050000
QString message = QString(
"This Qt version [")+qVersion ()+"] has some issues with the OpenGL viewer.\n"+
"To prevent problems, you are not allowed to open a Store nor Immediate viewer.\n" +
"To prevent problems, you are not allowed to open a Stored nor Immediate viewer.\n" +
"\n" +
"Please upgrade to Qt version >= 5.1\n";
@@ -694,22 +693,7 @@ bool G4UIQt::AddTabWidget(
#endif
if (fViewerTabWidget == NULL) {
fViewerTabWidget = new G4QTabWidget();
#if QT_VERSION < 0x040500
#else
fViewerTabWidget->setTabsClosable (true);
#endif
#if QT_VERSION < 0x040200
#else
fViewerTabWidget->setUsesScrollButtons (true);
#endif
#if QT_VERSION < 0x040500
#else
connect(fViewerTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
#endif
connect(fViewerTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
CreateViewerWidget();
}
if (!aWidget) {
@@ -2541,11 +2525,11 @@ bool G4UIQt::CreateCommandWidget(G4UIcommand* aCommand, QWidget* aParent, bool i
applyButton->setAutoDefault( TRUE );
applyButton->setDefault( TRUE );
gridLayout->addWidget(applyButton,n_parameterEntry-nbColorParameter,0);
QPushButton* cancelButton = new QPushButton( tr( "&Cancel" ));
cancelButton->setAutoDefault( TRUE );
gridLayout->addWidget(cancelButton,n_parameterEntry-nbColorParameter,1);
gridLayout->addWidget(applyButton,n_parameterEntry-nbColorParameter,0);
QSignalMapper* signalMapper = new QSignalMapper(this);
signalMapper->setMapping(applyButton, paramWidget);
source/interfaces/basic/src/G4UIWin32.cc
+6 -6
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIWin32.cc 66892 2013-01-17 10:57:59Z gunter $
// $Id: G4UIWin32.cc 97524 2016-06-03 14:26:34Z gcosmo $
//
// G.Barrand
@@ -228,7 +228,7 @@ G4UIWin32::G4UIWin32 (
menuBar = CreateMenu();
defaultMenu = CreatePopupMenu();
AppendMenu(menuBar,MF_POPUP,(UINT)defaultMenu,"Geant4");
AppendMenu(menuBar,MF_POPUP,(UINT_PTR)defaultMenu,"Geant4");
textBuffer = new TextBuffer();
@@ -241,7 +241,7 @@ G4UIWin32::G4UIWin32 (
::GetModuleHandle(NULL),
NULL);
tmpSession = NULL;
::SetWindowLongPtr(mainWindow,GWLP_USERDATA,LONG(this));
::SetWindowLongPtr(mainWindow,GWLP_USERDATA,(LONG_PTR)this);
::SetForegroundWindow(mainWindow);
::ShowWindow(mainWindow,SW_SHOWDEFAULT);
@@ -398,7 +398,7 @@ void G4UIWin32::AddMenu (
defaultMenu = NULL;
}
HMENU hMenu = CreatePopupMenu();
AppendMenu(menuBar,MF_POPUP,(UINT)hMenu,a_label);
AppendMenu(menuBar,MF_POPUP,(UINT_PTR)hMenu,a_label);
AddInteractor(a_name,(G4Interactor)hMenu);
DrawMenuBar(mainWindow);
}
@@ -465,7 +465,7 @@ LRESULT CALLBACK G4UIWin32::MainWindowProc (
a_window,NULL,
GetWindowInstance(a_window),
NULL);
::SetWindowLongPtr (This->textWindow,GWLP_USERDATA,LONG(This));
::SetWindowLongPtr (This->textWindow,GWLP_USERDATA,(LONG_PTR)This);
This->editWindow = CreateWindow ("edit",NULL,
WS_CHILD | WS_VISIBLE | WS_BORDER,
@@ -475,7 +475,7 @@ LRESULT CALLBACK G4UIWin32::MainWindowProc (
GetWindowInstance(a_window),
NULL);
oldEditWindowProc = (WNDPROC)GetWindowLongPtr(This->editWindow,GWLP_WNDPROC);
SetWindowLongPtr (This->editWindow,GWLP_WNDPROC,(LONG)EditWindowProc);
SetWindowLongPtr (This->editWindow,GWLP_WNDPROC,(LONG_PTR)EditWindowProc);
MoveWindow (a_window,
rect.left,rect.top,
source/interfaces/basic/src/G4UIXm.cc
+4 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIXm.cc 74547 2013-10-14 12:51:17Z gcosmo $
// $Id: G4UIXm.cc 97174 2016-05-27 12:41:02Z gcosmo $
//
// G.Barrand
@@ -130,7 +130,7 @@ G4UIXm::G4UIXm (
XtSetArg(args[2],XmNrightAttachment ,XmATTACH_FORM);
XtSetArg(args[3],XmNbottomAttachment,XmATTACH_WIDGET);
XtSetArg(args[4],XmNbottomWidget ,command);
XmString cps = XmStringLtoRCreate((char*)"Clear",XmSTRING_DEFAULT_CHARSET);
XmString cps = XmStringLtoRCreate((char*)"Clear",(char*)XmSTRING_DEFAULT_CHARSET);
XtSetArg (args[5],XmNlabelString,cps);
Widget clearButton = XmCreatePushButton(form,(char*)"clearButton",args,6);
XmStringFree (cps);
@@ -201,7 +201,7 @@ void G4UIXm::Prompt (
{
Arg args[1];
char* str = (char*)XtNewString(aPrompt.data());
XmString cps = XmStringLtoRCreate(str,XmSTRING_DEFAULT_CHARSET);
XmString cps = XmStringLtoRCreate(str,(char*)XmSTRING_DEFAULT_CHARSET);
XtFree(str);
XtSetArg(args[0],XmNpromptString,cps);
XtSetValues(command,args,1);
@@ -316,7 +316,7 @@ void G4UIXm::AddMenu (
AddInteractor (a_name,(G4Interactor)widget);
// Cascade button :
Arg args[2];
XmString cps = XmStringLtoRCreate((char*)a_label,XmSTRING_DEFAULT_CHARSET);
XmString cps = XmStringLtoRCreate((char*)a_label,(char*)XmSTRING_DEFAULT_CHARSET);
XtSetArg (args[0],XmNlabelString,cps);
XtSetArg (args[1],XmNsubMenuId,widget);
widget = XmCreateCascadeButton (menuBar,(char*)a_name,args,2);
source/interfaces/common/src/G4Qt.cc
+1 -23
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Qt.cc 79026 2014-02-12 09:53:32Z gcosmo $
// $Id: G4Qt.cc 97174 2016-05-27 12:41:02Z gcosmo $
//
// L. Garnier
@@ -81,9 +81,6 @@ G4Qt::G4Qt (
args = NULL;
externalApp = false;
#ifdef G4DEBUG_INTERFACES_COMMON
printf("G4Qt::G4Qt try to inited Qt\n");
#endif
// Check if Qt already init in another external app
if(qApp) {
externalApp = true;
@@ -91,9 +88,6 @@ G4Qt::G4Qt (
SetMainInteractor (qApp);
SetArguments (a_argn,a_args);
#ifdef G4DEBUG_INTERFACES_COMMON
printf("G4Qt::G4Qt alredy inited in external \n");
#endif
} else {
if(QtInited==FALSE) { //Qt should be Inited once !
@@ -119,9 +113,6 @@ G4Qt::G4Qt (
int *p_argn = (int*)malloc(sizeof(int));
*p_argn = argn;
#ifdef G4DEBUG_INTERFACES_COMMON
printf("G4Qt::G4Qt QAppl \n");
#endif
new QApplication (*p_argn, args);
if(!qApp) {
@@ -133,25 +124,12 @@ G4Qt::G4Qt (
} else {
QtInited = TRUE;
if (a_argn != 0) {
#ifdef G4DEBUG_INTERFACES_COMMON
printf("G4Qt::G4Qt SetMainInteractor\n");
#endif
SetMainInteractor (qApp);
}
SetArguments (a_argn,a_args);
#ifdef G4DEBUG_INTERFACES_COMMON
printf("G4Qt::G4Qt inited Qt END\n");
#endif
}
}
}
#ifdef G4DEBUG_INTERFACES_COMMON
if (qApp) {
printf("G4Qt::qApp already exist\n");
} else {
printf("G4Qt::qApp not exist\n");
}
#endif
// AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
/*