Import Geant4 9.6.0 source tree

source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh

@@ -24,8 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4PhysicalVolumeSearchScene.hh,v 1.20 2010-05-30 11:23:25 allison Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // 
 // John Allison  10th August 1998.
@@ -48,6 +47,7 @@
 #include "G4Polyhedra.hh"
 #include "G4VPhysicalVolume.hh"
 #include "G4LogicalVolume.hh"
+#include "G4PhysicalVolumeModel.hh"
 
 class G4PhysicalVolumeSearchScene: public G4VGraphicsScene {
 
@@ -60,24 +60,27 @@ public:
   void PreAddSolid (const G4Transform3D& objectTransformation,
 		    const G4VisAttributes&);
   void PostAddSolid ();
-  void AddSolid (const G4Box& s) {FindVolume (s);}
-  void AddSolid (const G4Cons & s) {FindVolume (s);}
-  void AddSolid (const G4Tubs& s) {FindVolume (s);}
-  void AddSolid (const G4Trd& s) {FindVolume (s);}
-  void AddSolid (const G4Trap& s) {FindVolume (s);}
-  void AddSolid (const G4Sphere& s) {FindVolume (s);}
-  void AddSolid (const G4Para& s) {FindVolume (s);}
-  void AddSolid (const G4Torus& s) {FindVolume (s);}
-  void AddSolid (const G4Polycone& s) {FindVolume (s);}
-  void AddSolid (const G4Polyhedra& s) {FindVolume (s);}
-  void AddSolid (const G4VSolid& s) {FindVolume (s);}
+  void AddSolid (const G4Box& solid) {FindVolume (solid);}
+  void AddSolid (const G4Cons & solid) {FindVolume (solid);}
+  void AddSolid (const G4Tubs& solid) {FindVolume (solid);}
+  void AddSolid (const G4Trd& solid) {FindVolume (solid);}
+  void AddSolid (const G4Trap& solid) {FindVolume (solid);}
+  void AddSolid (const G4Sphere& solid) {FindVolume (solid);}
+  void AddSolid (const G4Para& solid) {FindVolume (solid);}
+  void AddSolid (const G4Torus& solid) {FindVolume (solid);}
+  void AddSolid (const G4Polycone& solid) {FindVolume (solid);}
+  void AddSolid (const G4Polyhedra& solid) {FindVolume (solid);}
+  void AddSolid (const G4VSolid& solid) {FindVolume (solid);}
   void AddCompound (const G4VTrajectory&) {}
   void AddCompound (const G4VHit&) {}
   void AddCompound (const G4VDigi&) {}
   void AddCompound (const G4THitsMap<G4double>&) {}
-  G4int                GetFoundDepth          () const;
-  G4VPhysicalVolume*   GetFoundVolume         () const;
-  const G4Transform3D& GetFoundTransformation () const;
+  
+  const std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>&
+                        GetFoundFullPVPath     () const;
+  G4int                 GetFoundDepth          () const;
+  G4VPhysicalVolume*    GetFoundVolume         () const;
+  const G4Transform3D&  GetFoundTransformation () const;
 
   ////////////////////////////////////////////////////////////////
   // Functions not used but required by the abstract interface.
@@ -101,10 +104,12 @@ private:
   G4String             fRequiredPhysicalVolumeName;
   G4int                fRequiredCopyNo;
   const G4Transform3D* fpCurrentObjectTransformation;
-  G4int                fFoundDepth;                  // Found depth.
-  G4VPhysicalVolume*   fpFoundPV;                    // Found physical volume.
-  G4LogicalVolume*     fpFoundLV;                    // Found logical volume.
-  G4Transform3D        fFoundObjectTransformation;   // Found transformation.
+  std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>
+                       fFoundFullPVPath;            // Found full path.
+  G4int                fFoundDepth;                 // Found depth.
+  G4VPhysicalVolume*   fpFoundPV;                   // Found physical volume.
+  G4LogicalVolume*     fpFoundLV;                   // Found logical volume.
+  G4Transform3D        fFoundObjectTransformation;  // Found transformation.
   G4bool               fMultipleOccurrence;
 };