Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 88190 2015-02-02 17:24:54Z gcosmo $
|
||||
$Id: History 101714 2016-11-22 08:53:13Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -20,6 +20,20 @@ committal in the CVS repository !
|
||||
History file for visualization/FukuiRenderer sub-category
|
||||
---------------------------------------------------------
|
||||
|
||||
19th November 2016 John Allison (DAWN-V10-02-02)
|
||||
- Fixed the GetColour() problem.
|
||||
|
||||
11th September 2016 John Allison (DAWN-V10-02-01)
|
||||
- GetColour/GetColor no longer takes an argument.
|
||||
- Make sure applicable vis attributes are obtained.
|
||||
// Get and check applicable vis attributes.
|
||||
// fpVisAttribs = fpViewer->GetApplicableVisAttributes(fpVisAttribs);
|
||||
// Note: the vis attributes may have been modified by the viewer. See
|
||||
// code in G4VViewer::GetApplicableVisAttributes.
|
||||
|
||||
31st August 2016 John Allison (DAWN-V10-02-00)
|
||||
- Fix G4Orb and G4Ellipsoid hiding warnings.
|
||||
|
||||
2nd February 2015 Gabriele Cosmo (DAWN-V10-01-00)
|
||||
- Fix to sources.cmake script to include missing dependency on external library.
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4DAWNFILESceneHandler.hh 66870 2013-01-14 23:38:59Z adotti $
|
||||
// $Id: G4DAWNFILESceneHandler.hh 99152 2016-09-07 08:04:30Z gcosmo $
|
||||
//
|
||||
// Satoshi TANAKA
|
||||
|
||||
@@ -88,6 +88,12 @@ public:
|
||||
void AddSolid ( const G4Polyhedra& polyhedra) {
|
||||
G4VSceneHandler::AddSolid (polyhedra);
|
||||
}
|
||||
void AddSolid ( const G4Orb& orb ) {
|
||||
G4VSceneHandler::AddSolid (orb);
|
||||
}
|
||||
void AddSolid ( const G4Ellipsoid& ellipsoid) {
|
||||
G4VSceneHandler::AddSolid (ellipsoid);
|
||||
}
|
||||
void AddSolid ( const G4VSolid& solid );
|
||||
void AddCompound ( const G4VTrajectory& traj) {
|
||||
G4VSceneHandler::AddCompound(traj);
|
||||
@@ -101,6 +107,9 @@ public:
|
||||
void AddCompound ( const G4THitsMap<G4double> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FRSceneFunc.icc 77479 2013-11-25 10:01:22Z gcosmo $
|
||||
// $Id: G4FRSceneFunc.icc 101714 2016-11-22 08:53:13Z gcosmo $
|
||||
//
|
||||
|
||||
#include <CLHEP/Units/PhysicalConstants.h>
|
||||
@@ -201,7 +201,8 @@ void G4FRSCENEHANDLER::AddPrimitive ( const G4Circle& mark_circle )
|
||||
FRBeginModeling();
|
||||
|
||||
//----- send color
|
||||
const G4Color& color = GetColor (mark_circle) ;
|
||||
fpVisAttribs = mark_circle.GetVisAttributes();
|
||||
const G4Color& color = GetColor () ;
|
||||
SendStrDouble3( FR_COLOR_RGB ,
|
||||
color.GetRed (),
|
||||
color.GetGreen(),
|
||||
@@ -256,7 +257,8 @@ void G4FRSCENEHANDLER::AddPrimitive (const G4Square& mark_square )
|
||||
FRBeginModeling();
|
||||
|
||||
//----- send color
|
||||
const G4Color& color = GetColor (mark_square) ;
|
||||
fpVisAttribs = mark_square.GetVisAttributes();
|
||||
const G4Color& color = GetColor () ;
|
||||
SendStrDouble3( FR_COLOR_RGB ,
|
||||
color.GetRed (),
|
||||
color.GetGreen(),
|
||||
@@ -489,6 +491,7 @@ void G4FRSCENEHANDLER::AddSolid( const G4Box& box )
|
||||
if (G4VisManager::GetVerbosity() >= G4VisManager::errors)
|
||||
G4cout << "***** AddSolid ( box )\n";
|
||||
#endif
|
||||
|
||||
//----- skip drawing invisible primitive
|
||||
if( !IsVisible() ) { return ; }
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4FukuiRendererSceneHandler.hh 66373 2012-12-18 09:41:34Z gcosmo $
|
||||
// $Id: G4FukuiRendererSceneHandler.hh 99152 2016-09-07 08:04:30Z gcosmo $
|
||||
//
|
||||
//
|
||||
// Satoshi TANAKA, Fri Jun 28 11:19:19 JST 1996
|
||||
@@ -91,6 +91,12 @@ public:
|
||||
void AddSolid ( const G4Polyhedra& polyhedra) {
|
||||
G4VSceneHandler::AddSolid (polyhedra);
|
||||
}
|
||||
void AddSolid ( const G4Orb& orb ) {
|
||||
G4VSceneHandler::AddSolid (orb);
|
||||
}
|
||||
void AddSolid ( const G4Ellipsoid& ellipsoid) {
|
||||
G4VSceneHandler::AddSolid (ellipsoid);
|
||||
}
|
||||
void AddSolid ( const G4VSolid& solid );
|
||||
void AddCompound ( const G4VTrajectory& traj) {
|
||||
G4VSceneHandler::AddCompound(traj);
|
||||
@@ -104,6 +110,9 @@ public:
|
||||
void AddCompound ( const G4THitsMap<G4double> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
void AddCompound ( const G4THitsMap<G4StatDouble> & hits) {
|
||||
G4VSceneHandler::AddCompound(hits);
|
||||
}
|
||||
|
||||
void ClearTransientStore(); // Used for triggering detector re-drawing.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user