Changeset 1315 for trunk/source/persistency/gdml/src/G4GDMLWriteSolids.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/persistency/gdml/src/G4GDMLWriteSolids.cc (modified) (4 diffs)

trunk/source/persistency/gdml/src/G4GDMLWriteSolids.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GDMLWriteSolids.cc,v 1.65 2009/04/24 15:34:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4GDMLWriteSolids.cc,v 1.68 2010/06/03 14:19:49 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // class G4GDMLWriteSolids Implementation
@@ -53 +53 @@
 #include "G4Sphere.hh"
 #include "G4SubtractionSolid.hh"
+#include "G4GenericTrap.hh"
 #include "G4TessellatedSolid.hh"
 #include "G4Tet.hh"
@@ -608 +609 @@
    torusElement->setAttributeNode(NewAttribute("lunit","mm"));
    solidsElement->appendChild(torusElement);
+}
+
+void G4GDMLWriteSolids::
+GenTrapWrite(xercesc::DOMElement* solidsElement,
+             const G4GenericTrap* const gtrap)
+{
+   const G4String& name = GenerateName(gtrap->GetName(),gtrap);
+
+   std::vector<G4TwoVector> vertices = gtrap->GetVertices();
+
+   xercesc::DOMElement* gtrapElement = NewElement("arb8");
+   gtrapElement->setAttributeNode(NewAttribute("name",name));
+   gtrapElement->setAttributeNode(NewAttribute("dz",
+                                           gtrap->GetZHalfLength()/mm));
+   gtrapElement->setAttributeNode(NewAttribute("v1x", vertices[0].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v1y", vertices[0].y()));
+   gtrapElement->setAttributeNode(NewAttribute("v2x", vertices[1].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v2y", vertices[1].y()));
+   gtrapElement->setAttributeNode(NewAttribute("v3x", vertices[2].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v3y", vertices[2].y()));
+   gtrapElement->setAttributeNode(NewAttribute("v4x", vertices[3].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v4y", vertices[3].y()));
+   gtrapElement->setAttributeNode(NewAttribute("v5x", vertices[4].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v5y", vertices[4].y()));
+   gtrapElement->setAttributeNode(NewAttribute("v6x", vertices[5].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v6y", vertices[5].y()));
+   gtrapElement->setAttributeNode(NewAttribute("v7x", vertices[6].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v7y", vertices[6].y()));
+   gtrapElement->setAttributeNode(NewAttribute("v8x", vertices[7].x()));
+   gtrapElement->setAttributeNode(NewAttribute("v8y", vertices[7].y()));
+   gtrapElement->setAttributeNode(NewAttribute("lunit","mm"));
+   solidsElement->appendChild(gtrapElement);
 }
 
@@ -893 +926 @@
      = dynamic_cast<const G4Torus*>(solidPtr))
      { TorusWrite(solidsElement,torusPtr); } else
+   if (const G4GenericTrap* const gtrapPtr
+     = dynamic_cast<const G4GenericTrap*>(solidPtr))
+     { GenTrapWrite(solidsElement,gtrapPtr); } else
    if (const G4Trap* const trapPtr
      = dynamic_cast<const G4Trap*>(solidPtr))