Import Geant4 9.3.0 source tree
This commit is contained in:
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RTXScanner.cc,v 1.5 2007/05/22 17:10:42 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4RTXScanner.cc,v 1.7 2009/09/16 16:56:52 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -119,8 +119,8 @@ G4bool G4RTXScanner::GetXWindow(const G4String& name, G4ViewParameters& vp)
|
||||
|
||||
// Window size and position...
|
||||
int xOffset = 0, yOffset = 0;
|
||||
unsigned int width, height;
|
||||
XSizeHints* size_hints = XAllocSizeHints();
|
||||
unsigned int width, height;
|
||||
const G4String& XGeometryString = vp.GetXGeometryString();
|
||||
if (!XGeometryString.empty()) {
|
||||
G4int geometryResultMask = XParseGeometry
|
||||
@@ -149,6 +149,13 @@ G4bool G4RTXScanner::GetXWindow(const G4String& name, G4ViewParameters& vp)
|
||||
width = 600;
|
||||
height = 600;
|
||||
}
|
||||
} else {
|
||||
G4cout << "ERROR: Geometry string \""
|
||||
<< XGeometryString
|
||||
<< "\" is empty. Using \"600x600\"."
|
||||
<< G4endl;
|
||||
width = 600;
|
||||
height = 600;
|
||||
}
|
||||
size_hints->width = width;
|
||||
size_hints->height = height;
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracerViewer.cc,v 1.17 2007/01/05 17:05:11 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4RayTracerViewer.cc,v 1.18 2009/08/19 08:39:19 lgarnier Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
|
||||
#include "G4RayTracerViewer.hh"
|
||||
|
||||
@@ -46,8 +46,6 @@ G4RayTracerViewer::G4RayTracerViewer
|
||||
{
|
||||
theTracer = aTracer;
|
||||
if (!aTracer) theTracer = new G4TheRayTracer;
|
||||
theTracer->SetNColumn(fVP.GetWindowSizeHintX());
|
||||
theTracer->SetNRow(fVP.GetWindowSizeHintY());
|
||||
}
|
||||
|
||||
G4RayTracerViewer::~G4RayTracerViewer() {}
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracerXViewer.cc,v 1.5 2006/06/29 21:24:19 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-09-02 $
|
||||
// $Id: G4RayTracerXViewer.cc,v 1.8 2009/09/16 16:56:52 allison Exp $
|
||||
// GEANT4 tag $Name: geant4-09-03 $
|
||||
|
||||
#ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
|
||||
@@ -45,7 +45,17 @@ G4RayTracerXViewer::G4RayTracerXViewer
|
||||
G4RayTracerViewer(sceneHandler,
|
||||
name,
|
||||
new G4TheRayTracer(new G4RTJpegMaker, new G4RTXScanner))
|
||||
{
|
||||
{}
|
||||
|
||||
G4RayTracerXViewer::~G4RayTracerXViewer() {}
|
||||
|
||||
void G4RayTracerXViewer::Initialise() {
|
||||
|
||||
if (theTracer) {
|
||||
theTracer->SetNColumn(fVP.GetWindowSizeHintX());
|
||||
theTracer->SetNRow(fVP.GetWindowSizeHintY());
|
||||
}
|
||||
|
||||
// Set up X Window...
|
||||
G4RTXScanner* theXScanner = (G4RTXScanner*)theTracer->GetScanner();
|
||||
if (!theXScanner->GetXWindow(fName,fVP)) {
|
||||
@@ -54,6 +64,4 @@ G4RayTracerXViewer::G4RayTracerXViewer
|
||||
}
|
||||
}
|
||||
|
||||
G4RayTracerXViewer::~G4RayTracerXViewer() {}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user