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

Import Geant4 10.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/VRML/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 19:13:11 bmorgan Exp $
# $Id: CMakeLists.txt 66373 2012-12-18 09:41:34Z gcosmo $
#
#------------------------------------------------------------------------------
source/visualization/VRML/GNUmakefile
+1 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.9 2010-12-23 14:18:05 lgarnier Exp $
# $Id: GNUmakefile 66373 2012-12-18 09:41:34Z gcosmo $
# lib name
name := G4VRML
source/visualization/VRML/History
+16 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.23 2010-12-27 13:23:00 allison Exp $
$Id: History 77479 2013-11-25 10:01:22Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -20,6 +20,21 @@ committal in the CVS repository !
History file for visualization/VRML sub-category
------------------------------------------------
15th November 2013 John Allison (VRML-V09-06-05)
- Some changes as suggested by PVS.
7th November 2013 Gabriele Cosmo (VRML-V09-06-04)
- Replaced deprecated calls to solids accessor methods.
29th January 2013 John Allison (VRML-V09-06-03)
- Revert to VRML-V09-06-00.
14th January 2013 John Allison (VRML-V09-06-01)
- Coverity fixes.
2nd December 2012 John Allison (VRML-V09-06-00)
- Remove NURBS.
8th August 2012 John Allison (VRML-V09-05-05)
- G4VRML1/2SceneHandlerFunc.icc;
o Intercepted 2D primitives - JustWarning printed.
source/visualization/VRML/g4vrmlview/g4mini.java
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: g4mini.java 66373 2012-12-18 09:41:34Z gcosmo $
//
import java.io.*;
import java.net.*;
source/visualization/VRML/g4vrmlview/g4vrmlview.java
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: g4vrmlview.java 66373 2012-12-18 09:41:34Z gcosmo $
//
import java.io.*;
import java.net.*;
source/visualization/VRML/include/FRClient.h
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: FRClient.h 66373 2012-12-18 09:41:34Z gcosmo $
//
// FRClient.h
// FukuiRenderer Client
source/visualization/VRML/include/G4FRClient.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4FRClient.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4FRClient.hh
// Yasuhide Sawada and Satoshi Tanaka
source/visualization/VRML/include/G4VRML1.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML1.hh
// Yasuhide Sawada and Satoshi Tanaka
source/visualization/VRML/include/G4VRML1File.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1File.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML1File.hh
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
+1 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1FileSceneHandler.hh 66870 2013-01-14 23:38:59Z adotti $
//
// G4VRML1FileSceneHandler.hh
// Satoshi Tanaka & Yasuhide Sawada
@@ -83,7 +83,6 @@ public:
void AddPrimitive(const G4Polyline&);
void AddPrimitive(const G4Polyhedron&);
void AddPrimitive(const G4NURBS&);
void AddPrimitive(const G4Text&);
void AddPrimitive(const G4Circle&);
void AddPrimitive(const G4Square&);
source/visualization/VRML/include/G4VRML1FileViewer.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1FileViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML1FileViewer.hh
// Satoshi Tanaka and Yasuhide Sawada
source/visualization/VRML/include/G4VRML1SceneHandler.hh
+1 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1SceneHandler.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML1SceneHandler.hh
// Yasuhide Sawada & Satoshi Tanaka
@@ -88,7 +88,6 @@ public:
void AddPrimitive(const G4Polyline&);
void AddPrimitive(const G4Polyhedron&);
void AddPrimitive(const G4NURBS&);
void AddPrimitive(const G4Text&);
void AddPrimitive(const G4Circle&);
void AddPrimitive(const G4Square&);
source/visualization/VRML/include/G4VRML1Viewer.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1Viewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML1Viewer.hh
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/include/G4VRML2.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2.hh
// Satoshi Tanaka and Yasuhide Sawada
source/visualization/VRML/include/G4VRML2File.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2File.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2File.hh
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
+1 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2FileSceneHandler.hh 66870 2013-01-14 23:38:59Z adotti $
//
// G4VRML2FileSceneHandler.hh
// Satoshi Tanaka & Yasuhide Sawada
@@ -83,7 +83,6 @@ public:
void AddPrimitive(const G4Polyline&);
void AddPrimitive(const G4Polyhedron&);
void AddPrimitive(const G4NURBS&);
void AddPrimitive(const G4Text&);
void AddPrimitive(const G4Circle&);
void AddPrimitive(const G4Square&);
source/visualization/VRML/include/G4VRML2FileViewer.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2FileViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2FileViewer.hh
// Satoshi Tanaka and Yasuhide Sawada
source/visualization/VRML/include/G4VRML2SceneHandler.hh
+1 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2SceneHandler.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2SceneHandler.hh
// Satoshi Tanaka & Yasuhide Sawada
@@ -86,7 +86,6 @@ public:
void AddPrimitive(const G4Polyline&);
void AddPrimitive(const G4Polyhedron&);
void AddPrimitive(const G4NURBS&);
void AddPrimitive(const G4Text&);
void AddPrimitive(const G4Circle&);
void AddPrimitive(const G4Square&);
source/visualization/VRML/include/G4VRML2Viewer.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2Viewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2Viewer.hh
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/include/G4VRMLNetConfig.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRMLNetConfig.hh 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRMLNetConfig.hh
// Satoshi Tanaka
source/visualization/VRML/sources.cmake
+1 -1
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake,v 1.2 2010-11-23 20:40:23 bmorgan Exp $
# $Id: sources.cmake 66870 2013-01-14 23:38:59Z adotti $
#
#------------------------------------------------------------------------------
source/visualization/VRML/src/FRClient.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: FRClient.cc 66870 2013-01-14 23:38:59Z adotti $
//
// FRClient.cc
// FukuiRenderer Client
source/visualization/VRML/src/G4FRClient.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4FRClient.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4FRClient.cc
// Yasuhide Sawada & Satoshi Tanaka
source/visualization/VRML/src/G4VRML1.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML1.cc
// Yasuhide Sawada & Satoshi Tanaka
source/visualization/VRML/src/G4VRML1File.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1File.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML1File.cc
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1FileSceneHandler.cc 66870 2013-01-14 23:38:59Z adotti $
//
// G4VRML1FileSceneHandler.cc
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/src/G4VRML1FileViewer.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1FileViewer.cc 66870 2013-01-14 23:38:59Z adotti $
//
// G4VRMLView.cc
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/src/G4VRML1SceneHandler.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1SceneHandler.cc 66870 2013-01-14 23:38:59Z adotti $
//
// G4VRML1SceneHandler.cc
// Yasuhide Sawada and Satoshi Tanaka
source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
+16 -29
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1SceneHandlerFunc.icc 76287 2013-11-08 13:03:49Z gcosmo $
//
// G4VRML1SceneHandlerFunc.icc
// Satoshi Tanaka & Yasuhide Sawada
@@ -106,10 +106,10 @@ void G4VRML1SCENEHANDLER::AddSolid(const G4Tubs& tubs)
fCurrentDEF = "tubs_" + tubs.GetName();
// Get data
const G4double R = tubs.GetRMax(); // outside radius
const G4double r = tubs.GetRMin(); // inside radius
const G4double dz = tubs.GetDz(); // half length in z
const G4double dp = tubs.GetDPhi(); // angle interval
const G4double R = tubs.GetOuterRadius(); // outside radius
const G4double r = tubs.GetInnerRadius(); // inside radius
const G4double dz = tubs.GetZHalfLength(); // half length in z
const G4double dp = tubs.GetDeltaPhiAngle(); // angle interval
// Send data
if ( r == 0.0 && dp >= 360. * CLHEP::deg ) {
@@ -144,13 +144,13 @@ void G4VRML1SCENEHANDLER::AddSolid(const G4Cons& cons)
fCurrentDEF = "cons_" + cons.GetName();
// Get data
const G4double r1 = cons.GetRmin1(); // inside radius at -dz
const G4double R1 = cons.GetRmax1(); // outside radius at -dz
const G4double r2 = cons.GetRmin2(); // inside radius at +dz
const G4double R2 = cons.GetRmax2(); // outside radius at +dz
const G4double dz = cons.GetDz(); // half length in z
//const G4double sp = cons.GetSPhi(); // starting angle
const G4double dp = cons.GetDPhi(); // angle width
const G4double r1 = cons.GetInnerRadiusMinusZ(); // inside radius at -dz
const G4double R1 = cons.GetOuterRadiusMinusZ(); // outside radius at -dz
const G4double r2 = cons.GetInnerRadiusPlusZ(); // inside radius at +dz
const G4double R2 = cons.GetOuterRadiusPlusZ(); // outside radius at +dz
const G4double dz = cons.GetZHalfLength(); // half length in z
//const G4double sp = cons.GetStartPhiAngle(); // starting angle
const G4double dp = cons.GetDeltaPhiAngle(); // angle width
// Send data
if ( r1 == 0.0 && r2 == 0.0 && R1 == R2 && dp >= 360. * CLHEP::deg) {
@@ -213,10 +213,10 @@ void G4VRML1SCENEHANDLER::AddSolid(const G4Sphere& sphere)
fCurrentDEF = "sphere_" + sphere.GetName();
// Get data
G4double dphi = sphere.GetDPhi () ;
G4double dtheta = sphere.GetDTheta() ;
G4double rmax = sphere.GetRmax () ;
G4double rmin = sphere.GetRmin () ;
G4double dphi = sphere.GetDeltaPhiAngle () ;
G4double dtheta = sphere.GetDeltaThetaAngle() ;
G4double rmax = sphere.GetOuterRadius () ;
G4double rmin = sphere.GetInnerRadius () ;
// Send data
if ( (dphi >= 360. * CLHEP::deg) && (dtheta >= 180. * CLHEP::deg) && (rmin == 0.0) ) {
@@ -371,19 +371,6 @@ void G4VRML1SCENEHANDLER::AddPrimitive(const G4Polyhedron& polyhedron)
}
void G4VRML1SCENEHANDLER::AddPrimitive(const G4NURBS&)
{
#if defined DEBUG_SCENE_FUNC
if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
G4cout << "***** AddPrimitive nurbs" << "\n" ;
#endif
if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
G4cout << "G4VRML1File::AddPrimitive(G4NURBS&): not implemented. " << "\n" ;
VRMLBeginModeling () ;
}
void G4VRML1SCENEHANDLER::AddPrimitive( const G4Text& )
{
#if defined DEBUG_SCENE_FUNC
source/visualization/VRML/src/G4VRML1Viewer.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML1Viewer.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRMLView.cc
// Yasuhide Sawada & Satoshi Tanaka
source/visualization/VRML/src/G4VRML2.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2.cc
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/src/G4VRML2File.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2File.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2File.cc
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2FileSceneHandler.cc 66870 2013-01-14 23:38:59Z adotti $
//
// G4VRML2FileSceneHandler.cc
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/src/G4VRML2FileViewer.cc
+4 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2FileViewer.cc 77479 2013-11-25 10:01:22Z gcosmo $
//
// G4VRML2FileViewer.cc
// Satoshi Tanaka & Yasuhide Sawada
@@ -39,6 +39,7 @@
#include "G4VRML2FileViewer.hh"
#include "G4VRML2FileSceneHandler.hh"
#include "G4VRML2File.hh"
#include "G4SystemOfUnits.hh"
#include "G4ios.hh"
G4VRML2FileViewer::G4VRML2FileViewer(G4VRML2FileSceneHandler& sceneHandler,
@@ -49,8 +50,8 @@ G4VRML2FileViewer::G4VRML2FileViewer(G4VRML2FileSceneHandler& sceneHandler,
fSceneHandler(sceneHandler),
fDest(sceneHandler.fDest)
{
fViewHalfAngle = 0.5 * 0.785398 ; // 0.5 * 45*deg
fsin_VHA = std::sin ( fViewHalfAngle ) ;
fViewHalfAngle = 30. * deg;
fsin_VHA = std::sin ( fViewHalfAngle ) ;
}
G4VRML2FileViewer::~G4VRML2FileViewer()
source/visualization/VRML/src/G4VRML2SceneHandler.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2SceneHandler.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2SceneHandler.cc
// Satoshi Tanaka & Yasuhide Sawada
source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
+19 -26
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2SceneHandlerFunc.icc 68043 2013-03-13 14:27:49Z gcosmo $
//
// G4VRML2SceneHandlerFunc.icc
// Satoshi Tanaka & Yasuhide Sawada
@@ -33,6 +33,8 @@
#include "G4VisManager.hh"
#include <sstream>
void G4VRML2SCENEHANDLER::AddSolid(const G4Trd& trd)
{
#if defined DEBUG_SCENE_FUNC
@@ -284,19 +286,6 @@ void G4VRML2SCENEHANDLER::AddPrimitive(const G4Polyhedron& polyhedron)
}
void G4VRML2SCENEHANDLER::AddPrimitive(const G4NURBS&)
{
#if defined DEBUG_SCENE_FUNC
if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
G4cout << "***** AddPrimitive nurbs" << "\n" ;
#endif
if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
G4cout << "G4VRML2File::AddPrimitive(G4NURBS&): not implemented. " << "\n" ;
VRMLBeginModeling () ;
}
void G4VRML2SCENEHANDLER::AddPrimitive( const G4Text& )
{
#if defined DEBUG_SCENE_FUNC
@@ -519,17 +508,19 @@ void G4VRML2SCENEHANDLER::SendMaterialNode( const G4VisAttributes* pVA )
// Wireframe or not
const G4ViewParameters& cur_view_param = fpViewer -> GetViewParameters ();
if (pVA->IsForceDrawingStyle() &&
(pVA->GetForcedDrawingStyle() == G4VisAttributes::wireframe))
{
// wireframe style is assigned to this object
flagWF = true ;
if (pVA) {
if (pVA->IsForceDrawingStyle() &&
(pVA->GetForcedDrawingStyle() == G4VisAttributes::wireframe))
{
// wireframe style is assigned to this object
flagWF = true ;
} else if ( cur_view_param.GetDrawingStyle() == G4ViewParameters::wireframe )
{
// current viewing style is wireframe
flagWF = true ;
}
} else if ( cur_view_param.GetDrawingStyle() == G4ViewParameters::wireframe )
{
// current viewing style is wireframe
flagWF = true ;
}
}
// VRML codes are generated below
if (!pVA) {
@@ -724,9 +715,11 @@ G4double G4VRML2SCENEHANDLER::SetPVTransparency ()
if( getenv( "G4VRML_TRANSPARENCY" ) != NULL ) {
// get a value from the env value
sscanf( getenv("G4VRML_TRANSPARENCY"), "%lg", &TRANSPARENCY ) ;
// sscanf( getenv("G4VRML_TRANSPARENCY"), "%lg", &TRANSPARENCY ) ;
std::istringstream iss( getenv("G4VRML_TRANSPARENCY") );
iss >> TRANSPARENCY;
// truncation
// truncation
TRANSPARENCY = std::fabs ( TRANSPARENCY ) ;
if ( TRANSPARENCY > 1.0 ) { TRANSPARENCY = 1.0 ; }
}
source/visualization/VRML/src/G4VRML2Viewer.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VRML2Viewer.cc 66373 2012-12-18 09:41:34Z gcosmo $
//
// G4VRML2Viewer.cc
// Satoshi Tanaka & Yasuhide Sawada