Import Geant4 10.4.0 source tree

This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
+10 -1
View File
@@ -1,4 +1,4 @@
$Id: History 102246 2017-01-16 13:10:31Z gcosmo $
$Id: History 105742 2017-08-16 13:11:07Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,15 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
5th August 2017 Koichi Murakami (interfaces-V10-03-01)
- G4VBasicShell
o Fix std::out_of_range exception in ModifyPath() when typing ls command
at the top dir
20th January Laurent Garnier
- G4UIQt:
o Set always-on-top to the picking windows
13th January Laurent Garnier (interfaces-V10-03-00)
- G4UIQt:
o Fix bugzilla 1933. I check was missing to avoid a NULL pointer
+1 -1
View File
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'G4UIQt.hh'
**
** Created: Thu Apr 20 12:02:10 2017
** Created: Thu Nov 9 12:46:35 2017
** by: The Qt Meta Object Compiler version 63 (Qt 4.8.4)
**
** WARNING! All changes made in this file will be lost!
+3 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UIQt.cc 102246 2017-01-16 13:10:31Z gcosmo $
// $Id: G4UIQt.cc 105742 2017-08-16 13:11:07Z gcosmo $
//
// L. Garnier
@@ -4379,6 +4379,8 @@ void G4UIQt::CreatePickInfosDialog() {
layoutDialog->addWidget(fPickInfosWidget);
layoutDialog->setContentsMargins(0,0,0,0);
fPickInfosDialog->setLayout(layoutDialog);
fPickInfosDialog->setWindowFlags(Qt::WindowStaysOnTopHint);
}
+13 -8
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VBasicShell.cc 74547 2013-10-14 12:51:17Z gcosmo $
// $Id: G4VBasicShell.cc 105742 2017-08-16 13:11:07Z gcosmo $
//
#include "G4VBasicShell.hh"
@@ -151,15 +151,20 @@ G4String G4VBasicShell::ModifyPath(const G4String& tempPath) const
}
// end of path...
if(newPath(newPath.size()-3,3) == "/..") {
if( newPath.size() == 3) {
newPath = "/";
} else {
size_t idx = newPath.find_last_of('/', newPath.size()-4);
if(idx != G4String::npos) newPath.erase(idx+1);
if ( newPath.size() >= 3 ) {
if(newPath(newPath.size()-3,3) == "/..") {
if( newPath.size() == 3) {
newPath = "/";
} else {
size_t idx = newPath.find_last_of('/', newPath.size()-4);
if(idx != G4String::npos) newPath.erase(idx+1);
}
}
}
if(newPath(newPath.size()-2,2) == "/.") newPath.erase(newPath.size()-1,1);
if ( newPath.size() >= 2 ) {
if(newPath(newPath.size()-2,2) == "/.") newPath.erase(newPath.size()-1,1);
}
// truncate "/////" to "/"
while(1) {