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

Timestamp:

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

Author:

garnier

Message:

cvs update

File:

• trunk/source/visualization/modeling/src/G4ModelingParameters.cc (modified) (7 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ModelingParameters.cc,v 1.15 2006/11/14 14:42:08 allison Exp $
+// $Id: G4ModelingParameters.cc,v 1.16 2010/05/11 11:13:35 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -37 +37 @@
 #include "G4VisAttributes.hh"
 #include "G4ExceptionSeverity.hh"
-#include "G4Polyhedron.hh"
+#include "G4VSolid.hh"
 
 G4ModelingParameters::G4ModelingParameters ():
@@ -50 +50 @@
   fExplodeFactor         (1.),
   fNoOfSides             (24),
-  fpSectionPolyhedron    (0),
-  fpCutawayPolyhedron    (0),
+  fpSectionSolid         (0),
+  fpCutawaySolid         (0),
   fpEvent                (0)
 {}
@@ -75 +75 @@
   fExplodeFactor  (1.),
   fNoOfSides      (noOfSides),
-  fpSectionPolyhedron (0),
-  fpCutawayPolyhedron (0),
-  fpEvent             (0)
+  fpSectionSolid  (0),
+  fpCutawaySolid  (0),
+  fpEvent         (0)
 {}
 
 G4ModelingParameters::~G4ModelingParameters ()
 {
-  delete fpSectionPolyhedron;
-  delete fpCutawayPolyhedron;
+  delete fpSectionSolid;
+  delete fpCutawaySolid;
 }
 
@@ -114 +114 @@
   fNoOfSides = nSides;
   return fNoOfSides;
+}
+
+void G4ModelingParameters::SetSectionSolid
+(G4VSolid* pSectionSolid) {
+  delete fpSectionSolid;
+  fpSectionSolid = pSectionSolid;
+}
+
+void G4ModelingParameters::SetCutawaySolid
+(G4VSolid* pCutawaySolid) {
+  delete fpCutawaySolid;
+  fpCutawaySolid = pCutawaySolid;
 }
 
@@ -166 +178 @@
      << mp.fNoOfSides;
 
-  os << "\n  Section (DCUT) polyhedron pointer: ";
-  if (!mp.fpSectionPolyhedron) os << "non-";
+  os << "\n  Section (DCUT) shape (G4VSolid) pointer: ";
+  if (!mp.fpSectionSolid) os << "non-";
   os << "null";
 
-  os << "\n  Cutaway (DCUT) polyhedron pointer: ";
-  if (!mp.fpCutawayPolyhedron) os << "non-";
+  os << "\n  Cutaway (DCUT) shape (G4VSolid) pointer: ";
+  if (!mp.fpCutawaySolid) os << "non-";
   os << "null";
 
@@ -192 +204 @@
       (fExplodeCentre          != mp.fExplodeCentre)          ||
       (fNoOfSides              != mp.fNoOfSides)              ||
-      (fpSectionPolyhedron     != mp.fpSectionPolyhedron)     ||
-      (fpCutawayPolyhedron     != mp.fpCutawayPolyhedron)     ||
+      (fpSectionSolid          != mp.fpSectionSolid)     ||
+      (fpCutawaySolid          != mp.fpCutawaySolid)     ||
       (fpEvent                 != mp.fpEvent)
       )