Import Geant4 3.2.0 source tree
This commit is contained in:
@@ -1,12 +1,28 @@
|
||||
// This code implementation is the intellectual property of
|
||||
// the GEANT4 collaboration.
|
||||
//
|
||||
// By copying, distributing or modifying the Program (or any work
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
// ********************************************************************
|
||||
// * DISCLAIMER *
|
||||
// * *
|
||||
// * The following disclaimer summarizes all the specific disclaimers *
|
||||
// * of contributors to this software. The specific disclaimers,which *
|
||||
// * govern, are listed with their locations in: *
|
||||
// * http://cern.ch/geant4/license *
|
||||
// * *
|
||||
// * Neither the authors of this software system, nor their employing *
|
||||
// * institutes,nor the agencies providing financial support for this *
|
||||
// * work make any representation or warranty, express or implied, *
|
||||
// * regarding this software system or assume any liability for its *
|
||||
// * use. *
|
||||
// * *
|
||||
// * This code implementation is the intellectual property of the *
|
||||
// * GEANT4 collaboration. *
|
||||
// * By copying, distributing or modifying the Program (or any work *
|
||||
// * based on the Program) you indicate your acceptance of this *
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4VSceneHandler.cc,v 1.12 2001/02/23 15:43:24 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// $Id: G4VSceneHandler.cc,v 1.14.2.1 2001/06/28 19:16:14 gunter Exp $
|
||||
// GEANT4 tag $Name: $
|
||||
//
|
||||
//
|
||||
// John Allison 19th July 1996
|
||||
@@ -184,15 +200,15 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) {
|
||||
case G4Polymarker::line:
|
||||
{
|
||||
G4Polyline polyline (polymarker);
|
||||
for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
|
||||
polyline.append (polymarker[iPoint]);
|
||||
for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
|
||||
polyline.push_back (polymarker[iPoint]);
|
||||
}
|
||||
AddPrimitive (polyline);
|
||||
}
|
||||
break;
|
||||
case G4Polymarker::dots:
|
||||
{
|
||||
for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
|
||||
for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
|
||||
G4Circle dot (polymarker);
|
||||
dot.SetPosition (polymarker[iPoint]);
|
||||
dot.SetWorldSize (0.);
|
||||
@@ -203,7 +219,7 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) {
|
||||
break;
|
||||
case G4Polymarker::circles:
|
||||
{
|
||||
for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
|
||||
for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
|
||||
G4Circle circle (polymarker);
|
||||
circle.SetPosition (polymarker[iPoint]);
|
||||
AddPrimitive (circle);
|
||||
@@ -212,7 +228,7 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) {
|
||||
break;
|
||||
case G4Polymarker::squares:
|
||||
{
|
||||
for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
|
||||
for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
|
||||
G4Square Square (polymarker);
|
||||
Square.SetPosition (polymarker[iPoint]);
|
||||
AddPrimitive (Square);
|
||||
@@ -298,7 +314,7 @@ void G4VSceneHandler::ProcessScene (G4VViewer& view) {
|
||||
if (runDurationModelList.size ()) {
|
||||
G4cout << "Traversing scene data..." << G4endl;
|
||||
G4ModelingParameters* pMP = CreateModelingParameters ();
|
||||
for (int i = 0; i < runDurationModelList.size (); i++) {
|
||||
for (size_t i = 0; i < runDurationModelList.size (); i++) {
|
||||
G4VModel* pModel = runDurationModelList[i];
|
||||
const G4ModelingParameters* tempMP =
|
||||
pModel -> GetModelingParameters ();
|
||||
@@ -455,15 +471,15 @@ G4double G4VSceneHandler::GetMarkerSize (const G4VMarker& marker,
|
||||
G4bool userSpecified = marker.GetWorldSize() || marker.GetScreenSize();
|
||||
const G4VMarker& defaultMarker =
|
||||
fpViewer -> GetViewParameters().GetDefaultMarker();
|
||||
G4double size;
|
||||
if (size = // Assignment intentional.
|
||||
userSpecified ? marker.GetWorldSize() : defaultMarker.GetWorldSize()) {
|
||||
G4double size = userSpecified ?
|
||||
marker.GetWorldSize() : defaultMarker.GetWorldSize();
|
||||
if (size) {
|
||||
// Draw in world coordinates.
|
||||
markerSizeType = world;
|
||||
}
|
||||
else {
|
||||
size = // Assignment intentional.
|
||||
userSpecified ? marker.GetScreenSize() : defaultMarker.GetScreenSize();
|
||||
size = userSpecified ?
|
||||
marker.GetScreenSize() : defaultMarker.GetScreenSize();
|
||||
// Draw in screen coordinates.
|
||||
markerSizeType = screen;
|
||||
}
|
||||
@@ -476,7 +492,7 @@ G4std::ostream& operator << (G4std::ostream& os, const G4VSceneHandler& s) {
|
||||
|
||||
os << "Scene " << s.fName << " has "
|
||||
<< s.fViewerList.size () << " viewers:";
|
||||
for (int i = 0; i < s.fViewerList.size (); i++) {
|
||||
for (size_t i = 0; i < s.fViewerList.size (); i++) {
|
||||
os << "\n " << *(s.fViewerList [i]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user