Changeset 1170 for trunk/source/visualization/management/include

Timestamp:

Nov 16, 2009, 4:56:12 PM (15 years ago)

Author:

garnier

Message:

update contre CVS

Location:

trunk/source/visualization/management/include

Files:

• G4Scene.hh (modified) (4 diffs)
• G4Scene.icc (modified) (3 diffs)
• G4VSceneHandler.hh (modified) (2 diffs)
• G4VisCommandsSceneAdd.hh (modified) (2 diffs)
• G4VisCommandsViewerSet.hh (modified) (1 diff)

trunk/source/visualization/management/include/G4Scene.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Scene.hh,v 1.18 2006/11/14 14:59:54 allison Exp $
+// $Id: G4Scene.hh,v 1.19 2009/11/04 12:49:16 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -80 +80 @@
   // scene is current.
 
+  const std::vector<G4VModel*>& GetEndOfRunModelList () const;
+  // Contains models which are described at the end of event when the
+  // scene is current.
+
   const G4VisExtent& GetExtent () const;
   // Overall extent of all objects in the scene.
@@ -125 +129 @@
   // Prints warnings if warn is true.
 
+  G4bool AddEndOfRunModel (G4VModel*, G4bool warn = false);
+  // Adds models of type which are described at the end of run when
+  // the scene is current.
+  // Returns false if model is already in the list.
+  // Prints warnings if warn is true.
+
   std::vector<G4VModel*>& SetRunDurationModelList ();
   // Allows you to change the model list - do with care!
 
   std::vector<G4VModel*>& SetEndOfEventModelList ();
+  // Allows you to change the model list - do with care!
+
+  std::vector<G4VModel*>& SetEndOfRunModelList ();
   // Allows you to change the model list - do with care!
 
@@ -158 +171 @@
   std::vector<G4VModel*> fRunDurationModelList;
   std::vector<G4VModel*> fEndOfEventModelList;
+  std::vector<G4VModel*> fEndOfRunModelList;
   G4VisExtent fExtent;
   G4Point3D   fStandardTargetPoint;

trunk/source/visualization/management/include/G4Scene.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4Scene.icc,v 1.14 2006/11/14 14:59:54 allison Exp $
+// $Id: G4Scene.icc,v 1.15 2009/11/04 12:49:16 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -51 +51 @@
 G4Scene::GetEndOfEventModelList () const {
   return fEndOfEventModelList;
+}
+
+inline const std::vector<G4VModel*>&
+G4Scene::GetEndOfRunModelList () const {
+  return fEndOfRunModelList;
 }
 
@@ -80 +85 @@
 inline std::vector<G4VModel*>& G4Scene::SetEndOfEventModelList ()
 {
-  return fRunDurationModelList;
+  return fEndOfEventModelList;
+}
+
+inline std::vector<G4VModel*>& G4Scene::SetEndOfRunModelList ()
+{
+  return fEndOfRunModelList;
 }
 

trunk/source/visualization/management/include/G4VSceneHandler.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VSceneHandler.hh,v 1.41 2009/10/21 14:26:59 allison Exp $
+// $Id: G4VSceneHandler.hh,v 1.42 2009/11/04 12:55:33 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -270 +270 @@
   // hits, etc.
 
+  void DrawEndOfRunModels();
+  // Draws end-of-run models.
+
   //////////////////////////////////////////////////////////////
   // Administration functions.

trunk/source/visualization/management/include/G4VisCommandsSceneAdd.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4VisCommandsSceneAdd.hh,v 1.18 2009/10/30 15:58:50 allison Exp $
+// $Id: G4VisCommandsSceneAdd.hh,v 1.19 2009/11/04 13:15:02 allison Exp $
 // GEANT4 tag $Name:  $
 
@@ -142 +142 @@
   G4VisCommandSceneAddPSHits (const G4VisCommandSceneAddPSHits&);
   G4VisCommandSceneAddPSHits& operator = (const G4VisCommandSceneAddPSHits&);
-  G4UIcmdWithoutParameter* fpCommand;
+  G4UIcmdWithAString* fpCommand;
 };
 

trunk/source/visualization/management/include/G4VisCommandsViewerSet.hh

@@ -26 +26 @@
 //
 // $Id: G4VisCommandsViewerSet.hh,v 1.23 2009/05/13 18:17:25 allison Exp $
-// GEANT4 tag $Name: HEAD $
+// GEANT4 tag $Name:  $
 
 // /vis/viewer/set commands - John Allison  16th May 2000