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

Import Geant4 10.5.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/interfaces/GAG/src/G4UIGainServer.cc
+9 -5
View File
@@ -25,7 +25,7 @@
//
//
// 12/06/2002 G4UIGainServer H. MInamimoto and H. Yoshida created
// $Id: G4UIGainServer.cc 66892 2013-01-17 10:57:59Z gunter $
// $Id: G4UIGainServer.cc 110933 2018-06-26 08:09:42Z gcosmo $
//
#ifndef WIN32
@@ -123,7 +123,8 @@ void G4UIGainServer::PauseSessionStart(const G4String& msg)
ExecuteCommand(newCommand);
newCommand= GetCommand();
strcpy(buf,"nowIdle");
write(socketD[1],buf,strlen(buf));
ssize_t rc = write(socketD[1],buf,strlen(buf));
if (rc < 0) {}
}
}
@@ -201,7 +202,8 @@ G4String G4UIGainServer::GetCommand()
/////////////////////////////
/////////////////////////////
read(socketD[1],buf,1024);
ssize_t rc = read(socketD[1],buf,1024);
if ( rc < 0 ) {}
newCommand=buf;
//DEBUG cout<<"->"<<newCommand<<"<-"<<newCommand.length()<<G4endl;
//newCommand.readLine( G4cin, FALSE );
@@ -315,7 +317,8 @@ G4int G4UIGainServer::ReceiveG4cout(const G4String& coutString)
//////////////////////////////////////////////////////
{
if(socketD[1]>0){
write(socketD[1],coutString,coutString.length());
ssize_t rc = write(socketD[1],coutString,coutString.length());
if ( rc < 0 ){}
}
return 0;
@@ -328,7 +331,8 @@ G4int G4UIGainServer::ReceiveG4cerr(const G4String& cerrString)
//////////////////////////////////////////////////////
{
if(socketD[2]>0){
write(socketD[2],cerrString,cerrString.length());
ssize_t rc = write(socketD[2],cerrString,cerrString.length());
if ( rc < 0 ) {}
}
return 0;
source/interfaces/History
+12 -5
View File
@@ -1,4 +1,4 @@
$Id: History 110081 2018-05-15 10:13:55Z gcosmo $
$Id: History 110933 2018-06-26 08:09:42Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,19 +17,26 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
14th May 2018 Garnier Laurent (interfaces-V10-03-03)
26th June 2018 Koichi Murakami (interfaces-V10-04-07)
- G4UIGainServer.cc, G4InteractorMessenger.cc :
suppress compilation warning for -Wunused-result
15th June 2018 Fred Jones (interfaces-V10-04-06)
- G4Xt: fixed compilation warnings for casts on gcc-8.1.
14th May 2018 Garnier Laurent (interfaces-V10-04-05)
- G4UIQt.cc:
o Fix a bug with some "critical errors" message containing HTML tags inside (<, > and &)
23th April 2018 Garnier Laurent
23th April 2018 Garnier Laurent (interfaces-V10-04-03, interfaces-V10-04-04)
- G4UIQt:
o Fix a bug with command guidance with HTML tags inside (<, > and &)
8th February 2018 Garnier Laurent (interfaces-V10-03-02)
8th February 2018 Garnier Laurent (interfaces-V10-04-01, interfaces-V10-04-02)
- G4UIQt:
o Take account \n in account for command guidance in help tree. Bug #296 Fixed
13th December 2017 Garnier Laurent
13th December 2017 Garnier Laurent (interfaces-V10-04-00)
- G4UIQt:
o Remove parameters from popup in Qt interface when autocomplete command line
source/interfaces/basic/include/G4UIQt.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIQt.hh 108490 2018-02-15 14:54:21Z gcosmo $
// $Id: G4UIQt.hh 108356 2018-02-08 09:11:28Z gcosmo $
//
#ifndef G4UIQt_h
#define G4UIQt_h
source/interfaces/basic/moc/G4UIQt_moc.cc
+164
View File
@@ -0,0 +1,164 @@
/****************************************************************************
** Meta object code from reading C++ file 'G4UIQt.hh'
**
** Created: Tue Jun 26 10:20:28 2018
** 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
25, 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,
65, 7, 7, 7, 0x08,
95, 90, 7, 7, 0x08,
126, 7, 7, 7, 0x08,
150, 7, 7, 7, 0x08,
173, 7, 7, 7, 0x08,
202, 7, 7, 7, 0x08,
221, 7, 7, 7, 0x08,
246, 7, 7, 7, 0x08,
274, 7, 7, 7, 0x08,
295, 7, 7, 7, 0x08,
326, 7, 7, 7, 0x08,
354, 7, 7, 7, 0x08,
382, 7, 7, 7, 0x08,
404, 7, 7, 7, 0x08,
426, 7, 7, 7, 0x08,
457, 7, 7, 7, 0x08,
487, 7, 7, 7, 0x08,
515, 7, 7, 7, 0x08,
543, 7, 7, 7, 0x08,
569, 7, 7, 7, 0x08,
595, 7, 7, 7, 0x08,
629, 7, 7, 7, 0x08,
0 // eod
};
static const char qt_meta_stringdata_G4UIQt[] = {
"G4UIQt\0\0ExitSession()\0ClearButtonCallback()\0"
"SaveOutputCallback()\0CommandEnteredCallback()\0"
"text\0CommandEditedCallback(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"
"ChangeCursorAction(QString)\0"
"ChangeSurfaceStyle(QString)\0"
"OpenIconCallback(QString)\0"
"SaveIconCallback(QString)\0"
"ViewerPropertiesIconCallback(int)\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->SaveOutputCallback(); break;
case 3: _t->CommandEnteredCallback(); break;
case 4: _t->CommandEditedCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 5: _t->ButtonCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 6: _t->HelpTreeClicCallback(); break;
case 7: _t->HelpTreeDoubleClicCallback(); break;
case 8: _t->ShowHelpCallback(); break;
case 9: _t->CommandHistoryCallback(); break;
case 10: _t->LookForHelpStringCallback(); break;
case 11: _t->UpdateTabWidget((*reinterpret_cast< int(*)>(_a[1]))); break;
case 12: _t->ResizeTabWidget((*reinterpret_cast< QResizeEvent*(*)>(_a[1]))); break;
case 13: _t->CoutFilterCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 14: _t->ThreadComboBoxCallback((*reinterpret_cast< int(*)>(_a[1]))); break;
case 15: _t->TabCloseCallback((*reinterpret_cast< int(*)>(_a[1]))); break;
case 16: _t->ToolBoxActivated((*reinterpret_cast< int(*)>(_a[1]))); break;
case 17: _t->VisParameterCallback((*reinterpret_cast< QWidget*(*)>(_a[1]))); break;
case 18: _t->ChangeColorCallback((*reinterpret_cast< QWidget*(*)>(_a[1]))); break;
case 19: _t->ChangeCursorAction((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 20: _t->ChangeSurfaceStyle((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 21: _t->OpenIconCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 22: _t->SaveIconCallback((*reinterpret_cast< const QString(*)>(_a[1]))); break;
case 23: _t->ViewerPropertiesIconCallback((*reinterpret_cast< int(*)>(_a[1]))); break;
case 24: _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 < 25)
qt_static_metacall(this, _c, _id, _a);
_id -= 25;
}
return _id;
}
QT_END_MOC_NAMESPACE
source/interfaces/basic/src/G4UIQt.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIQt.cc 110081 2018-05-15 10:13:55Z gcosmo $
// $Id: G4UIQt.cc 110027 2018-05-14 15:18:53Z gcosmo $
//
// L. Garnier
source/interfaces/common/include/G4Xt.hh
+5 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Xt.hh 70601 2013-06-03 11:20:53Z gcosmo $
// $Id: G4Xt.hh 110808 2018-06-15 06:58:36Z gcosmo $
//
// To unify X11 event treatment between
// G4/interfaces Xt sessions and G4/visualizations Xt drivers.
@@ -57,6 +57,10 @@ public:
void* GetEvent();
void FlushAndWaitExecution();
virtual ~G4Xt();
// Workaround for gcc8 Coverity cast warning
static bool xt_dispatch_event(void* a_event) {
return XtDispatchEvent((XEvent*)a_event);
}
private:
G4Xt (const G4Xt&);
G4Xt (int,char**,char*);
source/interfaces/common/src/G4InteractorMessenger.cc
+2 -1
View File
@@ -157,7 +157,8 @@ void G4InteractorMessenger::SetNewValue (
} else if(command==defaultIcons) {
session->DefaultIcons(command->ConvertToBool(newValue));
} else if(command==sys) {
system((const char*)params[0]);
int rc = system((const char*)params[0]);
if ( rc < 0 ){ }
}
}
delete [] params;
source/interfaces/common/src/G4Xt.cc
+4 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Xt.cc 66892 2013-01-17 10:57:59Z gunter $
// $Id: G4Xt.cc 110808 2018-06-15 06:58:36Z gcosmo $
//
// G.Barrand
@@ -127,7 +127,9 @@ G4Xt::G4Xt (
}
SetArguments (argn,args);
SetMainInteractor (topWidget);
AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
AddDispatcher(xt_dispatch_event);
// Coverity gcc8 cast warning
// AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
}
/***************************************************************************/
G4Xt::~G4Xt (