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

Import Geant4 10.7.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-12-04 12:30:43 +01:00
parent 67ba86d073
commit dab42d2018
3770 changed files with 226369 additions and 286486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/VRML/History
+6
View File
@@ -18,6 +18,12 @@ committal in the CVS repository !
History file for visualization/VRML sub-category
------------------------------------------------
3 July 2020 John Allison (VRML-V10-06-02)
- G4VRML1/2FileSceneHandler.cc:
o Fix Unbuntu 20 compiler warning about ignoring return value
of ‘int system(const char*)’.
31 May 2020 Ben Morgan (VRML-V10-06-01)
- Use add_definitions to set PRIVATE-level compile add_definitions
for compatibility between old and new CMake systems
source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
+14 -6
View File
@@ -208,12 +208,20 @@ void G4VRML1FileSceneHandler::closePort()
G4cout << " setenv " << ENV_VRML_VIEWER << " vrweb " << G4endl;
}
} else {
std::ostringstream ossCommand;
ossCommand << viewer << ' ' << fVRMLFileName;
strncpy(command,ossCommand.str().c_str(),sizeof(command)-1);
command[sizeof(command)-1] = '\0';
(void) system( command );
}
std::ostringstream ossCommand;
ossCommand << viewer << ' ' << fVRMLFileName;
strncpy(command,ossCommand.str().c_str(),sizeof(command)-1);
command[sizeof(command)-1] = '\0';
int iErr = system( command );
if ( iErr != 0 ) {
G4ExceptionDescription ed;
ed << "Error " << iErr
<< " when calling system with \"" << command
<< "\".";
G4Exception("G4VRML1FileSceneHandler::closePort()",
"VRML-1006", JustWarning, ed);
}
}
}
G4int G4VRML1FileSceneHandler::fSceneIdCount = 0;
source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
+13 -5
View File
@@ -222,11 +222,19 @@ void G4VRML2FileSceneHandler::closePort()
G4cout << " setenv " << ENV_VRML_VIEWER << " vrwave " << G4endl;
}
} else {
std::ostringstream ossCommand;
ossCommand << viewer << ' ' << fVRMLFileName;
strncpy(command,ossCommand.str().c_str(),sizeof(command)-1);
command[sizeof(command)-1] = '\0';
(void) system( command );
std::ostringstream ossCommand;
ossCommand << viewer << ' ' << fVRMLFileName;
strncpy(command,ossCommand.str().c_str(),sizeof(command)-1);
command[sizeof(command)-1] = '\0';
int iErr = system( command );
if ( iErr != 0 ) {
G4ExceptionDescription ed;
ed << "Error " << iErr
<< " when calling system with \"" << command
<< "\".";
G4Exception("G4VRML2FileSceneHandler::closePort()",
"VRML-2006", JustWarning, ed);
}
}
}