Ignore:
Timestamp:
May 20, 2010, 11:49:26 AM (16 years ago)
Author:
garnier
Message:

cvs update

Location:
trunk/source/visualization/modeling/include
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/modeling/include/G4ModelingParameters.hh

    r954 r1258  
    2525//
    2626//
    27 // $Id: G4ModelingParameters.hh,v 1.17 2006/11/14 14:42:08 allison Exp $
     27// $Id: G4ModelingParameters.hh,v 1.18 2010/05/11 11:13:35 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    4444class G4VPhysicalVolume;
    4545class G4VisAttributes;
    46 class G4Polyhedron;
     46class G4VSolid;
    4747class G4Event;
    4848
    … …  
    9292  const G4Point3D& GetExplodeCentre              () const;
    9393  G4int            GetNoOfSides                  () const;
    94   const G4Polyhedron* GetSectionPolyhedron       () const;
    95   const G4Polyhedron* GetCutawayPolyhedron       () const;
     94  G4VSolid*        GetSectionSolid               () const;
     95  G4VSolid*        GetCutawaySolid               () const;
    9696  const G4Event*   GetEvent                      () const;
    9797
    … …  
    108108  void SetExplodeCentre        (const G4Point3D& explodeCentre);
    109109  G4int SetNoOfSides           (G4int);  // Returns actual number set.
    110   void SetSectionPolyhedron    (const G4Polyhedron* pSectionPolyhedron);
    111   void SetCutawayPolyhedron    (const G4Polyhedron* pCutawayPolyhedron);
     110  void SetSectionSolid         (G4VSolid* pSectionSolid);
     111  void SetCutawaySolid         (G4VSolid* pCutawaySolid);
    112112  void SetEvent                (const G4Event* pEvent);
    113113
    … …  
    126126  G4Point3D    fExplodeCentre;   // ...about this centre.
    127127  G4int        fNoOfSides;       // ...if polygon approximates circle.
    128   const G4Polyhedron* fpSectionPolyhedron;  // For generic section (DCUT).
    129   const G4Polyhedron* fpCutawayPolyhedron;  // For generic cutaways.
     128  G4VSolid*    fpSectionSolid;   // For generic section (DCUT).
     129  G4VSolid*    fpCutawaySolid;   // For generic cutaways.
    130130  const G4Event* fpEvent;        // Event being processed.
    131131};

  • trunk/source/visualization/modeling/include/G4ModelingParameters.icc

    r954 r1258  
    2525//
    2626//
    27 // $Id: G4ModelingParameters.icc,v 1.11 2006/11/14 14:42:08 allison Exp $
     27// $Id: G4ModelingParameters.icc,v 1.12 2010/05/11 11:13:35 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    8282}
    8383
    84 inline const G4Polyhedron* G4ModelingParameters::GetSectionPolyhedron () const
    85 {return fpSectionPolyhedron;}
     84inline G4VSolid* G4ModelingParameters::GetSectionSolid () const
     85{return fpSectionSolid;}
    8686
    87 inline const G4Polyhedron* G4ModelingParameters::GetCutawayPolyhedron () const
    88 {return fpCutawayPolyhedron;}
     87inline G4VSolid* G4ModelingParameters::GetCutawaySolid () const
     88{return fpCutawaySolid;}
    8989
    9090inline const G4Event* G4ModelingParameters::GetEvent () const
    … …  
    131131}
    132132
    133 inline void G4ModelingParameters::SetSectionPolyhedron
    134 (const G4Polyhedron* pSectionPolyhedron) {
    135   fpSectionPolyhedron = pSectionPolyhedron;
    136 }
    137 
    138 inline void G4ModelingParameters::SetCutawayPolyhedron
    139 (const G4Polyhedron* pCutawayPolyhedron) {
    140   fpCutawayPolyhedron = pCutawayPolyhedron;
    141 }
    142 
    143133inline void G4ModelingParameters::SetEvent(const G4Event* pEvent) {
    144134  fpEvent = pEvent;

  • trunk/source/visualization/modeling/include/G4PhysicalVolumeModel.hh

    r1140 r1258  
    2525//
    2626//
    27 // $Id: G4PhysicalVolumeModel.hh,v 1.35 2009/10/10 14:29:59 allison Exp $
     27// $Id: G4PhysicalVolumeModel.hh,v 1.36 2010/05/11 11:16:51 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    6262class G4Material;
    6363class G4VisAttributes;
    64 class G4Polyhedron;
    6564class G4AttDef;
    6665class G4AttValue;
    … …  
    137136  G4int GetRequestedDepth () const {return fRequestedDepth;}
    138137
    139   const G4Polyhedron* GetClippingPolyhedron () const
    140   {return fpClippingPolyhedron;}
     138  const G4VSolid* GetClippingSolid () const
     139  {return fpClippingSolid;}
    141140
    142141  G4int GetCurrentDepth() const {return fCurrentDepth;}
    … …  
    182181  }
    183182
    184   void SetClippingPolyhedron (const G4Polyhedron* pClippingPolyhedron) {
    185     fpClippingPolyhedron = pClippingPolyhedron;
     183  void SetClippingSolid (G4VSolid* pClippingSolid) {
     184    fpClippingSolid = pClippingSolid;
    186185  }
    187186
    … …  
    234233  std::vector<G4PhysicalVolumeNodeID> fDrawnPVPath;
    235234  G4bool             fCurtailDescent;// Can be set to curtail descent.
    236   const G4Polyhedron*fpClippingPolyhedron;
     235  G4VSolid*          fpClippingSolid;
    237236  ClippingMode       fClippingMode;
    238237

  • trunk/source/visualization/modeling/include/G4TrajectoriesModel.hh

    r954 r1258  
    2525//
    2626//
    27 // $Id: G4TrajectoriesModel.hh,v 1.10 2006/10/26 11:10:23 allison Exp $
     27// $Id: G4TrajectoriesModel.hh,v 1.11 2010/05/11 11:21:52 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    5050public: // With description
    5151
    52   G4TrajectoriesModel (G4int drawingMode = 0);
    53    
     52  G4TrajectoriesModel ();
     53  G4TrajectoriesModel (G4int drawingMode);
     54
    5455  virtual ~G4TrajectoriesModel ();
    5556
    … …  
    5758  // The main task of a model is to describe itself to the graphics scene.
    5859
    59   G4int GetDrawingMode() const { return fDrawingMode;}
    60   void SetDrawingMode(G4int drawingMode) {fDrawingMode = drawingMode;}
     60  G4bool IsDrawingModeSet() const;
     61  G4int GetDrawingMode() const;
     62  void SetDrawingMode(G4int drawingMode);
    6163
    6264  const G4VTrajectory* GetCurrentTrajectory() const
    … …  
    6567private:
    6668
     69  G4bool fDrawingModeSet;
    6770  G4int fDrawingMode;
    6871  const G4VTrajectory* fpCurrentTrajectory;

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByAttribute.hh

    r954 r1258  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryDrawByAttribute.hh,v 1.1 2006/09/11 21:52:18 tinslay Exp $
     26// $Id: G4TrajectoryDrawByAttribute.hh,v 1.2 2010/05/11 11:31:31 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    5151  virtual ~G4TrajectoryDrawByAttribute();
    5252
    53   // Draw the trajectory with optional i_mode parameter
    54   virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     53  // Draw the trajectory
     54  virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     55                    const G4bool& visible = true) const;
     56  virtual void Draw(const G4VTrajectory& trajectory,
    5557                    const G4bool& visible = true) const;
    5658

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByCharge.hh

    r954 r1258  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryDrawByCharge.hh,v 1.7 2006/06/29 21:31:49 gunter Exp $
     26// $Id: G4TrajectoryDrawByCharge.hh,v 1.8 2010/05/11 11:31:31 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    5757  virtual ~G4TrajectoryDrawByCharge();
    5858
    59   // Draw the trajectory with optional i_mode parameter
    60   virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     59  // Draw method
     60  virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     61                    const G4bool& visible = true) const;
     62  virtual void Draw(const G4VTrajectory& trajectory,
    6163                    const G4bool& visible = true) const;
    6264

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByOriginVolume.hh

    r954 r1258  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryDrawByOriginVolume.hh,v 1.4 2006/06/29 21:31:51 gunter Exp $
     26// $Id: G4TrajectoryDrawByOriginVolume.hh,v 1.5 2010/05/11 11:31:31 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    5050  virtual ~G4TrajectoryDrawByOriginVolume();
    5151
    52   virtual void Draw(const G4VTrajectory&, const G4int& i_mode = 0,
     52  // Draw method
     53  virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
    5354                    const G4bool& visible = true) const;
    54   // Draw the trajectory with optional i_mode parameter
    55 
     55  virtual void Draw(const G4VTrajectory& trajectory,
     56                    const G4bool& visible = true) const;
     57 
    5658  virtual void Print(std::ostream& ostr) const;
    5759  // Print configuration

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawByParticleID.hh

    r954 r1258  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryDrawByParticleID.hh,v 1.7 2006/06/29 21:31:53 gunter Exp $
     26// $Id: G4TrajectoryDrawByParticleID.hh,v 1.8 2010/05/11 11:31:31 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    5151  virtual ~G4TrajectoryDrawByParticleID();
    5252
    53   virtual void Draw(const G4VTrajectory&, const G4int&i_mode = 0,
     53  // Draw method
     54  virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
    5455                    const G4bool& visible = true) const;
    55   // Draw the trajectory with optional i_mode parameter
    56 
     56  virtual void Draw(const G4VTrajectory& trajectory,
     57                    const G4bool& visible = true) const;
     58 
    5759  virtual void Print(std::ostream& ostr) const;
    5860  // Print configuration

  • trunk/source/visualization/modeling/include/G4TrajectoryDrawerUtils.hh

    r954 r1258  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryDrawerUtils.hh,v 1.7 2007/05/30 08:56:55 allison Exp $
     26// $Id: G4TrajectoryDrawerUtils.hh,v 1.9 2010/05/11 11:58:18 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    4949                 G4Polymarker& auxiliaryPoints, G4Polymarker& stepPoints);
    5050
     51  /***
    5152  // Draw trajectory line and points
    5253  void DrawLineAndPoints(const G4VTrajectory& traj, const G4int& i_mode,
    5354                         const G4Colour& cfg, const G4bool& visible);
     55  ***/
    5456
    5557  // Draw trajectory line and points using G4VisTrajContext object information
    56   void DrawLineAndPoints(const G4VTrajectory& traj, const G4VisTrajContext&, const G4int& i_mode=0);
     58  void DrawLineAndPoints(const G4VTrajectory& traj, const G4VisTrajContext&, const G4int& i_mode);
     59
     60  // Draw trajectory line and points using G4VisTrajContext object information
     61  void DrawLineAndPoints(const G4VTrajectory& traj, const G4VisTrajContext&);
    5762
    5863}

  • trunk/source/visualization/modeling/include/G4TrajectoryGenericDrawer.hh

    r954 r1258  
    2424// ********************************************************************
    2525//
    26 // $Id: G4TrajectoryGenericDrawer.hh,v 1.2 2006/06/29 21:31:59 gunter Exp $
     26// $Id: G4TrajectoryGenericDrawer.hh,v 1.3 2010/05/11 11:31:31 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    4848  virtual ~G4TrajectoryGenericDrawer();
    4949
    50   virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     50  virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     51                    const G4bool& visible = true) const;
     52  virtual void Draw(const G4VTrajectory& trajectory,
    5153                    const G4bool& visible = true) const;
    5254  // Draw the trajectory with optional i_mode parameter

  • trunk/source/visualization/modeling/include/G4VTrajectoryModel.hh

    r954 r1258  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VTrajectoryModel.hh,v 1.7 2006/08/14 11:43:34 allison Exp $
     26// $Id: G4VTrajectoryModel.hh,v 1.8 2010/05/11 11:31:31 allison Exp $
    2727// GEANT4 tag $Name:  $
    2828//
    … …  
    5454 
    5555  // Draw method
    56   virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     56  virtual void Draw(const G4VTrajectory& trajectory, const G4int& i_mode = 0,
     57                    const G4bool& visible = true) const = 0;
     58  virtual void Draw(const G4VTrajectory& trajectory,
    5759                    const G4bool& visible = true) const = 0;
    5860 
Note: See TracChangeset for help on using the changeset viewer.