Changeset 1140 for trunk/source/graphics_reps/include

Timestamp:

Nov 3, 2009, 11:17:28 AM (16 years ago)

Author:

garnier

Message:

update to CVS

Location:

trunk/source/graphics_reps/include

Files:

• G4VGraphicsScene.hh (modified) (5 diffs)
• HepPolyhedron.h (modified) (4 diffs)

trunk/source/graphics_reps/include/G4VGraphicsScene.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VGraphicsScene.hh,v 1.11 2008/01/04 22:20:59 allison Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4VGraphicsScene.hh,v 1.12 2009/10/21 15:36:22 allison Exp $
+// GEANT4 tag $Name:  $
 // John Allison  19th July 1996
 //
@@ -37 +37 @@
 #ifndef G4VGRAPHICSSCENE_HH
 #define G4VGRAPHICSSCENE_HH
+
+#include "globals.hh"
+#include "G4Transform3D.hh"
 
 class G4VisAttributes;
@@ -54 +57 @@
 class G4VTrajectory;
 class G4VHit;
+template <typename T> class G4THitsMap;
 class G4Polyline;
 class G4Scale;
@@ -62 +66 @@
 class G4Polyhedron;
 class G4NURBS;
-
-#include "G4Transform3D.hh"
 
 class G4VGraphicsScene {
@@ -112 +114 @@
   // above.
 
-  virtual void AddCompound (const G4VTrajectory&) = 0;
-  virtual void AddCompound (const G4VHit&)        = 0;
+  virtual void AddCompound (const G4VTrajectory&)        = 0;
+  virtual void AddCompound (const G4VHit&)               = 0;
+  virtual void AddCompound (const G4THitsMap<G4double>&) = 0;
 
   ///////////////////////////////////////////////////////////////////

trunk/source/graphics_reps/include/HepPolyhedron.h

@@ -25 +25 @@
 //
 //
-// $Id: HepPolyhedron.h,v 1.24 2008/04/14 08:50:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: HepPolyhedron.h,v 1.25 2009/10/28 13:38:54 allison Exp $
+// GEANT4 tag $Name:  $
 //
 //
@@ -107 +107 @@
 //   ResetNumberOfRotationSteps() - reset number of steps for whole circle
 //                            to default value;
-//   IsErrorBooleanProcess()- true if there has been an error during the
-//                            processing of a Boolean operation.
 // History:
 //
@@ -165 +163 @@
 // - added HepPolyhedronEllipsoid
 //
+// 21.10.09 J.Allison
+// - removed IsErrorBooleanProcess (now error is returned through argument)
+//
 
 #ifndef HEP_POLYHEDRON_HH
@@ -313 +314 @@
   HepPolyhedron subtract(const HepPolyhedron &p) const;
   HepPolyhedron intersect(const HepPolyhedron &p) const;
-  // If there has been an error during the above processing..
-  bool IsErrorBooleanProcess() const;
 
   // Get area of the surface of the polyhedron