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

Import Geant4 3.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:10:37 +02:00
parent 137e303ecc
commit 36c080dca6
3464 changed files with 119310 additions and 52696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
+34 -16
View File
@@ -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: G4OpenInventorSceneHandler.cc,v 1.9 2001/01/25 15:28:10 johna Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4OpenInventorSceneHandler.cc,v 1.11.2.1 2001/06/28 19:15:49 gunter Exp $
// GEANT4 tag $Name: $
//
//
// Jeff Kallenbach 01 Aug 1996
@@ -113,7 +129,7 @@ G4OpenInventorSceneHandler::~G4OpenInventorSceneHandler ()
void G4OpenInventorSceneHandler::AddPrimitive (const G4Polyline& line) {
if(currentSeparator==NULL) return;
G4int nPoints = line.entries();
G4int nPoints = line.size();
SbVec3f* pCoords = new SbVec3f[nPoints];
SoCoordinate3 *polyCoords = new SoCoordinate3;
@@ -121,9 +137,9 @@ void G4OpenInventorSceneHandler::AddPrimitive (const G4Polyline& line) {
SoLineSet *pLine = new SoLineSet;
for (G4int iPoint = 0; iPoint < nPoints ; iPoint++) {
pCoords[iPoint].setValue(line(iPoint).x(),
line(iPoint).y(),
line(iPoint).z());
pCoords[iPoint].setValue(line[iPoint].x(),
line[iPoint].y(),
line[iPoint].z());
}
//
@@ -212,9 +228,10 @@ void G4OpenInventorSceneHandler::AddPrimitive (const G4Circle& circle) {
//
// Dimensions
//
G4double userSpecified = circle.GetWorldSize() || circle.GetScreenSize();
const G4VMarker& defaultMarker =
fpViewer -> GetViewParameters().GetDefaultMarker();
// (userSpecified and defaultMarker are unused - what was intended here?)
//G4double userSpecified = circle.GetWorldSize() || circle.GetScreenSize();
//const G4VMarker& defaultMarker =
// fpViewer -> GetViewParameters().GetDefaultMarker();
G4double size = GetMarkerSize ( circle );
@@ -738,12 +755,13 @@ G4double G4OpenInventorSceneHandler::GetMarkerSize ( const G4VMarker& mark )
if ( extent_radius_3d <= 0.0 ) { extent_radius_3d = 1.0 ; }
//----- get marker radius in 3D units
if ( size = mark.GetWorldSize() ) {
size = mark.GetWorldSize();
if ( size ) {
// get mark radius in 3D units
size = 0.5 * mark.GetWorldSize() ;
} else if ( size = mark.GetScreenSize() ) {
} else if ( (size = mark.GetScreenSize()) ) {
// local
double mark_radius_2d = 0.5 * mark.GetScreenSize() ;