Import Geant4 10.3.1 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 99076 2016-09-01 12:40:47Z gcosmo $
|
||||
$Id: History 102778 2017-02-22 10:50:10Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -24,6 +24,10 @@ committal in the CVS repository !
|
||||
History file for Ray Tracer category
|
||||
---------------------------------------
|
||||
|
||||
22nd February 2017 John Allison (raytracer-V10-02-02)
|
||||
- G4RTXScanner.cc: Changed XA_RGB_BEST_MAP to XA_RGB_DEFAULT_MAP.
|
||||
(It seems XA_RGB_BEST_MAP no longer available on Mac XQuartz 2.7.11.)
|
||||
|
||||
31st August 2016 John Allison (raytracer-V10-02-01)
|
||||
- Fix G4Orb and G4Ellipsoid hiding warnings.
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RTXScanner.cc 66373 2012-12-18 09:41:34Z gcosmo $
|
||||
// $Id: G4RTXScanner.cc 102778 2017-02-22 10:50:10Z gcosmo $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -177,16 +177,16 @@ G4bool G4RTXScanner::GetXWindow(const G4String& name, G4ViewParameters& vp)
|
||||
int nMaps;
|
||||
Status status = XGetRGBColormaps
|
||||
(display, RootWindow(display, screen_num),
|
||||
&scmap, &nMaps, XA_RGB_BEST_MAP);
|
||||
&scmap, &nMaps, XA_RGB_DEFAULT_MAP);
|
||||
if (!status) {
|
||||
system("xstdcmap -best"); // ...and try again...
|
||||
status = XGetRGBColormaps
|
||||
(display, RootWindow(display, screen_num),
|
||||
&scmap, &nMaps, XA_RGB_BEST_MAP);
|
||||
&scmap, &nMaps, XA_RGB_DEFAULT_MAP);
|
||||
if (!status) {
|
||||
G4cerr <<
|
||||
"G4RTXScanner::Initialize(): cannot get color map."
|
||||
"\n Perhaps your system does not support RGB_BEST_MAP."
|
||||
"\n Perhaps your system does not support XA_RGB_DEFAULT_MAP."
|
||||
<< G4endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user