Changeset 932 for trunk


Ignore:
Timestamp:
Feb 26, 2009, 12:23:33 PM (15 years ago)
Author:
garnier
Message:

John update

Location:
trunk/source/graphics_reps
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/graphics_reps/History

    r921 r932  
    1 cvs log $Id: History,v 1.133 2008/11/13 09:07:31 gcosmo Exp $
     1cvs log $Id: History,v 1.135 2009/02/25 14:13:43 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2025th February 2009  John Allison  (greps-V09-02-01)
     21- G4VVisManager: Added NotifyHandlers.
     22  Notify scene handlers (G4VGraphicsScene objects) that the scene
     23  has changed so that they may rebuild their graphics database, if
     24  any, and redraw all views.
     25
     2624th February 2009  John Allison  (greps-V09-02-00)
     27- G4VMarker:
     28  o Added enum SizeType {none, world, screen};
     29  o Added GetSizeType and SetSize/Diameter/Radius(SizeType, G4double).
    1930
    203113th November 2008  Gabriele Cosmo  (greps-V09-01-06)

  • trunk/source/graphics_reps/include/G4PolyhedronArbitrary.hh

    r830 r932  
    1818// * This  code  implementation is the result of  the  scientific and *
    1919// * technical work of the GEANT4 collaboration and of QinetiQ Ltd,   *
    20 // * subject DEFCON 705 IPR conditions.                               *
     20// * subject to DEFCON 705 IPR conditions.                            *
    2121// * By using,  copying,  modifying or  distributing the software (or *
    2222// * any work based  on the software)  you  agree  to acknowledge its *
    … …  
    2424// * acceptance of all terms of the Geant4 Software license.          *
    2525// ********************************************************************
     26//
    2627//
    2728// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/source/graphics_reps/include/G4VMarker.hh

    r850 r932  
    2525//
    2626//
    27 // $Id: G4VMarker.hh,v 1.12 2006/06/29 19:06:14 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4VMarker.hh,v 1.13 2009/02/24 10:58:04 allison Exp $
     28// GEANT4 tag $Name: greps-V09-02-00 $
    2929//
    3030//
    … …  
    9797
    9898  enum FillStyle {noFill, hashed, filled};
     99  enum SizeType {none, world, screen};
    99100
    100101  //////////////////////////////////////////////////////
    … …  
    114115  // Get functions...
    115116  G4Point3D GetPosition       () const;
     117  SizeType  GetSizeType       () const;
    116118  G4double  GetWorldSize      () const;
    117119  G4double  GetWorldDiameter  () const;
    … …  
    125127  // Set functions...
    126128  void SetPosition       (const G4Point3D&);
     129  void SetSize           (SizeType, G4double);
     130  void SetDiameter       (SizeType, G4double);
     131  void SetRadius         (SizeType, G4double);
    127132  void SetWorldSize      (G4double);
    128133  void SetWorldDiameter  (G4double);

  • trunk/source/graphics_reps/include/G4VMarker.icc

    r850 r932  
    2525//
    2626//
    27 // $Id: G4VMarker.icc,v 1.7 2006/06/29 19:06:16 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4VMarker.icc,v 1.8 2009/02/24 10:58:04 allison Exp $
     28// GEANT4 tag $Name: greps-V09-02-00 $
    2929//
    3030//
    … …  
    6666}
    6767
     68inline void G4VMarker::SetDiameter (SizeType sizeType, G4double size) {
     69  SetSize(sizeType, size);
     70}
     71
     72inline void G4VMarker::SetRadius (SizeType sizeType, G4double size) {
     73  SetSize(sizeType, 2. * size);
     74}
     75
    6876inline void G4VMarker::SetWorldSize (G4double ws) {
    6977  fWorldSize = ws;
    … …  
    97105}
    98106
     107inline const G4String& G4VMarker::GetInfo() const {return fInfo;}
    99108
     109inline void G4VMarker::SetInfo(const G4String& info) {fInfo = info;}

  • trunk/source/graphics_reps/include/G4VVisManager.hh

    r850 r932  
    2525//
    2626//
    27 // $Id: G4VVisManager.hh,v 1.14 2008/01/04 22:20:59 allison Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4VVisManager.hh,v 1.15 2009/02/25 14:13:43 allison Exp $
     28// GEANT4 tag $Name: $
    2929// John Allison 19/Oct/1996.
    3030//
    … …  
    189189  // This is used by the run manager to notify a change of geometry.
    190190
     191  virtual void NotifyHandlers () {}
     192  // Notify scene handlers (G4VGraphicsScene objects) that the scene
     193  // has changed so that they may rebuild their graphics database, if
     194  // any, and redraw all views.
     195
    191196  virtual void DispatchToModel(const G4VTrajectory&, G4int i_mode = 0) = 0;
    192197  // Draw the trajectory.

  • trunk/source/graphics_reps/src/G4PolyhedronArbitrary.cc

    r830 r932  
    1818// * This  code  implementation is the result of  the  scientific and *
    1919// * technical work of the GEANT4 collaboration and of QinetiQ Ltd,   *
    20 // * subject DEFCON 705 IPR conditions.                               *
     20// * subject to DEFCON 705 IPR conditions.                            *
    2121// * By using,  copying,  modifying or  distributing the software (or *
    2222// * any work based  on the software)  you  agree  to acknowledge its *
    … …  
    2424// * acceptance of all terms of the Geant4 Software license.          *
    2525// ********************************************************************
     26//
    2627//
    2728// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

  • trunk/source/graphics_reps/src/G4VMarker.cc

    r850 r932  
    2525//
    2626//
    27 // $Id: G4VMarker.cc,v 1.11 2006/06/29 19:07:21 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4VMarker.cc,v 1.12 2009/02/24 10:58:04 allison Exp $
     28// GEANT4 tag $Name: greps-V09-02-00 $
    2929//
    3030//
    … …  
    8686}
    8787
    88 const G4String& G4VMarker::GetInfo() const { return fInfo ;}
     88G4VMarker::SizeType G4VMarker::GetSizeType () const {
     89  SizeType type = none;
     90  if (fWorldSize) type = world;
     91  else if (fScreenSize) type = screen;
     92  return type;
     93}
    8994
    90 void G4VMarker::SetInfo( const G4String& info ){ fInfo = info ;}
    91 
     95void G4VMarker::SetSize (SizeType sizeType, G4double size) {
     96  fWorldSize = fScreenSize = 0.;
     97  if (sizeType == world) fWorldSize = size;
     98  else if (sizeType == screen) fScreenSize = size;
     99}

  • trunk/source/graphics_reps/src/G4VVisManager.cc

    r850 r932  
    4040G4VVisManager* G4VVisManager::GetConcreteInstance ()
    4141{
     42  printf("G4VVisManager::GetConcreteInstance %d\n",fpConcreteInstance);
    4243  return fpConcreteInstance;
    4344}
Note: See TracChangeset for help on using the changeset viewer.