Changeset 1315 for trunk/source/geometry/solids/Boolean/src/G4UnionSolid.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/geometry/solids/Boolean/src/G4UnionSolid.cc (modified) (3 diffs)

trunk/source/geometry/solids/Boolean/src/G4UnionSolid.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UnionSolid.cc,v 1.35 2007/10/23 14:42:31 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UnionSolid.cc,v 1.37 2010/05/11 15:03:45 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // Implementation of methods for the class G4IntersectionSolid
@@ -49 +49 @@
 #include "G4VGraphicsScene.hh"
 #include "G4Polyhedron.hh"
+#include "HepPolyhedronProcessor.h"
 #include "G4NURBS.hh"
 // #include "G4NURBSbox.hh"
@@ -454 +455 @@
 G4UnionSolid::CreatePolyhedron () const 
 {
-  G4Polyhedron* pA = fPtrSolidA->GetPolyhedron();
-  G4Polyhedron* pB = fPtrSolidB->GetPolyhedron();
-  if (pA && pB) {
-    G4Polyhedron* resultant = new G4Polyhedron (pA->add(*pB));
-    return resultant;
-  } else {
-    std::ostringstream oss;
-    oss << GetName() <<
-      ": one of the Boolean components has no corresponding polyhedron.";
-    G4Exception("G4UnionSolid::CreatePolyhedron",
-                "", JustWarning, oss.str().c_str());
-    return 0;
-  }
+  HepPolyhedronProcessor processor;
+  // Stack components and components of components recursively
+  // See G4BooleanSolid::StackPolyhedron
+  G4Polyhedron* top = StackPolyhedron(processor, this);
+  G4Polyhedron* result = new G4Polyhedron(*top);
+  if (processor.execute(*result)) { return result; }
+  else { return 0; }
 }