Import Geant4 7.0.0 source tree

source/visualization/HepRep/include/HEPREP/HepRep.h

@@ -9,7 +9,6 @@
 
 // Copyright 2000-2004, FreeHEP.
 
-#include <set>
 #include <string>
 #include <vector>
 
@@ -90,7 +89,7 @@ public:
      *
      * @return collection of HepRepTypeTrees.
      */
-    virtual std::set<HepRepTypeTree *>  getTypeTrees() = 0;
+    virtual std::vector<HepRepTypeTree *>  getTypeTreeList() = 0;
 
     /**
      * Returns a named and versioned typetree.
@@ -135,7 +134,7 @@ public:
      *
      * @return collection of HepRepInstanceTrees.
      */
-    virtual std::set<HepRepInstanceTree *>  getInstanceTrees() = 0;
+    virtual std::vector<HepRepInstanceTree *>  getInstanceTreeList() = 0;
 
     /**
      * Returns a named and versioned instancetree.

source/visualization/HepRep/include/HEPREP/HepRepAttributeListener.h

@@ -14,6 +14,8 @@
 
 namespace HEPREP {
 
+class HepRepInstance;
+
 /**
  * HepRepAttributeListener interface. The implementor is called back for changes
  * of attributes while using the HepRepIterator to iterate over all the HepRepInstances.
@@ -31,64 +33,71 @@ public:
     /**
      * Called if attribute key changes its value.
      *
+     * @param instance instance for which this attribute is set.
      * @param key name of the changed attribute.
      * @param value value of the changed attribute.
      * @param lowerCaseValue lower case value of the changed attribute.
      * @param showLabel value of showLabel.
      */
-    virtual void setAttribute(std::string key, std::string value, std::string lowerCaseValue, int showLabel) = 0;
+    virtual void setAttribute(HepRepInstance * instance, std::string key, std::string value, std::string lowerCaseValue, int showLabel) = 0;
 
     /**
      * Called if attribute key changes its value.
      *
+     * @param instance instance for which this attribute is set.
      * @param key name of the changed attribute.
      * @param value value of the changed attribute.
      * @param showLabel value of showLabel.
      */
-    virtual void setAttribute(std::string key, std::vector<double> value, int showLabel) = 0;
+    virtual void setAttribute(HepRepInstance * instance, std::string key, std::vector<double> value, int showLabel) = 0;
 
     /**
      * Called if attribute key changes its value.
      *
+     * @param instance instance for which this attribute is set.
      * @param key name of the changed attribute.
      * @param value value of the changed attribute.
      * @param showLabel value of showLabel.
      */
-    virtual void setAttribute(std::string key, long value, int showLabel) = 0;
+    virtual void setAttribute(HepRepInstance * instance, std::string key, long value, int showLabel) = 0;
 
     /**
      * Called if attribute key changes its value.
      *
+     * @param instance instance for which this attribute is set.
      * @param key name of the changed attribute.
      * @param value value of the changed attribute.
      * @param showLabel value of showLabel.
      */
-    virtual void setAttribute(std::string key, int value, int showLabel) = 0;
+    virtual void setAttribute(HepRepInstance * instance, std::string key, int value, int showLabel) = 0;
 
     /**
      * Called if attribute key changes its value.
      *
+     * @param instance instance for which this attribute is set.
      * @param key name of the changed attribute.
      * @param value value of the changed attribute.
      * @param showLabel value of showLabel.
      */
-    virtual void setAttribute(std::string key, double value, int showLabel) = 0;
+    virtual void setAttribute(HepRepInstance * instance, std::string key, double value, int showLabel) = 0;
 
     /**
      * Called if attribute key changes its value.
      *
+     * @param instance instance for which this attribute is set.
      * @param key name of the changed attribute.
      * @param value value of the changed attribute.
      * @param showLabel value of showLabel.
      */
-    virtual void setAttribute(std::string key, bool value, int showLabel) = 0;
+    virtual void setAttribute(HepRepInstance * instance, std::string key, bool value, int showLabel) = 0;
 
     /**
      * Called if attribute key is removed from the attribute set.
      *
+     * @param instance instance for which this attribute is set.
      * @param key name of the removed attribute.
      */
-    virtual void removeAttribute(std::string key) = 0;
+    virtual void removeAttribute(HepRepInstance * instance, std::string key) = 0;
 }; // class
 } // namespace HEPREP
 #endif /* ifndef HEPREP_HEPREPATTRIBUTELISTENER_H */

source/visualization/HepRep/include/HEPREP/HepRepInstance.h

@@ -97,6 +97,16 @@ public:
      *
      * ONLY in JAVA
      */
+    /**
+     * Returns true if this instance has a frame. Speedy access for iterator.
+     *
+     * ONLY in JAVA
+     */
+    /**
+     * Returns String layername. Speedy access for iterator.
+     *
+     * ONLY in JAVA
+     */
     /**
      * Returns the parent of this instance.
      *

source/visualization/HepRep/include/HEPREP/HepRepInstanceTree.h

@@ -9,7 +9,6 @@
 
 // Copyright 2000-2004, FreeHEP.
 
-#include <set>
 #include <vector>
 
 #include "HEPREP/HepRepTreeID.h"
@@ -72,7 +71,7 @@ public:
      *
      * @return collection of HepRepTreeIDs.
      */
-    virtual std::set<HepRepTreeID *>  getInstanceTrees() = 0;
+    virtual std::vector<HepRepTreeID *>  getInstanceTreeList() = 0;
 
     /**
      * Returns the associated typetree.

source/visualization/HepRep/include/HEPREP/HepRepPoint.h

@@ -52,28 +52,28 @@ public:
     /**
      * Returns coordinate with respect to vertex at (0, 0, 0).
      *
-     * @return rho = sqrt(dx2+dy2);
+     * @return rho = std::sqrt(dx2+dy2);
      */
     virtual double getRho() = 0;
 
     /**
      * Returns coordinate with respect to vertex at (0, 0, 0).
      *
-     * @return phi = atan2(dy, dx);
+     * @return phi = std::atan2(dy, dx);
      */
     virtual double getPhi() = 0;
 
     /**
      * Returns coordinate with respect to vertex at (0, 0, 0).
      *
-     * @return theta = atan2(rho, dx);
+     * @return theta = std::atan2(rho, dx);
      */
     virtual double getTheta() = 0;
 
     /**
      * Returns coordinate with respect to vertex at (0, 0, 0).
      *
-     * @return r = sqrt(dx2+dy2+dz2);
+     * @return r = std::sqrt(dx2+dy2+dz2);
      */
     virtual double getR() = 0;
 
@@ -108,28 +108,28 @@ public:
     /**
      * Returns coordinate with respect to vertex at (xVertex, yVertex, zVertex).
      *
-     * @return rho = sqrt(dx2+dy2);
+     * @return rho = std::sqrt(dx2+dy2);
      */
     virtual double getRho(double xVertex, double yVertex, double zVertex) = 0;
 
     /**
      * Returns coordinate with respect to vertex at (xVertex, yVertex, zVertex).
      *
-     * @return phi = atan2(dy, dx);
+     * @return phi = std::atan2(dy, dx);
      */
     virtual double getPhi(double xVertex, double yVertex, double zVertex) = 0;
 
     /**
      * Returns coordinate with respect to vertex at (xVertex, yVertex, zVertex).
      *
-     * @return theta = atan2(rho, dx);
+     * @return theta = std::atan2(rho, dx);
      */
     virtual double getTheta(double xVertex, double yVertex, double zVertex) = 0;
 
     /**
      * Returns coordinate with respect to vertex at (xVertex, yVertex, zVertex).
      *
-     * @return r = sqrt(dx2+dy2+dz2);
+     * @return r = std::sqrt(dx2+dy2+dz2);
      */
     virtual double getR(double xVertex, double yVertex, double zVertex) = 0;
 

source/visualization/HepRep/include/HEPREP/HepRepReader.h

@@ -10,6 +10,7 @@
 // Copyright 2002-2003, Freehep.
 
 #include <string>
+#include <vector>
 
 namespace HEPREP {
 
@@ -26,6 +27,14 @@ public:
     /// Destructor.
     virtual ~HepRepReader() { /* nop */; }
 
+    /**
+     * Returns a property (if set in the heprep.properties file).
+     *
+     * @param key property name
+     * @param defaultValue value if property not found
+     */
+    virtual std::string getProperty(std::string key, std::string defaultValue) = 0;
+
     /**
      * Closes the reader and its underlying stream.
      *
@@ -48,6 +57,22 @@ public:
      */
     virtual HepRep * read(std::string name) = 0;
 
+    /**
+     * Returns the current entry name (random acces only).
+     *
+     * @return name of the current entry or null if not supported.
+     */
+    virtual std::string entryName() = 0;
+
+    /**
+     * Returns a list of names of available entries (random rccess only). 
+     * Zip files may contain instructions to skip a number of files. These files 
+     * will not be included in the entries.
+     *
+     * @return list of entrynames or null if not supported.
+     */
+    virtual std::vector<std::string>  entryNames() = 0;
+
     /**
      * Allows for sequential access.
      *
@@ -62,6 +87,25 @@ public:
      */
     virtual bool reset() = 0;
 
+    /**
+     * Returns the (estimated) number of HepReps in the reader.
+     * Zip files may contain instructions to skip a number of files. These files 
+     * will not be included in the estimate.
+     *
+     * @return number of HepReps, or -1 if cannot be calculated.
+     */
+    virtual int size() = 0;
+
+    /**
+     * Skips a number of HepReps in the reader.
+     * Zip files may contain instructions to skip a number of files. These files 
+     * will not be included in the count to be skipped.
+     *
+     * @param n number of HepReps to be skipped.
+     * @return number of HepReps skipped.
+     */
+    virtual int skip(int n) = 0;
+
     /**
      * Is there a next heprep.
      *

source/visualization/HepRep/include/HEPREP/HepRepType.h

@@ -9,8 +9,8 @@
 
 // Copyright 2000-2003, FreeHEP.
 
-#include <set>
 #include <string>
+#include <vector>
 
 #include "HEPREP/HepRepDefinition.h"
 
@@ -95,7 +95,7 @@ public:
      *
      * @return collection of HepRepTypes.
      */
-    virtual std::set<HepRepType *>  getTypes() = 0;
+    virtual std::vector<HepRepType *>  getTypeList() = 0;
 
     /**
      * Returns a deep copy of this type.

source/visualization/HepRep/include/HEPREP/HepRepTypeTree.h

@@ -9,8 +9,8 @@
 
 // Copyright 2000-2002, FreeHEP.
 
-#include <set>
 #include <string>
+#include <vector>
 
 #include "HEPREP/HepRepTreeID.h"
 
@@ -41,7 +41,7 @@ public:
      *
      * @return collection of HepRepTypes.
      */
-    virtual std::set<HepRepType *>  getTypes() = 0;
+    virtual std::vector<HepRepType *>  getTypeList() = 0;
 
     /**
      * Returns type