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

Import Geant4 10.4.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-06-30 10:49:55 +02:00
parent 3a5407696b
commit 1a1316fea4
2180 changed files with 237880 additions and 59109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics_reps/History
+15 -1
View File
@@ -1,4 +1,4 @@
$Id: History 101022 2016-11-04 08:25:50Z gcosmo $
$Id: History 104093 2017-05-11 07:29:45Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -20,6 +20,20 @@ committal in the CVS repository !
History file for graphics_reps category
---------------------------------------
10th May 2017 John Allison (greps-V10-03-04)
- G4Colour: Added Set functions for components.
25th April 2017 John Allison (greps-V10-03-03)
- G4Colour& operator += (const G4Colour& rhs) {*this = rhs; return *this;}
// Note: This is required by RayTracer in its use of G4THitsMap.
// Adding colours, without also taking brightness into account, does not make
// sense, so let us make it synonymous with operator=, which is, I guess,
// equivalent to covering the old colour with the new, like a coat of paint.
22nd February 2017 John Allison (greps-V10-03-01)
- Requires visman-V10-03-03.
- Removed G4VisExtent::NullExtent.
3rd November 2016 John Allison (greps-V10-02-10)
- Fix typo in previous tag.
source/graphics_reps/include/G4Colour.hh
+13 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Colour.hh 78955 2014-02-05 09:45:46Z gcosmo $
// $Id: G4Colour.hh 104093 2017-05-11 07:29:45Z gcosmo $
//
//
// John Allison 20th October 1996
@@ -98,12 +98,23 @@ public: // With description
G4bool operator != (const G4Colour& c) const;
G4bool operator == (const G4Colour& c) const {return !(operator != (c));}
G4Colour& operator += (const G4Colour&) {return *this;} // Dummy
G4Colour& operator += (const G4Colour& rhs) {*this = rhs; return *this;}
// Note: This is required by RayTracer in its use of G4THitsMap.
// Adding colours, without also taking brightness into account, does not make
// sense, so let us make it synonymous with operator=, which is, I guess,
// equivalent to covering the old colour with the new, like a coat of paint.
G4double GetRed () const;
G4double GetGreen () const;
G4double GetBlue () const;
G4double GetAlpha () const; // alpha = opacity = 1. - transparency.
void SetRed (G4double);
void SetGreen (G4double);
void SetBlue (G4double);
void SetAlpha (G4double); // alpha = opacity = 1. - transparency.
static G4Colour White();
static G4Colour Gray();
static G4Colour Grey();
source/graphics_reps/include/G4VGraphicsScene.hh
+2 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VGraphicsScene.hh 99153 2016-09-07 08:05:30Z gcosmo $
// $Id: G4VGraphicsScene.hh 102801 2017-02-22 15:17:53Z gcosmo $
// John Allison 19th July 1996
//
// Class Description:
@@ -160,8 +160,7 @@ public: // With description
virtual void AddPrimitive (const G4Polyhedron&) = 0;
virtual const G4VisExtent& GetExtent() const;
// The concrete class should overload this or
// G4VisExtent::NullExtent will be returned.
// The concrete class should overload this or a null extent will be returned.
// See G4VScenHandler for example.
};
source/graphics_reps/include/G4VisExtent.hh
+1 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VisExtent.hh 78955 2014-02-05 09:45:46Z gcosmo $
// $Id: G4VisExtent.hh 102801 2017-02-22 15:17:53Z gcosmo $
//
//
// A.Walkden 28/11/95
@@ -77,7 +77,6 @@ public: // With description
void SetZmin (G4double zmin);
void SetZmax (G4double zmax);
friend std::ostream& operator << (std::ostream& os, const G4VisExtent& e);
static const G4VisExtent NullExtent;
private:
G4double fXmin, fXmax, fYmin, fYmax, fZmin, fZmax;
source/graphics_reps/src/G4Colour.cc
+25 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4Colour.cc 78955 2014-02-05 09:45:46Z gcosmo $
// $Id: G4Colour.cc 104093 2017-05-11 07:29:45Z gcosmo $
//
//
// John Allison 20th October 1996
@@ -48,6 +48,30 @@ red (v.x()), green (v.y()), blue (v.z()), alpha (1.)
if( blue > 1.0 ){blue = 1.0;} if( blue < 0.0 ){blue = 0.0;}
}
void G4Colour::SetRed (G4double r)
{
red = r;
if( red > 1.0 ){red = 1.0;} if( red < 0.0 ){red = 0.0;}
}
void G4Colour::SetGreen (G4double gr)
{
green = gr;
if( green > 1.0 ){green = 1.0;} if( green < 0.0 ){green = 0.0;}
}
void G4Colour::SetBlue (G4double b)
{
blue = b;
if( blue > 1.0 ){blue = 1.0;} if( blue < 0.0 ){blue = 0.0;}
}
void G4Colour::SetAlpha (G4double a)
{
alpha = a;
if( alpha > 1.0 ){alpha = 1.0;} if( alpha < 0.0 ){alpha = 0.0;}
}
G4Colour::operator G4ThreeVector() {
return G4ThreeVector(red,green,blue);
}
source/graphics_reps/src/G4VGraphicsScene.cc
+3 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VGraphicsScene.cc 73125 2013-08-19 07:57:38Z gcosmo $
// $Id: G4VGraphicsScene.cc 102801 2017-02-22 15:17:53Z gcosmo $
// John Allison 19th July 1996
#include "G4VGraphicsScene.hh"
@@ -37,5 +37,6 @@ G4VGraphicsScene::~G4VGraphicsScene() {}
const G4VisExtent& G4VGraphicsScene::GetExtent() const
{
return G4VisExtent::NullExtent;
static const G4VisExtent defaultExtent = G4VisExtent();
return defaultExtent;
}
source/graphics_reps/src/G4VisExtent.cc
+1 -3
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VisExtent.cc 78955 2014-02-05 09:45:46Z gcosmo $
// $Id: G4VisExtent.cc 102801 2017-02-22 15:17:53Z gcosmo $
//
//
// A.Walkden 28/11/95
@@ -35,8 +35,6 @@
#include "G4ios.hh"
const G4VisExtent G4VisExtent::NullExtent; // Default extent is null.
G4VisExtent::G4VisExtent (G4double xmin, G4double xmax,
G4double ymin, G4double ymax,
G4double zmin, G4double zmax):