Ignore:
Timestamp:
Jun 1, 2010, 6:36:22 PM (14 years ago)
Author:
garnier
Message:

update from CVS

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/management/include/G4VisManager.hh

    r1274 r1288  
    2525//
    2626//
    27 // $Id: G4VisManager.hh,v 1.71 2010/05/20 07:54:31 allison Exp $
     27// $Id: G4VisManager.hh,v 1.75 2010/06/01 16:08:15 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    6666//
    6767// Each scene comprises drawable objects such as detector components
    68 // and hits when appropriate.  A scene handler translates a scene into
    69 // graphics-system-specific function calls and, possibly, a
    70 // graphics-system-dependent database - display lists, scene graphs,
    71 // etc.  Each viewer has its "view parameters" (see class description
    72 // of G4ViewParameters for available parameters and also for a
    73 // description of the concept of a "standard view" and all that).
     68// and trajectories, hits and digis when appropriate.  A scene handler
     69// translates a scene into graphics-system-specific function calls
     70// and, possibly, a graphics-system-dependent database - display
     71// lists, scene graphs, etc.  Each viewer has its "view parameters"
     72// (see class description of G4ViewParameters for available parameters
     73// and also for a description of the concept of a "standard view" and
     74// all that).
    7475//
    7576// A friend class G4VisStateDependent is "state dependent", i.e., it
    7677// is notified on change of state (G4ApplicationState).  This is used
    77 // to message the G4VisManager to draw hits and trajectories in the
    78 // current scene at the end of event, as required.
     78// to message the G4VisManager to draw hits, digis and trajectories in
     79// the current scene at the end of event, as required.
    7980
    8081#ifndef G4VISMANAGER_HH
    … …  
    113114  typedef G4VModelFactory< G4VFilter<G4VTrajectory> > G4TrajFilterFactory;
    114115  typedef G4VModelFactory< G4VFilter<G4VHit> > G4HitFilterFactory;
     116  typedef G4VModelFactory< G4VFilter<G4VDigi> > G4DigiFilterFactory;
    115117}
    116118
    … …  
    129131  friend class G4RayTracerSceneHandler;
    130132  friend class G4RTMessenger;
    131   friend class G4OpenGLStoredSceneHandler;
    132133  friend class G4OpenGLViewerMessenger;
    133   friend class G4OpenGLXViewerMessenger;
    134134  friend class G4OpenGLXmViewerMessenger;
    135   friend class G4XXXSceneHandler;
    136135  friend class G4HepRepFileSceneHandler;
    137136
    … …  
    139138  friend class G4VSceneHandler;
    140139  friend class G4VViewer;
    141 
    142   friend std::ostream & operator <<
    143   (std::ostream &, const G4VGraphicsSystem &);
    144 
    145   friend std::ostream & operator <<
    146   (std::ostream &, const G4VSceneHandler &);
    147 
    148140  friend class G4VisStateDependent;
    149 
    150141  friend class G4VisCommandList;
     142
     143  // operator << friends...
     144  friend std::ostream& operator << (std::ostream&, const G4VGraphicsSystem&);
     145  friend std::ostream& operator << (std::ostream&, const G4VSceneHandler&);
    151146
    152147public: // With description
    … …  
    165160protected: // With description
    166161
    167   G4VisManager ();
     162  G4VisManager (const G4String& verbosityString = "warnings");
    168163  // The constructor is protected so that an object of the derived
    169164  // class may be constructed.
    … …  
    214209  void RegisterModel(G4VFilter<G4VHit>* filter);
    215210  // Register trajectory hit model. Assumes ownership of model.
     211
     212  void RegisterModelFactory(G4DigiFilterFactory* factory);
     213  // Register trajectory digi model factory. Assumes ownership of factory.
     214
     215  void RegisterModel(G4VFilter<G4VDigi>* filter);
     216  // Register trajectory digi model. Assumes ownership of model.
    216217
    217218  void SelectTrajectoryModel(const G4String& model);
    … …  
    281282  void Draw (const G4VHit&);
    282283
     284  void Draw (const G4VDigi&);
     285
    283286  void Draw (const G4VTrajectory&, G4int i_mode);
    284287  // i_mode is a parameter that can be used to control the drawing of
    … …  
    306309  // any, and redraw all views.
    307310
     311  void DispatchToModel(const G4VTrajectory&);
    308312  void DispatchToModel(const G4VTrajectory&, G4int i_mode);
    309313  // Draw the trajectory.
    … …  
    311315  G4bool FilterTrajectory(const G4VTrajectory&);
    312316  G4bool FilterHit(const G4VHit&);
     317  G4bool FilterDigi(const G4VDigi&);
    313318
    314319  ////////////////////////////////////////////////////////////////////////
    … …  
    329334  void EndOfEvent ();
    330335  // This is called on change of state (G4ApplicationState).  It is
    331   // used to draw hits and trajectories if included in the current
    332   // scene at the end of event, as required.
     336  // used to draw hits, digis and trajectories if included in the
     337  // current scene at the end of event, as required.
    333338
    334339  void EndOfRun ();
    … …  
    357362  const G4SceneHandlerList&    GetAvailableSceneHandlers   () const;
    358363  const G4SceneList&           GetSceneList                () const;
    359   Verbosity                    GetVerbosity                () const;
     364  static Verbosity             GetVerbosity                ();
    360365  G4bool                       GetTransientsDrawnThisRun       () const;
    361366  G4bool                       GetTransientsDrawnThisEvent     () const;
    … …  
    445450  G4SceneList           fSceneList;
    446451  G4SceneHandlerList    fAvailableSceneHandlers;
    447   Verbosity             fVerbosity;
     452  static Verbosity             fVerbosity;
    448453  std::vector<G4UImessenger*> fMessengerList;
    449454  std::vector<G4UIcommand*>   fDirectoryList;
    … …  
    467472  G4VisFilterManager<G4VHit>* fpHitFilterMgr;
    468473
     474  // Digi filter model manager
     475  G4VisFilterManager<G4VDigi>* fpDigiFilterMgr;
     476
    469477};
    470478
Note: See TracChangeset for help on using the changeset viewer.