Import Geant4 10.3.0.beta source tree
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VViewer.hh 90651 2015-06-05 13:30:54Z gcosmo $
|
||||
// $Id: G4VViewer.hh 95006 2016-01-15 08:26:18Z gcosmo $
|
||||
//
|
||||
//
|
||||
// John Allison 27th March 1996
|
||||
@@ -98,6 +98,8 @@ public: // With description
|
||||
// It is not yet the end of all drawing; that is signalled by
|
||||
// ShowView ().)
|
||||
|
||||
std::vector<G4ThreeVector> ComputeFlyThrough(G4Vector3D*);
|
||||
|
||||
#ifdef G4MULTITHREADED
|
||||
// In MT mode these functions are called in the following order for each run:
|
||||
// Called on the master thread before starting the vis sub-thread.
|
||||
@@ -194,4 +196,26 @@ void G4VViewer::DrawView () { // Default - concrete view usually overrides.
|
||||
|
||||
*********************************************/
|
||||
|
||||
class G4Spline
|
||||
{
|
||||
public:
|
||||
|
||||
// Constructors and destructor
|
||||
G4Spline();
|
||||
~G4Spline();
|
||||
|
||||
// Operations
|
||||
void AddSplinePoint(const G4Vector3D& v);
|
||||
G4Vector3D GetInterpolatedSplinePoint(float t); // t = 0...1; 0=vp[0] ... 1=vp[max]
|
||||
int GetNumPoints();
|
||||
G4Vector3D GetPoint(int);
|
||||
// method for computing the Catmull-Rom parametric equation
|
||||
// given a time (t) and a vector quadruple (p1,p2,p3,p4).
|
||||
G4Vector3D CatmullRom_Eq(float t, const G4Vector3D& p1, const G4Vector3D& p2,
|
||||
const G4Vector3D& p3, const G4Vector3D& p4);
|
||||
|
||||
private:
|
||||
std::vector<G4Vector3D> vp;
|
||||
float delta_t;
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VVisCommand.hh 83403 2014-08-21 15:07:30Z gcosmo $
|
||||
// $Id: G4VVisCommand.hh 95006 2016-01-15 08:26:18Z gcosmo $
|
||||
|
||||
// Base class for visualization commands - John Allison 9th August 1998
|
||||
// It is really a messenger - we have one command per messenger.
|
||||
@@ -74,6 +74,9 @@ protected:
|
||||
// Data members.
|
||||
static G4VisManager* fpVisManager;
|
||||
|
||||
// Error management
|
||||
static G4int fErrorCode;
|
||||
|
||||
// Current quantities for use in appropriate commands
|
||||
static G4Colour fCurrentColour;
|
||||
//static G4VMarker::FillStyle fCurrentFillStyle; Not yet used.
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ViewParameters.hh 66373 2012-12-18 09:41:34Z gcosmo $
|
||||
// $Id: G4ViewParameters.hh 97316 2016-06-01 12:12:58Z gcosmo $
|
||||
//
|
||||
//
|
||||
// John Allison 19th July 1996
|
||||
@@ -248,6 +248,7 @@ public: // With description
|
||||
void SetBackgroundColour (const G4Colour&);
|
||||
void SetPicking (G4bool);
|
||||
void SetRotationStyle (RotationStyle);
|
||||
void ClearVisAttributesModifiers ();
|
||||
void AddVisAttributesModifier
|
||||
(const G4ModelingParameters::VisAttributesModifier&);
|
||||
|
||||
@@ -262,6 +263,19 @@ public: // With description
|
||||
// Other functions.
|
||||
void PrintDifferences (const G4ViewParameters& v) const;
|
||||
|
||||
// Interpolation
|
||||
// Returns a null pointer when no more to be done. For example:
|
||||
// do {
|
||||
// G4ViewParameters* vp =
|
||||
// G4ViewParameters::CatmullRomCubicSplineInterpolation(viewVector,nInterpolationPoints);
|
||||
// if (!vp) break;
|
||||
// ...
|
||||
// } while (true);
|
||||
// Assumes equal intervals
|
||||
static G4ViewParameters* CatmullRomCubicSplineInterpolation
|
||||
(const std::vector<G4ViewParameters>& views,
|
||||
G4int nInterpolationPoints = 50); // No of interpolations points per interval
|
||||
|
||||
private:
|
||||
|
||||
G4int ParseGeometry ( const char *string, G4int *x, G4int *y, unsigned int *width, unsigned int *height);
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ViewParameters.icc 86974 2014-11-21 11:58:31Z gcosmo $
|
||||
// $Id: G4ViewParameters.icc 97316 2016-06-01 12:12:58Z gcosmo $
|
||||
//
|
||||
//
|
||||
// John Allison 20th October 1996
|
||||
@@ -387,7 +387,6 @@ inline void G4ViewParameters::SetRotationStyle
|
||||
fRotationStyle = style;
|
||||
}
|
||||
|
||||
inline void G4ViewParameters::AddVisAttributesModifier
|
||||
(const G4ModelingParameters::VisAttributesModifier& vam) {
|
||||
fVisAttributesModifiers.push_back(vam);
|
||||
inline void G4ViewParameters::ClearVisAttributesModifiers () {
|
||||
fVisAttributesModifiers.clear ();
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VisCommandsViewer.hh 66373 2012-12-18 09:41:34Z gcosmo $
|
||||
// $Id: G4VisCommandsViewer.hh 97316 2016-06-01 12:12:58Z gcosmo $
|
||||
|
||||
// /vis/viewer commands - John Allison 25th October 1998
|
||||
|
||||
@@ -115,6 +115,18 @@ private:
|
||||
G4UIcmdWithAString* fpCommand;
|
||||
};
|
||||
|
||||
class G4VisCommandViewerClearVisAttributesModifiers: public G4VVisCommandViewer {
|
||||
public:
|
||||
G4VisCommandViewerClearVisAttributesModifiers ();
|
||||
virtual ~G4VisCommandViewerClearVisAttributesModifiers ();
|
||||
G4String GetCurrentValue (G4UIcommand* command);
|
||||
void SetNewValue (G4UIcommand* command, G4String newValue);
|
||||
private:
|
||||
G4VisCommandViewerClearVisAttributesModifiers (const G4VisCommandViewerClearVisAttributesModifiers&);
|
||||
G4VisCommandViewerClearVisAttributesModifiers& operator = (const G4VisCommandViewerClearVisAttributesModifiers&);
|
||||
G4UIcmdWithoutParameter* fpCommand;
|
||||
};
|
||||
|
||||
class G4VisCommandViewerClone: public G4VVisCommandViewer {
|
||||
public:
|
||||
G4VisCommandViewerClone ();
|
||||
@@ -182,6 +194,20 @@ private:
|
||||
G4UIcmdWithAString* fpCommand;
|
||||
};
|
||||
|
||||
#ifndef WIN32
|
||||
class G4VisCommandViewerInterpolate: public G4VVisCommandViewer {
|
||||
public:
|
||||
G4VisCommandViewerInterpolate ();
|
||||
virtual ~G4VisCommandViewerInterpolate ();
|
||||
G4String GetCurrentValue (G4UIcommand* command);
|
||||
void SetNewValue (G4UIcommand* command, G4String newValue);
|
||||
private:
|
||||
G4VisCommandViewerInterpolate (const G4VisCommandViewerInterpolate&);
|
||||
G4VisCommandViewerInterpolate& operator = (const G4VisCommandViewerInterpolate&);
|
||||
G4UIcommand* fpCommand;
|
||||
};
|
||||
#endif
|
||||
|
||||
class G4VisCommandViewerList: public G4VVisCommandViewer {
|
||||
public:
|
||||
G4VisCommandViewerList ();
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VisExecutive.icc 91686 2015-07-31 09:40:08Z gcosmo $
|
||||
// $Id: G4VisExecutive.icc 96765 2016-05-04 13:28:37Z gcosmo $
|
||||
//
|
||||
//
|
||||
// John Allison 24th January 1998.
|
||||
@@ -197,6 +197,10 @@ G4VisExecutive::RegisterGraphicsSystems () {
|
||||
#ifdef G4VIS_USE_OPENGLQT
|
||||
ogliwin32->AddNickname("OGLIQt_FALLBACK");
|
||||
oglswin32->AddNickname("OGLSQt_FALLBACK");
|
||||
#else
|
||||
ogliwin32->AddNickname("OGLI");
|
||||
oglswin32->AddNickname("OGL");
|
||||
oglswin32->AddNickname("OGLS");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -235,16 +239,18 @@ G4VisExecutive::RegisterModelFactories()
|
||||
{
|
||||
// Trajectory draw models
|
||||
RegisterModelFactory(new G4TrajectoryGenericDrawerFactory());
|
||||
RegisterModelFactory(new G4TrajectoryDrawByAttributeFactory());
|
||||
RegisterModelFactory(new G4TrajectoryDrawByChargeFactory());
|
||||
RegisterModelFactory(new G4TrajectoryDrawByOriginVolumeFactory());
|
||||
RegisterModelFactory(new G4TrajectoryDrawByParticleIDFactory());
|
||||
RegisterModelFactory(new G4TrajectoryDrawByOriginVolumeFactory());
|
||||
RegisterModelFactory(new G4TrajectoryDrawByAttributeFactory());
|
||||
RegisterModelFactory(new G4TrajectoryDrawByTouchedVolumeFactory());
|
||||
|
||||
// Trajectory filter models
|
||||
RegisterModelFactory(new G4TrajectoryChargeFilterFactory());
|
||||
RegisterModelFactory(new G4TrajectoryParticleFilterFactory());
|
||||
RegisterModelFactory(new G4TrajectoryOriginVolumeFilterFactory());
|
||||
RegisterModelFactory(new G4TrajectoryAttributeFilterFactory());
|
||||
RegisterModelFactory(new G4TrajectoryChargeFilterFactory());
|
||||
RegisterModelFactory(new G4TrajectoryOriginVolumeFilterFactory());
|
||||
RegisterModelFactory(new G4TrajectoryParticleFilterFactory());
|
||||
RegisterModelFactory(new G4TrajectoryTouchedVolumeFilterFactory());
|
||||
|
||||
// Hit filter models
|
||||
RegisterModelFactory(new G4HitAttributeFilterFactory());
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VisManager.hh 93026 2015-09-30 16:07:07Z gcosmo $
|
||||
// $Id: G4VisManager.hh 97316 2016-06-01 12:12:58Z gcosmo $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -80,6 +80,11 @@
|
||||
#ifndef G4VISMANAGER_HH
|
||||
#define G4VISMANAGER_HH
|
||||
|
||||
// Temporary definition until Xeon Phi can handle full C++11.
|
||||
#ifndef __MIC__
|
||||
#define G4VIS_USE_STD11
|
||||
#endif
|
||||
|
||||
#include "G4VVisManager.hh"
|
||||
|
||||
#include "globals.hh"
|
||||
|
||||
Reference in New Issue
Block a user