Changeset 1293 for trunk/source/graphics_reps

Timestamp:

Jun 2, 2010, 10:23:13 AM (15 years ago)

Author:

garnier

Message:

CVS update

Location:

trunk/source/graphics_reps

Files:

• History (modified) (2 diffs)
• include/G4VGraphicsScene.hh (modified) (3 diffs)
• include/G4VVisManager.hh (modified) (6 diffs)
• src/G4VVisManager.cc (modified) (2 diffs)

trunk/source/graphics_reps/History

@@ -1 @@
-cvs log $Id: History,v 1.139 2010/05/07 16:06:18 allison Exp $
+cvs log $Id: History,v 1.141 2010/05/30 11:15:52 allison Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+30th May 2010  John Allison  (greps-V09-03-02)
+- G4VVisManager: Added Draw(const G4VDigi&) and FilterDigi(const G4VDigi&).
+- G4VGraphicsScene: Added AddCompound (const G4VDigi&).
+
+29th May 2010  John Allison  (greps-V09-03-01)
+- G4VVisManager:
+  o Removed IsDefaultDrawTrajectory.  A better way is...
+  o Added DispatchToModel(const G4VTrajectory&), i.e., without i_mode, to
+    distinguish usage and in preparation for i_mode migration.
 
 7th May 2010  John Allison  (greps-V09-03-00)

trunk/source/graphics_reps/include/G4VGraphicsScene.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VGraphicsScene.hh,v 1.12 2009/10/21 15:36:22 allison Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4VGraphicsScene.hh,v 1.13 2010/05/30 11:15:36 allison Exp $
+// GEANT4 tag $Name:  $
 // John Allison  19th July 1996
 //
@@ -57 +57 @@
 class G4VTrajectory;
 class G4VHit;
+class G4VDigi;
 template <typename T> class G4THitsMap;
 class G4Polyline;
@@ -116 +117 @@
   virtual void AddCompound (const G4VTrajectory&)        = 0;
   virtual void AddCompound (const G4VHit&)               = 0;
+  virtual void AddCompound (const G4VDigi&)              = 0;
   virtual void AddCompound (const G4THitsMap<G4double>&) = 0;
 

trunk/source/graphics_reps/include/G4VVisManager.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VVisManager.hh,v 1.16 2010/05/07 16:05:56 allison Exp $
+// $Id: G4VVisManager.hh,v 1.18 2010/05/30 11:15:36 allison Exp $
 // GEANT4 tag $Name:  $
 // John Allison 19/Oct/1996.
@@ -87 +87 @@
 class G4VSolid;
 class G4VHit;
+class G4VDigi;
 class G4VTrajectory;
 class G4LogicalVolume;
@@ -168 +169 @@
   virtual void Draw (const G4VHit&) = 0;
 
+  virtual void Draw (const G4VDigi&) = 0;
+
   virtual void Draw (const G4VTrajectory&, G4int i_mode = 0) = 0;
   // i_mode is a parameter that can be used to control the drawing of
@@ -194 +197 @@
   // any, and redraw all views.
 
-  virtual void DispatchToModel(const G4VTrajectory&, G4int i_mode = 0) = 0;
+  virtual void DispatchToModel(const G4VTrajectory&) = 0;
+  virtual void DispatchToModel(const G4VTrajectory&, G4int i_mode) = 0;
   // Draw the trajectory.
 
@@ -203 +207 @@
   // Hit filter
 
+  virtual G4bool FilterDigi(const G4VDigi&) = 0;
+  // Digi filter
+
 protected:
 
@@ -208 +215 @@
 
   static G4VVisManager* fpConcreteInstance;  // Pointer to real G4VisManager.
-
-public:
-
-  static G4bool IsDefaultDrawTrajectory;
-
 };
 

trunk/source/graphics_reps/src/G4VVisManager.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VVisManager.cc,v 1.5 2010/05/07 16:05:56 allison Exp $
+// $Id: G4VVisManager.cc,v 1.6 2010/05/29 21:35:16 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -47 +47 @@
   fpConcreteInstance = m;
 }
-
-G4bool G4VVisManager::IsDefaultDrawTrajectory = true;