Changeset 932 for trunk/source/graphics_reps/include

Timestamp:

Feb 26, 2009, 12:23:33 PM (15 years ago)

Author:

garnier

Message:

John update

Location:

trunk/source/graphics_reps/include

Files:

• G4PolyhedronArbitrary.hh (modified) (2 diffs)
• G4VMarker.hh (modified) (4 diffs)
• G4VMarker.icc (modified) (3 diffs)
• G4VVisManager.hh (modified) (2 diffs)

trunk/source/graphics_reps/include/G4PolyhedronArbitrary.hh

@@ -18 +18 @@
 // * This  code  implementation is the result of  the  scientific and *
 // * technical work of the GEANT4 collaboration and of QinetiQ Ltd,   *
-// * subject DEFCON 705 IPR conditions.                               *
+// * subject to DEFCON 705 IPR conditions.                            *
 // * By using,  copying,  modifying or  distributing the software (or *
 // * any work based  on the software)  you  agree  to acknowledge its *
@@ -24 +24 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+//
 //
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/source/graphics_reps/include/G4VMarker.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VMarker.hh,v 1.12 2006/06/29 19:06:14 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VMarker.hh,v 1.13 2009/02/24 10:58:04 allison Exp $
+// GEANT4 tag $Name: greps-V09-02-00 $
 //
 // 
@@ -97 +97 @@
 
   enum FillStyle {noFill, hashed, filled};
+  enum SizeType {none, world, screen};
 
   //////////////////////////////////////////////////////
@@ -114 +115 @@
   // Get functions...
   G4Point3D GetPosition       () const;
+  SizeType  GetSizeType       () const;
   G4double  GetWorldSize      () const;
   G4double  GetWorldDiameter  () const;
@@ -125 +127 @@
   // Set functions...
   void SetPosition       (const G4Point3D&);
+  void SetSize           (SizeType, G4double);
+  void SetDiameter       (SizeType, G4double);
+  void SetRadius         (SizeType, G4double);
   void SetWorldSize      (G4double);
   void SetWorldDiameter  (G4double);

trunk/source/graphics_reps/include/G4VMarker.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4VMarker.icc,v 1.7 2006/06/29 19:06:16 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VMarker.icc,v 1.8 2009/02/24 10:58:04 allison Exp $
+// GEANT4 tag $Name: greps-V09-02-00 $
 //
 // 
@@ -66 +66 @@
 }
 
+inline void G4VMarker::SetDiameter (SizeType sizeType, G4double size) {
+  SetSize(sizeType, size);
+}
+
+inline void G4VMarker::SetRadius (SizeType sizeType, G4double size) {
+  SetSize(sizeType, 2. * size);
+}
+
 inline void G4VMarker::SetWorldSize (G4double ws) {
   fWorldSize = ws;
@@ -97 +105 @@
 }
 
+inline const G4String& G4VMarker::GetInfo() const {return fInfo;}
 
+inline void G4VMarker::SetInfo(const G4String& info) {fInfo = info;}

trunk/source/graphics_reps/include/G4VVisManager.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VVisManager.hh,v 1.14 2008/01/04 22:20:59 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4VVisManager.hh,v 1.15 2009/02/25 14:13:43 allison Exp $
+// GEANT4 tag $Name:  $
 // John Allison 19/Oct/1996.
 // 
@@ -189 +189 @@
   // This is used by the run manager to notify a change of geometry.
 
+  virtual void NotifyHandlers () {}
+  // Notify scene handlers (G4VGraphicsScene objects) that the scene
+  // has changed so that they may rebuild their graphics database, if
+  // any, and redraw all views.
+
   virtual void DispatchToModel(const G4VTrajectory&, G4int i_mode = 0) = 0;
   // Draw the trajectory.