Changeset 1315 for trunk/source/geometry/solids/Boolean/src

Timestamp:

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

Author:

garnier

Message:

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

Location:

trunk/source/geometry/solids/Boolean/src

Files:

• G4BooleanSolid.cc (modified) (3 diffs)
• G4IntersectionSolid.cc (modified) (3 diffs)
• G4SubtractionSolid.cc (modified) (3 diffs)
• G4UnionSolid.cc (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4BooleanSolid.cc,v 1.21 2006/10/19 15:34:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4BooleanSolid.cc,v 1.23 2010/05/11 15:03:45 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // Implementation for the abstract base class for solids created by boolean 
@@ -40 +40 @@
 #include "G4VSolid.hh"
 #include "G4Polyhedron.hh"
+#include "HepPolyhedronProcessor.h"
 #include "Randomize.hh"
 
@@ -231 +232 @@
   return fpPolyhedron;
 }
+
+//////////////////////////////////////////////////////////////////////////
+//
+// Stacks polyhedra for processing. Returns top polyhedron.
+
+G4Polyhedron*
+G4BooleanSolid::StackPolyhedron(HepPolyhedronProcessor& processor,
+                                const G4VSolid* solid) const
+{
+  HepPolyhedronProcessor::Operation operation;
+  const G4String& type = solid->GetEntityType();
+  if (type == "G4UnionSolid")
+    { operation = HepPolyhedronProcessor::UNION; }
+  else if (type == "G4IntersectionSolid")
+    { operation = HepPolyhedronProcessor::INTERSECTION; }
+  else if (type == "G4SubtractionSolid")
+    { operation = HepPolyhedronProcessor::SUBTRACTION; }
+  else
+  {
+    std::ostringstream oss;
+    oss << "Solid - " << solid->GetName()
+        << " - Unrecognised composite solid"
+        << "\n  Returning NULL !";
+    G4Exception("StackPolyhedron()", "InvalidSetup",
+                JustWarning, oss.str().c_str());
+    return 0;
+  }
+
+  G4Polyhedron* top = 0;
+  const G4VSolid* solidA = solid->GetConstituentSolid(0);
+  const G4VSolid* solidB = solid->GetConstituentSolid(1);
+
+  if (solidA->GetConstituentSolid(0))
+  {
+    top = StackPolyhedron(processor, solidA);
+  }
+  else
+  {
+    top = solidA->GetPolyhedron();
+  }
+  G4Polyhedron* operand = solidB->GetPolyhedron();
+  processor.push_back (operation, *operand);
+
+  return top;
+}

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

@@ -25 +25 @@
 //
 //
-// $Id: G4IntersectionSolid.cc,v 1.30 2006/11/08 09:37:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4IntersectionSolid.cc,v 1.32 2010/05/11 15:03:45 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // Implementation of methods for the class G4IntersectionSolid
@@ -50 +50 @@
 #include "G4VGraphicsScene.hh"
 #include "G4Polyhedron.hh"
+#include "HepPolyhedronProcessor.h"
 #include "G4NURBS.hh"
 // #include "G4NURBSbox.hh"
@@ -502 +503 @@
 G4IntersectionSolid::CreatePolyhedron () const 
 {
-  G4Polyhedron* pA = fPtrSolidA->GetPolyhedron();
-  G4Polyhedron* pB = fPtrSolidB->GetPolyhedron();
-  if (pA && pB)
-  {
-    G4Polyhedron* resultant = new G4Polyhedron (pA->intersect(*pB));
-    return resultant;
-  }
-  else
-  {
-    std::ostringstream oss;
-    oss << "Solid - " << GetName()
-        << " - one of the Boolean components has no" << G4endl
-        << " corresponding polyhedron. Returning NULL !";
-    G4Exception("G4IntersectionSolid::CreatePolyhedron()", "InvalidSetup",
-                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; }
 }
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4SubtractionSolid.cc,v 1.31 2007/10/23 14:42:31 grichine Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4SubtractionSolid.cc,v 1.33 2010/05/11 15:03:45 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // Implementation of methods for the class G4IntersectionSolid
@@ -48 +48 @@
 #include "G4VGraphicsScene.hh"
 #include "G4Polyhedron.hh"
+#include "HepPolyhedronProcessor.h"
 #include "G4NURBS.hh"
 // #include "G4NURBSbox.hh"
@@ -463 +464 @@
 G4SubtractionSolid::CreatePolyhedron () const 
 {
-  G4Polyhedron* pA = fPtrSolidA->GetPolyhedron();
-  G4Polyhedron* pB = fPtrSolidB->GetPolyhedron();
-  if (pA && pB)
-  {
-    G4Polyhedron* resultant = new G4Polyhedron (pA->subtract(*pB));
-    return resultant;
-  }
-  else
-  {
-    std::ostringstream oss;
-    oss << "Solid - " << GetName()
-        << " - one of the Boolean components has no" << G4endl
-        << " corresponding polyhedron. Returning NULL !";
-    G4Exception("G4SubtractionSolid::CreatePolyhedron()", "InvalidSetup",
-                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; }
 }
 

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; }
 }