Changeset 1293


Ignore:
Timestamp:
Jun 2, 2010, 10:23:13 AM (14 years ago)
Author:
garnier
Message:

CVS update

Location:
trunk/source
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/graphics_reps/History

    r1257 r1293  
    1 cvs log $Id: History,v 1.139 2010/05/07 16:06:18 allison Exp $
     1cvs log $Id: History,v 1.141 2010/05/30 11:15:52 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2030th May 2010  John Allison  (greps-V09-03-02)
     21- G4VVisManager: Added Draw(const G4VDigi&) and FilterDigi(const G4VDigi&).
     22- G4VGraphicsScene: Added AddCompound (const G4VDigi&).
     23
     2429th May 2010  John Allison  (greps-V09-03-01)
     25- G4VVisManager:
     26  o Removed IsDefaultDrawTrajectory.  A better way is...
     27  o Added DispatchToModel(const G4VTrajectory&), i.e., without i_mode, to
     28    distinguish usage and in preparation for i_mode migration.
    1929
    20307th May 2010  John Allison  (greps-V09-03-00)

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

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4VGraphicsScene.hh,v 1.12 2009/10/21 15:36:22 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4VGraphicsScene.hh,v 1.13 2010/05/30 11:15:36 allison Exp $
     28// GEANT4 tag $Name: $
    2929// John Allison  19th July 1996
    3030//
    … …  
    5757class G4VTrajectory;
    5858class G4VHit;
     59class G4VDigi;
    5960template <typename T> class G4THitsMap;
    6061class G4Polyline;
    … …  
    116117  virtual void AddCompound (const G4VTrajectory&)        = 0;
    117118  virtual void AddCompound (const G4VHit&)               = 0;
     119  virtual void AddCompound (const G4VDigi&)              = 0;
    118120  virtual void AddCompound (const G4THitsMap<G4double>&) = 0;
    119121

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

    r1257 r1293  
    2525//
    2626//
    27 // $Id: G4VVisManager.hh,v 1.16 2010/05/07 16:05:56 allison Exp $
     27// $Id: G4VVisManager.hh,v 1.18 2010/05/30 11:15:36 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929// John Allison 19/Oct/1996.
    … …  
    8787class G4VSolid;
    8888class G4VHit;
     89class G4VDigi;
    8990class G4VTrajectory;
    9091class G4LogicalVolume;
    … …  
    168169  virtual void Draw (const G4VHit&) = 0;
    169170
     171  virtual void Draw (const G4VDigi&) = 0;
     172
    170173  virtual void Draw (const G4VTrajectory&, G4int i_mode = 0) = 0;
    171174  // i_mode is a parameter that can be used to control the drawing of
    … …  
    194197  // any, and redraw all views.
    195198
    196   virtual void DispatchToModel(const G4VTrajectory&, G4int i_mode = 0) = 0;
     199  virtual void DispatchToModel(const G4VTrajectory&) = 0;
     200  virtual void DispatchToModel(const G4VTrajectory&, G4int i_mode) = 0;
    197201  // Draw the trajectory.
    198202
    … …  
    203207  // Hit filter
    204208
     209  virtual G4bool FilterDigi(const G4VDigi&) = 0;
     210  // Digi filter
     211
    205212protected:
    206213
    … …  
    208215
    209216  static G4VVisManager* fpConcreteInstance;  // Pointer to real G4VisManager.
    210 
    211 public:
    212 
    213   static G4bool IsDefaultDrawTrajectory;
    214 
    215217};
    216218

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

    r1257 r1293  
    2525//
    2626//
    27 // $Id: G4VVisManager.cc,v 1.5 2010/05/07 16:05:56 allison Exp $
     27// $Id: G4VVisManager.cc,v 1.6 2010/05/29 21:35:16 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    4747  fpConcreteInstance = m;
    4848}
    49 
    50 G4bool G4VVisManager::IsDefaultDrawTrajectory = true;

  • trunk/source/intercoms/History

    r1256 r1293  
    1 $Id: History,v 1.79 2010/05/19 14:50:30 lgarnier Exp $
     1$Id: History,v 1.80 2010/05/20 07:22:53 kmura Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
    20 19 May 2010 L. Garnier
     2019 May 2010 L. Garnier (intercoms-V09-03-01)
    2121 - G4UIManager : Add field to get GUI Window session
    2222

  • trunk/source/interfaces/History

    r1278 r1293  
    1 $Id: History,v 1.138 2010/05/28 09:14:41 lgarnier Exp $
     1$Id: History,v 1.139 2010/06/01 15:43:30 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
     201st June, L. Garnier
     21 - G4UIQt : warning on Qt version < 4.5
     22
    202328 May, L. Garnier
    2124 - G4UIQt : Bug fix when compiling on windows

  • trunk/source/interfaces/basic/include/G4UIQt.hh

    r1284 r1293  
    2525//
    2626//
    27 // $Id: G4UIQt.hh,v 1.20 2010/05/19 07:18:50 lgarnier Exp $
     27// $Id: G4UIQt.hh,v 1.21 2010/06/01 15:43:30 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/interfaces/basic/src/G4UIQt.cc

    r1283 r1293  
    2525//
    2626//
    27 // $Id: G4UIQt.cc,v 1.39 2010/05/28 13:14:18 lgarnier Exp $
     27// $Id: G4UIQt.cc,v 1.40 2010/06/01 15:43:30 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/tracking/History

    r1228 r1293  
    1 $Id: History,v 1.137 2009/11/24 10:04:14 perl Exp $
    2 $Name: geant4-09-03 $
     1$Id: History,v 1.141 2010/05/29 21:31:28 allison Exp $
     2$Name: tracking-V09-03-03 $
    33-------------------------------------------------------------------
    44
    … …  
    1818     * Reverse chronological order (last date on top), please *
    1919     ----------------------------------------------------------
     20
     2129 May 2010 John Allison (tracking-V09-03-03)
     22- G4VTrajectory:
     23  o Added virtual void DrawTrajectory() in preparation for i_mode migration.
     24- G4Trajectory and G4SmoothTrajectory: followed the above.
     25  o (G4RichTrajectory inherits G4Trajectory so no need to change.)
     26
     2728 May 2010 John Allison (tracking-V09-03-02)
     28- G4VTrajectory.cc: Added explicit once-only i_mode deprecation warning.
     29
     3013 May 2010 John Allison (tracking-V09-03-01 - needs greps-V09-03-00)
     31- G4VTrajectory.cc: Added a statement to set IsDefaultDrawTrajectory,
     32  to assist deprecation of i-mode trajectory drawing parameter.  After
     33  10.0, it can be removed.
     34
     3522 Feb 2010 John Allison (tracking-V09-03-00)
     36- G4RichTrajectory: Fixed bug in MergeTrajectory (should not invoke
     37  G4Trajectory::MergeTrajectory).
     38- G4RichTrajectory and G4RichTrajectoryPoint:
     39  o Eliminated spaces in G4AttValue values.
     40  o G4AttValue values are "None" for attributes derived from zero pointers.
    2041
    214224 Nov 2009 Joseph Perl (tracking-V09-02-07)

  • trunk/source/tracking/include/G4SmoothTrajectory.hh

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4SmoothTrajectory.hh,v 1.12 2009/11/12 09:09:56 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4SmoothTrajectory.hh,v 1.13 2010/05/29 21:31:03 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    102102// Other member functions
    103103   virtual void ShowTrajectory(std::ostream& os=G4cout) const;
    104    virtual void DrawTrajectory(G4int i_mode=0) const;
     104   virtual void DrawTrajectory() const;
     105   virtual void DrawTrajectory(G4int i_mode) const;
    105106   virtual void AppendStep(const G4Step* aStep);
    106107   virtual int GetPointEntries() const { return positionRecord->size(); }

  • trunk/source/tracking/include/G4Trajectory.hh

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4Trajectory.hh,v 1.25 2009/11/12 09:09:56 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4Trajectory.hh,v 1.26 2010/05/29 21:31:03 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    108108// Other member functions
    109109   virtual void ShowTrajectory(std::ostream& os=G4cout) const;
    110    virtual void DrawTrajectory(G4int i_mode=0) const;
     110   virtual void DrawTrajectory() const;
     111   virtual void DrawTrajectory(G4int i_mode) const;
    111112   virtual void AppendStep(const G4Step* aStep);
    112113   virtual int GetPointEntries() const { return positionRecord->size(); }

  • trunk/source/tracking/include/G4VTrajectory.hh

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4VTrajectory.hh,v 1.17 2006/06/29 21:15:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4VTrajectory.hh,v 1.18 2010/05/29 21:31:03 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030//---------------------------------------------------------------
    … …  
    9090   // the user needs to follow with new-line or end-of-string,
    9191   // depending on the nature of os.
    92    virtual void DrawTrajectory(G4int i_mode=0) const;
     92   virtual void DrawTrajectory() const;
     93   virtual void DrawTrajectory(G4int i_mode) const;
    9394   // Draw the trajectory.  A default implementation in this base
    9495   // class may be used or may be overridden in the concrete class.

  • trunk/source/tracking/src/G4RichTrajectory.cc

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4RichTrajectory.cc,v 1.8 2009/11/24 10:04:14 perl Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4RichTrajectory.cc,v 1.9 2010/02/22 21:26:56 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030// ---------------------------------------------------------------
    … …  
    145145  if(!secondTrajectory) return;
    146146
    147   G4Trajectory::MergeTrajectory(secondTrajectory);
    148 
    149147  G4RichTrajectory* seco = (G4RichTrajectory*)secondTrajectory;
    150148  G4int ent = seco->GetPointEntries();
    … …  
    245243    values->push_back(G4AttValue("CPTN",G4VProcess::GetProcessTypeName(type),""));
    246244  } else {
    247     values->push_back(G4AttValue("CPN","User Defined",""));
    248     values->push_back(G4AttValue("CPTN","User",""));
     245    values->push_back(G4AttValue("CPN","None",""));
     246    values->push_back(G4AttValue("CPTN","None",""));
    249247  }
    250248
    … …  
    266264    values->push_back(G4AttValue("EPTN",G4VProcess::GetProcessTypeName(type),""));
    267265  } else {
    268     values->push_back(G4AttValue("EPN","User Defined",""));
    269     values->push_back(G4AttValue("EPTN","User",""));
     266    values->push_back(G4AttValue("EPN","None",""));
     267    values->push_back(G4AttValue("EPTN","None",""));
    270268  }
    271269

  • trunk/source/tracking/src/G4RichTrajectoryPoint.cc

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4RichTrajectoryPoint.cc,v 1.5 2009/11/24 10:04:14 perl Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4RichTrajectoryPoint.cc,v 1.6 2010/02/22 21:26:56 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030//
    … …  
    236236        ""));
    237237  } else {
    238     values->push_back
    239       (G4AttValue("PDS","User Defined Limit in Current Volume",""));
    240     values->push_back(G4AttValue("PTDS","User",""));
     238    values->push_back(G4AttValue("PDS","None",""));
     239    values->push_back(G4AttValue("PTDS","None",""));
    241240  }
    242241

  • trunk/source/tracking/src/G4SmoothTrajectory.cc

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4SmoothTrajectory.cc,v 1.19 2009/11/12 09:09:56 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4SmoothTrajectory.cc,v 1.20 2010/05/29 21:31:03 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030//
    … …  
    120120}
    121121
     122void G4SmoothTrajectory::DrawTrajectory() const
     123{
     124  // Invoke the default implementation in G4VTrajectory...
     125  G4VTrajectory::DrawTrajectory();
     126  // ... or override with your own code here.
     127}
     128
    122129void G4SmoothTrajectory::DrawTrajectory(G4int i_mode) const
    123130{

  • trunk/source/tracking/src/G4Trajectory.cc

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4Trajectory.cc,v 1.33 2009/11/12 09:09:56 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4Trajectory.cc,v 1.34 2010/05/29 21:31:03 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030// ---------------------------------------------------------------
    … …  
    115115}
    116116
     117void G4Trajectory::DrawTrajectory() const
     118{
     119  // Invoke the default implementation in G4VTrajectory...
     120  G4VTrajectory::DrawTrajectory();
     121  // ... or override with your own code here.
     122}
     123
    117124void G4Trajectory::DrawTrajectory(G4int i_mode) const
    118125{

  • trunk/source/tracking/src/G4VTrajectory.cc

    r1228 r1293  
    2525//
    2626//
    27 // $Id: G4VTrajectory.cc,v 1.12 2006/10/16 13:45:01 allison Exp $
    28 // GEANT4 tag $Name: geant4-09-03 $
     27// $Id: G4VTrajectory.cc,v 1.15 2010/05/29 21:31:03 allison Exp $
     28// GEANT4 tag $Name: tracking-V09-03-03 $
    2929//
    3030// ---------------------------------------------------------------
    … …  
    116116}
    117117
     118void G4VTrajectory::DrawTrajectory() const
     119{
     120  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
     121
     122  if (0 != pVVisManager) {
     123    pVVisManager->DispatchToModel(*this);
     124  }
     125}
     126
    118127void G4VTrajectory::DrawTrajectory(G4int i_mode) const
    119128{
    120129  G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
     130
     131  static G4bool warnedAboutIMode = false;
     132  if (!warnedAboutIMode) {
     133    G4Exception
     134        ("G4VTrajectory::DrawTrajectory",
     135         "",
     136         JustWarning,
     137"WARNING: DEPRECATED: The use of i_mode argument in DrawTrajectory"
     138"\n  is deprecated and will be removed at the next major release.");
     139    warnedAboutIMode = true;
     140  }
    121141
    122142  if (0 != pVVisManager) {
Note: See TracChangeset for help on using the changeset viewer.