Changeset 1258 for trunk/source/visualization/modeling/src/G4PhysicalVolumeModel.cc

Timestamp:

May 20, 2010, 11:49:26 AM (14 years ago)

Author:

garnier

Message:

cvs update

File:

• trunk/source/visualization/modeling/src/G4PhysicalVolumeModel.cc (modified) (8 diffs)

trunk/source/visualization/modeling/src/G4PhysicalVolumeModel.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PhysicalVolumeModel.cc,v 1.66 2009/10/23 08:08:19 allison Exp $
+// $Id: G4PhysicalVolumeModel.cc,v 1.67 2010/05/11 11:16:51 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -40 +40 @@
 #include "G4LogicalVolume.hh"
 #include "G4VSolid.hh"
+#include "G4SubtractionSolid.hh"
+#include "G4IntersectionSolid.hh"
 #include "G4Material.hh"
 #include "G4VisAttributes.hh"
@@ -73 +75 @@
   fpCurrentTransform (0),
   fCurtailDescent (false),
-  fpClippingPolyhedron (0),
+  fpClippingSolid (0),
   fClippingMode   (subtraction)
 {
@@ -86 +88 @@
 G4PhysicalVolumeModel::~G4PhysicalVolumeModel ()
 {
-  delete fpClippingPolyhedron;
+  delete fpClippingSolid;
 }
 
@@ -500 +502 @@
   sceneHandler.PreAddSolid (theAT, *pVisAttribs);
 
-  const G4Polyhedron* pSectionPolyhedron = fpMP->GetSectionPolyhedron();
-  const G4Polyhedron* pCutawayPolyhedron = fpMP->GetCutawayPolyhedron();
-
-  if (!fpClippingPolyhedron && !pSectionPolyhedron && !pCutawayPolyhedron) {
+  G4VSolid* pSectionSolid = fpMP->GetSectionSolid();
+  G4VSolid* pCutawaySolid = fpMP->GetCutawaySolid();
+
+  if (!fpClippingSolid && !pSectionSolid && !pCutawaySolid) {
 
     pSol -> DescribeYourselfTo (sceneHandler);  // Standard treatment.
@@ -509 +511 @@
   } else {
 
-    // Clipping, etc., performed by Boolean operations on polyhedron objects.
+    // Clipping, etc., performed by Boolean operations.
 
     // First, get polyhedron for current solid...
@@ -517 +519 @@
     else
       G4Polyhedron::SetNumberOfRotationSteps(fpMP->GetNoOfSides());
-    G4Polyhedron* pOriginal = pSol->GetPolyhedron();
+    const G4Polyhedron* pOriginal = pSol->GetPolyhedron();
     G4Polyhedron::ResetNumberOfRotationSteps();
 
@@ -532 +534 @@
     } else {
 
-      G4Polyhedron resultant = *pOriginal;
+      G4Polyhedron resultant(*pOriginal);
       G4VisAttributes resultantVisAttribs(*pVisAttribs);
-
-      if (fpClippingPolyhedron) {
-        G4Polyhedron clipper = *fpClippingPolyhedron;  // Local copy.
-        clipper.Transform(theAT.inverse());
-        HepPolyhedronProcessor processor;
+      G4VSolid* resultantSolid = 0;
+
+      if (fpClippingSolid) {
         switch (fClippingMode) {
         default:
-        case subtraction: processor.push_back(HepPolyhedronProcessor::SUBTRACTION, clipper); break;
-        case intersection: processor.push_back(HepPolyhedronProcessor::INTERSECTION, clipper); break;
+        case subtraction:
+          resultantSolid = new G4SubtractionSolid
+            ("resultant_solid", pSol, fpClippingSolid, theAT.inverse());
+          break;
+        case intersection:
+          resultantSolid = new G4IntersectionSolid
+            ("resultant_solid", pSol, fpClippingSolid, theAT.inverse());
+          break;
         }
-        if (!processor.execute(resultant)) {
-          if (fpMP->IsWarning())
-            G4cout <<
- "WARNING: G4PhysicalVolumeModel::DescribeSolid: clipped polyhedron for"
- "\n  solid \"" << pSol->GetName() <<
- "\" not defined due to error during Boolean processing."
- "\n  It will be drawn in red."
-                   << G4endl;
-          // Nevertheless, keep resultant, but draw it in red
-          resultantVisAttribs.SetColour(G4Colour::Red());
-        }
-      }
-
-      if (pSectionPolyhedron) {
-        G4Polyhedron sectioner = *pSectionPolyhedron;  // Local copy.
-        sectioner.Transform(theAT.inverse());
-        HepPolyhedronProcessor processor;
-        processor.push_back(HepPolyhedronProcessor::INTERSECTION, sectioner);
-        if (!processor.execute(resultant)) {
-          if (fpMP->IsWarning())
-            G4cout <<
- "WARNING: G4PhysicalVolumeModel::DescribeSolid: sectioned polyhedron for"
- "\n  solid \"" << pSol->GetName() <<
- "\" not defined due to error during Boolean processing."
- "\n  It will be drawn in red."
-                   << G4endl;
-          // Nevertheless, keep resultant, but draw it in red
-          resultantVisAttribs.SetColour(G4Colour::Red());
-        }
-      }
-
-      if (pCutawayPolyhedron) {
-        G4Polyhedron cutter = *pCutawayPolyhedron;  // Local copy.
-        cutter.Transform(theAT.inverse());
-        HepPolyhedronProcessor processor;
-        processor.push_back(HepPolyhedronProcessor::SUBTRACTION, cutter);
-        if (!processor.execute(resultant)) {
-          if (fpMP->IsWarning())
-            G4cout <<
- "WARNING: G4PhysicalVolumeModel::DescribeSolid: cutaway polyhedron for"
- "\n  solid \"" << pSol->GetName() <<
- "\" not defined due to error during Boolean processing."
- "\n  It will be drawn in red."
-                   << G4endl;
-          // Nevertheless, keep resultant, but draw it in red
-          resultantVisAttribs.SetColour(G4Colour::Red());
-        }
-      }
+      }
+
+      if (pSectionSolid) {
+        resultantSolid = new G4IntersectionSolid
+          ("sectioned_solid", pSol, pSectionSolid, theAT.inverse());
+      }
+
+      if (pCutawaySolid) {
+        resultantSolid = new G4SubtractionSolid
+          ("cutaway_solid", pSol, pCutawaySolid, theAT.inverse());
+      }
+
+      G4Polyhedron* tmpResultant = resultantSolid->GetPolyhedron();
+      if (tmpResultant) resultant = *tmpResultant;
+      else {
+        if (fpMP->IsWarning())
+          G4cout <<
+            "WARNING: G4PhysicalVolumeModel::DescribeSolid: resultant polyhedron for"
+            "\n  solid \"" << pSol->GetName() <<
+            "\" not defined due to error during Boolean processing."
+            "\n  Original will be drawn in red."
+                 << G4endl;
+        resultantVisAttribs.SetColour(G4Colour::Red());
+      }
+
+      delete resultantSolid;
 
       // Finally, force polyhedron drawing...