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/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);