graxml-commit Mailing List for GraXML (Page 12)
Brought to you by:
hrivnac
Menu
▾
▴
graxml-commit — CVS commit notifications of GraXML
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(6) |
Jun
(2) |
Jul
|
Aug
(12) |
Sep
(32) |
Oct
(41) |
Nov
(16) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(10) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(12) |
Jul
|
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(169) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(100) |
Nov
(14) |
Dec
(10) |
| 2008 |
Jan
(37) |
Feb
(4) |
Mar
(10) |
Apr
(73) |
May
(22) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julius H. <hr...@us...> - 2007-10-02 18:41:04
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2885/net/hep/atlas/graphics/JiveEvent/Schema Modified Files: event.xsd Log Message: S3D added Index: event.xsd =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Schema/event.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** event.xsd 24 Jan 2007 22:08:17 -0000 1.2 --- event.xsd 2 Oct 2007 18:41:04 -0000 1.3 *************** *** 4,7 **** --- 4,10 ---- <!-- $Log$ + Revision 1.3 2007/10/02 18:41:04 hrivnac + S3D added + Revision 1.2 2007/01/24 22:08:17 hrivnac migrated to JAXB 2.0 *************** *** 12,63 **** [...10578 lines suppressed...] ! <xs:enumeration value="FLOAT" /> ! <xs:enumeration value="INT" /> ! <xs:enumeration value="STRING" /> ! </xs:restriction> ! </xs:simpleType> ! </xs:attribute> ! <xs:attribute name="multiple" type="xs:int" default="1" /> ! <xs:attribute name="unit" default="NONE"> ! <xs:simpleType> ! <xs:restriction base="xs:string"> ! <xs:enumeration value="NONE" /> ! <xs:enumeration value="CM" /> ! <xs:enumeration value="RAD" /> ! <xs:enumeration value="GEV" /> ! </xs:restriction> ! </xs:simpleType> ! </xs:attribute> ! </xs:extension> </xs:simpleContent> </xs:complexType> |
|
From: Julius H. <hr...@us...> - 2007-10-02 18:41:03
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2885/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: JiveEventBuilder.java PDG.java Log Message: S3D added Index: JiveEventBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/JiveEventBuilder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JiveEventBuilder.java 24 Jan 2007 22:08:16 -0000 1.6 --- JiveEventBuilder.java 2 Oct 2007 18:41:02 -0000 1.7 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.7 2007/10/02 18:41:02 hrivnac + * S3D added + * * Revision 1.6 2007/01/24 22:08:16 hrivnac * migrated to JAXB 2.0 *************** *** 67,71 **** * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveEvent/Test/data/test_eventFast.xml"}; return demos; } --- 70,74 ---- * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveEvent/Test/data/ttbar_t1_full_01.xml"}; return demos; } Index: PDG.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/PDG.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PDG.java 14 Jan 2007 17:10:43 -0000 1.2 --- PDG.java 2 Oct 2007 18:41:02 -0000 1.3 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2007/10/02 18:41:02 hrivnac + * S3D added + * * Revision 1.2 2007/01/14 17:10:43 hrivnac * embedded demos included *************** *** 102,108 **** /** Give the charge of the particle. * @param code The PDG code of the particle. ! * return The charge of the particle. */ public int charge(int code) { ! return _charges.get(abs(code)) * (int)(signum(code)); } --- 105,114 ---- /** Give the charge of the particle. * @param code The PDG code of the particle. ! * return The charge of the particle, <code>1</code> if unknown.. */ ! // TBD: ??? public int charge(int code) { ! Integer ch = _charges.get(abs(code)); ! if (ch == null) ch = 1; ! return ch; } |
|
From: Julius H. <hr...@us...> - 2007-10-02 17:22:48
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1487/hep/graphics/j3d Modified Files: Helix.java Log Message: PointSet added Index: Helix.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/Helix.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Helix.java 26 Sep 2007 13:26:58 -0000 1.3 --- Helix.java 2 Oct 2007 17:22:45 -0000 1.4 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.4 2007/10/02 17:22:45 hrivnac + * PointSet added + * * Revision 1.3 2007/09/26 13:26:58 hrivnac * Helix cutoff improved *************** *** 103,107 **** charge + ", " + phi + ", " + v_phi + ", " + pt + ", " + mField + ")" + " are illegal, they should satisfy following conditions:" + ! " -1 <= charge <= 1, -pi/2 <= phi <= pi/2, pt > 0, -pi/2 <= v_phi <= pi/2, mField > 0."); } if (! (granularity > 1)) { --- 106,110 ---- charge + ", " + phi + ", " + v_phi + ", " + pt + ", " + mField + ")" + " are illegal, they should satisfy following conditions:" + ! " -1 <= charge <= 1, 0 <= phi <= 2*pi, pt > 0, 0 <= v_phi <= 2*pi, mField > 0."); } if (! (granularity > 1)) { |
|
From: Julius H. <hr...@us...> - 2007-10-02 17:22:48
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1487 Modified Files: index.html Log Message: PointSet added Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** index.html 14 Feb 2007 21:33:27 -0000 1.9 --- index.html 2 Oct 2007 17:22:45 -0000 1.10 *************** *** 24,28 **** PolyGoneSegment, SphereSegment, ! TorusSgment, PolyLine and PolyGone</li> --- 24,29 ---- PolyGoneSegment, SphereSegment, ! TorusSgment, ! PointSet, PolyLine and PolyGone</li> *************** *** 151,154 **** --- 152,156 ---- <li>PolyGoneSegment generalised.</li> <li>Extrusion added.</li> + <li>PointSet added.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-10-02 17:22:48
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1487/org/freehep/j3d Modified Files: PolyLine.java Test.java Added Files: PointSet.java Log Message: PointSet added Index: Test.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Test.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Test.java 14 Feb 2007 21:33:30 -0000 1.4 --- Test.java 2 Oct 2007 17:22:46 -0000 1.5 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.5 2007/10/02 17:22:46 hrivnac + * PointSet added + * * Revision 1.4 2007/02/14 21:33:30 hrivnac * Extrussion added *************** *** 230,233 **** --- 233,250 ---- transparentAppearance())); } + else if (name.equals("PointSet")) { + Point3d[] points = {new Point3d(0.0, 0.1, -0.1), + new Point3d(0.1, -0.1, 0.1), + new Point3d(0.2, 0.1, -0.1), + new Point3d(0.3, -0.1, 0.1), + new Point3d(0.4, 0.2, -0.1), + new Point3d(0.5, -0.4, 0.1), + new Point3d(0.6, 0.8, -0.1), + new Point3d(0.7, -0.8, 0.2), + new Point3d(0.8, 0.8, -0.4), + new Point3d(0.9, -0.8, 0.8)}; + return(new PointSet(points, // points + transparentAppearance())); + } else if (name.equals("PolyLine")) { Point3d[] points = {new Point3d(0.0, 0.1, -0.1), *************** *** 476,479 **** --- 493,497 ---- " PolyGoneSegment |\n" + " TorusSegment |\n" + + " PointSet |\n" + " PolyLine |\n" + " PolyGone |\n" + --- NEW FILE: PointSet.java --- package org.freehep.j3d; // Java3D import javax.media.j3d.Appearance; import javax.media.j3d.Shape3D; import javax.media.j3d.PointArray; import javax.media.j3d.GeometryArray; import javax.vecmath.Point3d; import javax.vecmath.Vector3d; // Java import java.lang.IllegalArgumentException; /** <code>PointSet</code> defined from points. * <img src="doc-files/PointSet.gif"> TBD * <p><font color="#880088"> * <pre> * $Log: PointSet.java,v $ * Revision 1.1 2007/10/02 17:22:45 hrivnac * PointSet added * * </pre> * </font></p> * @opt attributes * @opt operations * @opt types * @opt visibility * @version $Id: PointSet.java,v 1.1 2007/10/02 17:22:45 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class PointSet extends Shape3D { // Constructors -------------------------------------------------------------- /** Initialise pointset to be constructed later. */ protected PointSet() {} /** Create pointset. * @param points The array of {@link Point3d}s, points.length > 1. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public PointSet(Point3d[] points, Appearance appearance) throws IllegalArgumentException { construct(points, appearance); } // --------------------------------------------------------------------------- /** Perform the construction. * @param points The array of {@link Point3d}s, points.length > 1. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ protected void construct(Point3d[] points, Appearance appearance) throws IllegalArgumentException { // Check preconditins if (! (points.length > 1)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + " it should be > 1."); } // Create Point Array int[] counts = new int[1]; counts[0] = points.length; PointArray pointArray = new PointArray(points.length, GeometryArray.COORDINATES); float[] normal = {0, 0, 0}; pointArray.setCoordinates(0, points); // Add Geometry setGeometry(pointArray); // Add Appearance setAppearance(appearance); } } Index: PolyLine.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyLine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PolyLine.java 16 Jan 2007 14:56:25 -0000 1.2 --- PolyLine.java 2 Oct 2007 17:22:45 -0000 1.3 *************** *** 12,20 **** import java.lang.IllegalArgumentException; ! /** <code>Polyline</code> defined from points. * <img src="doc-files/PolyLine.gif"> * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.2 2007/01/16 14:56:25 hrivnac * PolyGone added --- 12,23 ---- import java.lang.IllegalArgumentException; ! /** <code>PolyLine</code> defined from points. * <img src="doc-files/PolyLine.gif"> * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.3 2007/10/02 17:22:45 hrivnac + * PointSet added + * * Revision 1.2 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 59,63 **** public class PolyLine extends Shape3D { ! // Constructors -----------../src/org/freehep/j3d/Poly--------------------------------------------------- /** Initialise polyline to be constructed later. */ --- 62,66 ---- public class PolyLine extends Shape3D { ! // Constructors -------------------------------------------------------------- /** Initialise polyline to be constructed later. */ |
|
From: Julius H. <hr...@us...> - 2007-09-26 15:48:40
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18295/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: WebStart moved Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Guide.html 24 Jan 2007 16:59:25 -0000 1.19 --- Guide.html 26 Sep 2007 15:48:40 -0000 1.20 *************** *** 160,164 **** <p> To run GraXML directly from the Web (on Linux machine using Java 1.5), one has to click on the ! <a href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.jnlp">GraXML WebStart</a> link. Correctly configured Web Browsers will start GraXML automaticaly, otherwise following command should be used on the downloaded file: --- 160,164 ---- <p> To run GraXML directly from the Web (on Linux machine using Java 1.5), one has to click on the ! <a href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.jnlp">GraXML WebStart</a> link. Correctly configured Web Browsers will start GraXML automaticaly, otherwise following command should be used on the downloaded file: |
|
From: Julius H. <hr...@us...> - 2007-09-26 15:48:40
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18295 Modified Files: GraXML.jnlp index.html Log Message: WebStart moved Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GraXML.jnlp 26 Jan 2007 19:30:14 -0000 1.6 --- GraXML.jnlp 26 Sep 2007 15:48:38 -0000 1.7 *************** *** 1,4 **** <?xml version="1.0" encoding="utf-8"?> ! <jnlp spec="1.0+" codebase="http://home.cern.ch/hrivnac/Activities/Packages/WebStart" href="GraXML.jnlp"> <information> <title>GraXML - @VERSION@ [@BUILD@]</title> --- 1,4 ---- <?xml version="1.0" encoding="utf-8"?> ! <jnlp spec="1.0+" codebase="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML" href="GraXML.jnlp" version="@VERSION@ [@BUILD@]"> <information> <title>GraXML - @VERSION@ [@BUILD@]</title> *************** *** 8,12 **** <description kind="one-line">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="short">Framework for manipulation and visualisation of geometrical objects in space.</description> ! <icon kind="default" href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.gif"/> <offline-allowed/> </information> --- 8,12 ---- <description kind="one-line">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="short">Framework for manipulation and visualisation of geometrical objects in space.</description> ! <icon kind="default" href="GraXML.gif"/> <offline-allowed/> </information> *************** *** 16,52 **** <resources> <j2se max-heap-size="536870912" version="1.5+"/> ! <jar href="AGDD.jar"/> ! <jar href="bool.jar"/> ! <jar href="bsh-2.0b1.jar"/> ! <jar href="colt.jar"/> ! <jar href="cx3djava100a.jar"/> ! <jar href="freehep-hep3d.jar"/> ! <jar href="freehep-j3d.jar"/> ! <jar href="GDML.jar"/> ! <jar href="GraXMLDisplay.exe.jar"/> ! <jar href="GraXML.jar" main="true"/> ! <jar href="JiveEvent.jar"/> ! <jar href="JiveGeometry.jar"/> ! <jar href="jlfgr.jar"/> ! <jar href="log4j-1.2.8.jar"/> ! <jar href="relaxngDatatype.jar"/> ! <jar href="xercesImpl.jar"/> ! <jar href="xml-apis.jar"/> ! <jar href="xsdlib.jar"/> ! <jar href="activation.jar"/> ! <jar href="jaxb-api.jar"/> ! <jar href="jaxb-impl.jar"/> ! <jar href="jaxb-impl.jar"/> ! <jar href="jaxb1-impl.jar"/> ! <jar href="jaxb-xjc.jar"/> ! <jar href="jaxp-api.jar"/> ! <jar href="jsr173_api.jar"/> ! <jar href="jaxb-api.jar"/> ! <jar href="jaxb-impl.jar"/> ! <jar href="jaxb-impl.jar"/> ! <jar href="jaxb1-impl.jar"/> ! <jar href="jaxb-xjc.jar"/> ! <jar href="jaxp-api.jar"/> ! <jar href="jsr173_api.jar"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.3-latest.jnlp"/> </resources> --- 16,52 ---- <resources> <j2se max-heap-size="536870912" version="1.5+"/> ! <jar href="jars/AGDD.jar"/> ! <jar href="jars/bool.jar"/> ! <jar href="jars/bsh-2.0b1.jar"/> ! <jar href="jars/colt.jar"/> ! <jar href="jars/cx3djava100a.jar"/> ! <jar href="jars/freehep-hep3d.jar"/> ! <jar href="jars/freehep-j3d.jar"/> ! <jar href="jars/GDML.jar"/> ! <jar href="jars/GraXMLDisplay.exe.jar"/> ! <jar href="jars/GraXML.jar" main="true"/> ! <jar href="jars/JiveEvent.jar"/> ! <jar href="jars/JiveGeometry.jar"/> ! <jar href="jars/jlfgr.jar"/> ! <jar href="jars/log4j-1.2.8.jar"/> ! <jar href="jars/relaxngDatatype.jar"/> ! <jar href="jars/xercesImpl.jar"/> ! <jar href="jars/xml-apis.jar"/> ! <jar href="jars/xsdlib.jar"/> ! <jar href="jars/activation.jar"/> ! <jar href="jars/jaxb-api.jar"/> ! <jar href="jars/jaxb-impl.jar"/> ! <jar href="jars/jaxb-impl.jar"/> ! <jar href="jars/jaxb1-impl.jar"/> ! <jar href="jars/jaxb-xjc.jar"/> ! <jar href="jars/jaxp-api.jar"/> ! <jar href="jars/jsr173_api.jar"/> ! <jar href="jars/jaxb-api.jar"/> ! <jar href="jars/jaxb-impl.jar"/> ! <jar href="jars/jaxb-impl.jar"/> ! <jar href="jars/jaxb1-impl.jar"/> ! <jar href="jars/jaxb-xjc.jar"/> ! <jar href="jars/jaxp-api.jar"/> ! <jar href="jars/jsr173_api.jar"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.3-latest.jnlp"/> </resources> Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.html 17 Jan 2006 17:39:34 -0000 1.5 --- index.html 26 Sep 2007 15:48:38 -0000 1.6 *************** *** 18,22 **** <ul> <li><a href="JavaDoc/net/hep/graphics/GraXML/doc-files/Guide.html">Users Guide</a></li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.jnlp">WebStart</a> (run using <code>javaws</code> command).</li> <li>The latest <a href="http://home.cern.ch/hrivnac/Activities/Packages/GraXML-dist.tar.gz">full distribution</a> (ready to run).</li> <li><a href="Gallery">Gallery</a></li> --- 18,22 ---- <ul> <li><a href="JavaDoc/net/hep/graphics/GraXML/doc-files/Guide.html">Users Guide</a></li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.jnlp">WebStart</a> (run using <code>javaws</code> command).</li> <li>The latest <a href="http://home.cern.ch/hrivnac/Activities/Packages/GraXML-dist.tar.gz">full distribution</a> (ready to run).</li> <li><a href="Gallery">Gallery</a></li> *************** *** 31,37 **** <li>Geometric Model libraries: <ul> ! <li><a href="http://.home.cern.ch/hrivnac/Activities/Packages/AGDD/">AGDD</a></li> ! <li><a href="http://.home.cern.ch/hrivnac/Activities/Packages/GDML/">GDML</a></li> ! <li><a href="http://.home.cern.ch/hrivnac/Activities/Packages/JiveEvent/">JiveEvent</a></li> </ul> </li> --- 31,37 ---- <li>Geometric Model libraries: <ul> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/AGDD/">AGDD</a></li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/GDML/">GDML</a></li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/JiveEvent/">JiveEvent</a></li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-09-26 15:48:38
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18295/net/hep/graphics/GraXML/Test Modified Files: Elements-convert.bsh Elements-display.bsh Log Message: WebStart moved Index: Elements-convert.bsh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test/Elements-convert.bsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Elements-convert.bsh 7 Oct 2005 18:59:03 -0000 1.2 --- Elements-convert.bsh 26 Sep 2007 15:48:40 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- * <pre> * $Log$ + * Revision 1.3 2007/09/26 15:48:40 hrivnac + * WebStart moved + * * Revision 1.2 2005/10/07 18:59:03 hrivnac * tests updated *************** *** 53,56 **** --- 56,60 ---- "AliPolys.agdd", "AliSolids.agdd", + "Extrusion.agdd", "BinaryOperators.agdd", "Colors.agdd", Index: Elements-display.bsh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test/Elements-display.bsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Elements-display.bsh 7 Oct 2005 18:59:03 -0000 1.2 --- Elements-display.bsh 26 Sep 2007 15:48:40 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- * <pre> * $Log$ + * Revision 1.3 2007/09/26 15:48:40 hrivnac + * WebStart moved + * * Revision 1.2 2005/10/07 18:59:03 hrivnac * tests updated *************** *** 59,62 **** --- 62,66 ---- "AliPolys.agdd", "AliSolids.agdd", + "Extrusion.agdd", "BinaryOperators.agdd", "Colors.agdd", |
|
From: Julius H. <hr...@us...> - 2007-09-26 15:48:20
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18264 Modified Files: ToDo.txt build.xml Log Message: WebStart moved Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/ToDo.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ToDo.txt 16 Jan 2007 14:48:12 -0000 1.4 --- ToDo.txt 26 Sep 2007 15:48:22 -0000 1.5 *************** *** 11,12 **** --- 11,14 ---- update Guide wrt JiveGeometry + put all test files into test *bsh scripts and on Web + Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** build.xml 26 Jan 2007 19:32:07 -0000 1.14 --- build.xml 26 Sep 2007 15:48:22 -0000 1.15 *************** *** 301,313 **** <fileset file="${lib}/*.jar"/> </signjar> ! <copy todir="${user.home}/WWW/Activities/Packages/WebStart" overwrite="true"> ! <fileset file="${src}/*.jnlp"/> <fileset file="${lib}/*.jar"/> </copy> ! <replace file="${user.home}/WWW/Activities/Packages/WebStart/GraXML.jnlp" token="@VERSION@" value="${version}"/> ! <replace file="${user.home}/WWW/Activities/Packages/WebStart/GraXML.jnlp" token="@BUILD@" value="${TSTAMP}"/> ! <replace file="${user.home}/WWW/Activities/Packages/WebStart/GraXML-JAXB.jnlp" token="@VERSION@" value="${version}"/> ! <replace file="${user.home}/WWW/Activities/Packages/WebStart/GraXML-JAXB.jnlp" token="@BUILD@" value="${TSTAMP}"/> ! <copy tofile="${user.home}/WWW/Activities/Packages/WebStart/GraXML.gif" file="${src}/net/hep/graphics/GraXML/doc-files/logo.gif"/> </target> --- 301,313 ---- <fileset file="${lib}/*.jar"/> </signjar> ! <copy todir="${user.home}/WWW/Activities/Packages/WebStart/GraXML/jars" overwrite="true"> <fileset file="${lib}/*.jar"/> </copy> ! <copy todir="${user.home}/WWW/Activities/Packages/WebStart/GraXML" overwrite="true"> ! <fileset file="${src}/*.jnlp"/> ! </copy> ! <replace file="${user.home}/WWW/Activities/Packages/WebStart/GraXML/GraXML.jnlp" token="@VERSION@" value="${version}"/> ! <replace file="${user.home}/WWW/Activities/Packages/WebStart/GraXML/GraXML.jnlp" token="@BUILD@" value="${TSTAMP}"/> ! <copy tofile="${user.home}/WWW/Activities/Packages/WebStart/GraXML/GraXML.gif" file="${src}/net/hep/graphics/GraXML/doc-files/logo.gif"/> </target> |
|
From: Julius H. <hr...@us...> - 2007-09-26 13:26:58
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27842/hep/graphics/j3d Modified Files: Helix.java Log Message: Helix cutoff improved Index: Helix.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/Helix.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Helix.java 16 Jan 2007 14:56:25 -0000 1.2 --- Helix.java 26 Sep 2007 13:26:58 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2007/09/26 13:26:58 hrivnac + * Helix cutoff improved + * * Revision 1.2 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 242,256 **** if (sqrt(rx*rx + ry*ry) < _radius && abs(rz) < _length / 2f) { ! do { x = rx + sigma * (cos(phi0) - brem * cos(- charge * delta * w + phi0)); y = ry + sigma * (sin(phi0) - brem * sin(- charge * delta * w + phi0)); ! z = rz + alpha * delta * w; ! points.add(new Point3d(x, y, z)); ! i += 1; ! w += 1; ! brem *= _bremFactor; ! } while (sqrt(x*x + y*y) < _radius && ! abs(z) < _length / 2f && ! i < _iterCutOff * granularity); } --- 245,263 ---- if (sqrt(rx*rx + ry*ry) < _radius && abs(rz) < _length / 2f) { ! boolean isInside = true; ! while (isInside) { x = rx + sigma * (cos(phi0) - brem * cos(- charge * delta * w + phi0)); y = ry + sigma * (sin(phi0) - brem * sin(- charge * delta * w + phi0)); ! z = rz + alpha * delta * w; ! isInside = sqrt(x*x + y*y) < _radius && ! abs(z) < _length / 2f && ! i < _iterCutOff * granularity; ! if (isInside) { ! points.add(new Point3d(x, y, z)); ! i += 1; ! w += 1; ! brem *= _bremFactor; ! } ! } } |
|
From: Julius H. <hr...@us...> - 2007-02-15 17:18:50
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14072/net/hep/AGDD/GeometricModel Added Files: Boolean.java Log Message: Boolean operations introduced, not yet working --- NEW FILE: Boolean.java --- package net.hep.AGDD.GeometricModel; import net.hep.AGDD.GeometricModel.Evaluator; // Generic Model import net.hep.AGDD.JAXB.BooleanVolume; import net.hep.AGDD.JAXB.VolumeType; import net.hep.AGDD.JAXB.SinglePosition; // GraXML import net.hep.graphics.GraXML.MasterBuilder; // FreeHEP import org.freehep.j3d.BooleanShape3D; import org.freehep.j3d.BooleanOperation; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.media.j3d.TransformGroup; import javax.media.j3d.Transform3D; import javax.media.j3d.Shape3D; import javax.vecmath.Vector3d; import javax.vecmath.Matrix3d; // JAXB import javax.xml.bind.JAXBElement; // Java import java.util.List; // Log4J import org.apache.log4j.Logger; /** Common part of GraXML representations {@link net.hep.graphics.GraXML.GraXMLJAXBRep} of boolean solid AGDD * elements connected via JAXB generic JAXB * interfaces. * <p><font color="#880088"> * <pre> * $Log: Boolean.java,v $ * Revision 1.1 2007/02/15 17:18:36 hrivnac * Boolean operations introduced, not yet working * * </pre> * </font></p> * @version $Id: Boolean.java,v 1.1 2007/02/15 17:18:36 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public abstract class Boolean extends Solid { public abstract void traverse(MasterBuilder builder, Object element, Group tg, String parent); /** Perform boolean operation. * @param builder The {@link MasterBuilder} building this SceneGraph. * @param bool The {@link BooleanSolidType} to be used. * @param operation The required {@link BooleanOperation}. * @param parent The name of the parent element. * @param tg The parent {@link Group}. */ protected void compose(AGDDBuilder builder, BooleanVolume bool, BooleanOperation operation, String parent, Group tg) { // - Volume Evaluator evaluator = builder.evaluator(); List<Object> volumes = bool.getVolumeOrPosXYZOrPosRPhiZ(); VolumeType volume = null; SinglePosition position = null; // BUG: only one volume x one position for (Object o : volumes) { if (o instanceof JAXBElement) { o = ((JAXBElement)o).getValue(); } if (o instanceof VolumeType) { volume = (VolumeType)o; } else if (o instanceof SinglePosition) { position = (SinglePosition)o; } } // Verify and set builder type setBuilder(builder); // Get element properties String name = bool.getName(); // Store registerrimg status and set up for registering boolean register = Solid.register(); Solid.setRegister(true); // Traverse both children and add their represntations into branch BranchGroup branch = new BranchGroup(); // Create new TransformGroup TransformGroup tr = builder().transform(tg); // - First builder().traverse(volume.getName(), tr, parent); Shape3D firstShape = Solid.registeredShape3D(); // - Second builder().traverse(position, tr, parent); Shape3D secondShape = Solid.registeredShape3D(); // Perform boolean operation System.out.print("$"); log.debug("Constructing " + operation + " between " + firstShape + " and " + secondShape); Shape3D shape = new BooleanShape3D(firstShape, secondShape, operation); shape.setAppearance(builder().appearance(name)); // Use it // restore registration status for case of nested Booleans Solid.setRegister(register); use(shape, name, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(Boolean.class); } |
|
From: Julius H. <hr...@us...> - 2007-02-15 17:18:50
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14072/net/hep/AGDD/GeometricModel/Reps Added Files: Intersection.java Subtraction.java Union.java Log Message: Boolean operations introduced, not yet working --- NEW FILE: Subtraction.java --- package net.hep.AGDD.GeometricModel.Reps; import net.hep.AGDD.GeometricModel.AGDDBuilder; import net.hep.AGDD.GeometricModel.Boolean; // Generic Model import net.hep.AGDD.JAXB.SubtractionType; // GraXML import net.hep.graphics.GraXML.MasterBuilder; // FreeHEP import org.freehep.j3d.BooleanOperation; import static org.freehep.j3d.BooleanOperation.Union; // Java3D import javax.media.j3d.Group; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} * of <code>subtraction</code> AGDD elements * connected via JAXB {@link net.hep.AGDD.JAXB.Union} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: Subtraction.java,v $ * Revision 1.1 2007/02/15 17:18:37 hrivnac * Boolean operations introduced, not yet working * * </pre> * </font></p> * @version $Id: Subtraction.java,v 1.1 2007/02/15 17:18:37 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class Subtraction extends Boolean { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify element type if (! (element instanceof SubtractionType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Assemble composed boolean solid compose((AGDDBuilder)builder, (SubtractionType)element, Union, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(Subtraction.class); } --- NEW FILE: Intersection.java --- package net.hep.AGDD.GeometricModel.Reps; import net.hep.AGDD.GeometricModel.AGDDBuilder; import net.hep.AGDD.GeometricModel.Boolean; // Generic Model import net.hep.AGDD.JAXB.IntersectionType; // GraXML import net.hep.graphics.GraXML.MasterBuilder; // FreeHEP import org.freehep.j3d.BooleanOperation; import static org.freehep.j3d.BooleanOperation.Union; // Java3D import javax.media.j3d.Group; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} * of <code>initersection</code> AGDD elements * connected via JAXB {@link net.hep.AGDD.JAXB.Intersection} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: Intersection.java,v $ * Revision 1.1 2007/02/15 17:18:37 hrivnac * Boolean operations introduced, not yet working * * </pre> * </font></p> * @version $Id: Intersection.java,v 1.1 2007/02/15 17:18:37 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class Intersection extends Boolean { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify element type if (! (element instanceof IntersectionType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Assemble composed boolean solid compose((AGDDBuilder)builder, (IntersectionType)element, Union, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(Intersection.class); } --- NEW FILE: Union.java --- package net.hep.AGDD.GeometricModel.Reps; import net.hep.AGDD.GeometricModel.AGDDBuilder; import net.hep.AGDD.GeometricModel.Boolean; // Generic Model import net.hep.AGDD.JAXB.UnionType; // GraXML import net.hep.graphics.GraXML.MasterBuilder; // FreeHEP import org.freehep.j3d.BooleanOperation; import static org.freehep.j3d.BooleanOperation.Union; // Java3D import javax.media.j3d.Group; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} * of <code>union</code> AGDD elements * connected via JAXB {@link net.hep.AGDD.JAXB.Union} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: Union.java,v $ * Revision 1.1 2007/02/15 17:18:38 hrivnac * Boolean operations introduced, not yet working * * </pre> * </font></p> * @version $Id: Union.java,v 1.1 2007/02/15 17:18:38 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class Union extends Boolean { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify element type if (! (element instanceof UnionType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Assemble composed boolean solid compose((AGDDBuilder)builder, (UnionType)element, Union, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(Union.class); } |
|
From: Julius H. <hr...@us...> - 2007-02-15 10:49:49
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18812/org/freehep/j3d Modified Files: PolyGone.java Log Message: doc updated Index: PolyGone.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyGone.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PolyGone.java 14 Feb 2007 21:33:27 -0000 1.3 --- PolyGone.java 15 Feb 2007 10:49:47 -0000 1.4 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.4 2007/02/15 10:49:47 hrivnac + * doc updated + * * Revision 1.3 2007/02/14 21:33:27 hrivnac * Extrussion added *************** *** 34,38 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: documentation picture public class PolyGone extends Solid { --- 37,40 ---- |
|
From: Julius H. <hr...@us...> - 2007-02-15 10:49:49
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18812/org/freehep/j3d/doc-files Added Files: Extrusion.gif Log Message: doc updated --- NEW FILE: Extrusion.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Julius H. <hr...@us...> - 2007-02-15 10:48:57
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18396 Modified Files: index.html Log Message: doc updated Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** index.html 14 Feb 2007 21:53:39 -0000 1.25 --- index.html 15 Feb 2007 10:48:56 -0000 1.26 *************** *** 34,37 **** --- 34,38 ---- <li><a href="Examples/Copies.agdd">Copies.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Copies.wrl.gz">Copies.wrl</a></li> <li><a href="Examples/Envelopes.agdd">Envelopes.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Envelopes.wrl.gz">Envelopes.wrl</a></li> + <li><a href="Examples/Envelopes.agdd">Extrusion.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Extrusion.wrl.gz">Extrusion.wrl</a></li> <li><a href="Examples/Identifiers.agdd">Identifiers.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Indentifiers.wrl.gz">Indentifiers.wrl</a></li> <li><a href="Examples/Including.agdd">Including.agdd</a>, |
|
From: Julius H. <hr...@us...> - 2007-02-15 10:48:57
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18396/net/hep/AGDD/Test/doc-files Modified Files: Solids.wrl.gz Added Files: Extrusion.wrl.gz Log Message: doc updated --- NEW FILE: Extrusion.wrl.gz --- (This appears to be a binary file; contents omitted.) Index: Solids.wrl.gz =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/doc-files/Solids.wrl.gz,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsbFG7jm and /tmp/cvs2NFECx differ |
|
From: Julius H. <hr...@us...> - 2007-02-14 21:53:47
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14205/net/hep/AGDD/Test/data Added Files: Extrusion.agdd Log Message: gvxy added --- NEW FILE: Extrusion.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: Extrusion --> <!-- $Log: Extrusion.agdd,v $ Revision 1.1 2007/02/14 21:53:39 hrivnac gvxy added --> <!-- @version $Id: Extrusion.agdd,v 1.1 2007/02/14 21:53:39 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> <section DTD_version = "v8" name = "Extrusion" version = "$Id: Extrusion.agdd,v 1.1 2007/02/14 21:53:39 hrivnac Exp $" date = "2007-02-17" author = "Julius Hrivnac" top_volume = "TEST"> <gvxy name="gvxy" medium="active" dZ="500"> <gvxy_point X_Y=" 0; 0"/> <gvxy_point X_Y=" 1000; 0"/> <gvxy_point X_Y=" 2000; 3000"/> <gvxy_point X_Y=" 4000; 8000"/> <gvxy_point X_Y=" 3000; 9000"/> <gvxy_point X_Y=" 3000; 8000"/> <gvxy_point X_Y=" 2000; 7000"/> <gvxy_point X_Y=" 2000; 5000"/> <gvxy_point X_Y=" 1000; 3000"/> <gvxy_point X_Y=" 1000; 2000"/> </gvxy> <composition name="TEST"> <posXYZ X_Y_Z="0; 0; 0"> <volume name="gvxy"/> </posXYZ> </composition> </section> </AGDD> |
|
From: Julius H. <hr...@us...> - 2007-02-14 21:53:47
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14205 Modified Files: index.html Log Message: gvxy added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** index.html 12 Feb 2007 15:56:50 -0000 1.24 --- index.html 14 Feb 2007 21:53:39 -0000 1.25 *************** *** 148,151 **** --- 148,152 ---- <li>Migrated to JAXB 2.0.</li> <li>Included sphere and torus.</li> + <li>Included gvxy (from Persint).</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-02-14 21:53:47
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14205/net/hep/AGDD/Schema Modified Files: AGDD.xsd AGDD0.xsd Log Message: gvxy added Index: AGDD0.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD0.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGDD0.xsd 12 Feb 2007 15:56:52 -0000 1.2 --- AGDD0.xsd 14 Feb 2007 21:53:39 -0000 1.3 *************** *** 4,7 **** --- 4,10 ---- <!-- $Log$ + Revision 1.3 2007/02/14 21:53:39 hrivnac + gvxy added + Revision 1.2 2007/02/12 15:56:52 hrivnac sphere and torus added *************** *** 1013,1016 **** --- 1016,1071 ---- </xs:element> + <!-- gvxy ..................................................................... --> + <xs:element name="gvxy" substitutionGroup="abstractSolid"> + <xs:annotation> + <xs:documentation> + A gvxy is, in the general case, a Z-extrusion of X-Y polygone. The + gvxy is build from a series of X-Y points. + <br></br> + Its dimensions are given by: + <ul> + <li><b>dZ="dZ"</b>.</li> + </ul> + with: + <ul> + <li><b>dZ</b>: Lenght in Z-direction.</li> + </ul> + The vertexes of the gvxy are given by a series of XML element 'gvxy_point', + which are children of 'gvxy'. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="solid"> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="gvxy_point"/> + </xs:sequence> + <xs:attribute name="dZ" type="scalar" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <!-- gvxy_point ............................................................... --> + <xs:element name="gvxy_point"> + <xs:annotation> + <xs:documentation> + A gvxy_point is used to construct gvxy. + The gvxy_point dimensions are given by: + <ul> + <li><b>X_Y="X; Y"</b>.</li> + </ul> + with: + <ul> + <li><b>X</b>: the X-coordinate of the point.</li> + <li><b>Y</b>: the Y-coordinate of the point.</li> + </ul> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="X_Y" type="vector2" use="required"/> + </xs:complexType> + </xs:element> + <!-- Volume Instances / Stacks ================================================ --> Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AGDD.xsd 12 Feb 2007 15:56:50 -0000 1.13 --- AGDD.xsd 14 Feb 2007 21:53:39 -0000 1.14 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.14 2007/02/14 21:53:39 hrivnac + gvxy added + Revision 1.13 2007/02/12 15:56:50 hrivnac sphere and torus added *************** *** 1011,1014 **** --- 1014,1069 ---- </xs:element> + <!-- gvxy ..................................................................... --> + <xs:element name="gvxy" substitutionGroup="abstractSolid"> + <xs:annotation> + <xs:documentation> + A gvxy is, in the general case, a Z-extrusion of X-Y polygone. The + gvxy is build from a series of X-Y points. + <br></br> + Its dimensions are given by: + <ul> + <li><b>dZ="dZ"</b>.</li> + </ul> + with: + <ul> + <li><b>dZ</b>: Lenght in Z-direction.</li> + </ul> + The vertexes of the gvxy are given by a series of XML element 'gvxy_point', + which are children of 'gvxy'. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:complexContent> + <xs:extension base="solid"> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="gvxy_point"/> + </xs:sequence> + <xs:attribute name="dZ" type="scalar" use="required"/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <!-- gvxy_point ............................................................... --> + <xs:element name="gvxy_point"> + <xs:annotation> + <xs:documentation> + A gvxy_point is used to construct gvxy. + The gvxy_point dimensions are given by: + <ul> + <li><b>X_Y="X; Y"</b>.</li> + </ul> + with: + <ul> + <li><b>X</b>: the X-coordinate of the point.</li> + <li><b>Y</b>: the Y-coordinate of the point.</li> + </ul> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="X_Y" type="vector2" use="required"/> + </xs:complexType> + </xs:element> + <!-- Volume Instances / Stacks ================================================ --> |
|
From: Julius H. <hr...@us...> - 2007-02-14 21:53:47
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/external In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14205/net/hep/AGDD/Test/data/external Added Files: feet.agdd sadle.agdd Log Message: gvxy added --- NEW FILE: sadle.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: Calorimeter Saddle --> <!-- $Log: sadle.agdd,v $ Revision 1.1 2007/02/14 21:53:39 hrivnac gvxy added --> <!-- @version $Id: sadle.agdd,v 1.1 2007/02/14 21:53:39 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <!-- @author Daniel Pomarede --> <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> <section DTD_version = "v8" name = "Calorimeter Saddle" version = "$Id: sadle.agdd,v 1.1 2007/02/14 21:53:39 hrivnac Exp $" date = "9 May 2006" author = "Daniel Pomarede" top_volume = "useless"> <var name="GENV_Pi" value="3.141592654" /> <var name="GENV_PiS180" value="GENV_Pi/180." /> <!-- Box Beam --> <!-- ATLLBUS_0019 --> <var name="SADL_BxBLen" value="6200"/> <var name="SADL_BxBWid" value="520"/> <var name="SADL_BxBHei" value="360"/> <var name="SADL_BxBHThi1" value="90"/> <var name="SADL_BxBHThi2" value="40"/> <var name="SADL_BxBVThi" value="60"/> <!-- ATLLBUS_0003 --> <var name="SADL_BxBxref" value="2740"/> <var name="SADL_BxByref" value="4000"/> <!-- Extended Barrel Box Beam --> <!-- ATLLEUS_0002 --> <var name="SADL_BxBELen" value="3355"/> <var name="SADL_EBxBzpos" value="4832.5"/> <!-- Rounded Support --> <!-- ATLLBUS_0006 & ATLLBUS_0009 & ATLLBUS_0012 & ATLLBUS_0015 --> <var name="SADL_RSprof1" value="301.8"/> <var name="SADL_RSprof2" value="32"/> <var name="SADL_RSLenAC" value="731"/> <var name="SADL_RSLenBD" value="746"/> <var name="SADL_RSrin" value="4240"/> <var name="SADL_RSrout" value="4310"/> <!-- Gusset --> <!-- ATLLBUS_0005 --> <var name="SADL_GudZ" value="70"/> <var name="SADL_GualphA" value="31"/> <var name="SADL_GualphE" value="22.5"/> <var name="SADL_GuthicAB" value="61"/> <var name="SADL_GuthicBC" value="63.6"/> <var name="SADL_GudyAF" value="252"/> <var name="SADL_GudxAF" value="443.8"/> <var name="SADL_GudxEF" value="55"/> <var name="SADL_GudxFJ" value="1087.7"/> <var name="SADL_GudyAJ" value="1634.3"/> <var name="SADL_GudyFG" value="430"/> <var name="SADL_GudxGH" value="510"/> <var name="SADL_GudxFI" value="1125.5"/> <var name="SADL_GudyHI" value="1440.6"/> <!-- ATLLBUS_0006 --> <var name="SADL_Guposxg" value="2715"/> <var name="SADL_Guposyg" value="-3485"/> <!-- ATLLBUS_0006 --> <var name="SADL_Gussdz1" value="265"/> <var name="SADL_Gussdz2" value="280"/> <!-- Connection Gusset / Box Beam --> <!-- ATLLBUS_0006 & ATLLBUS_0007 --> <var name="SADL_CGBBthi" value="25"/> <var name="SADL_CGBBlen" value="870"/> <var name="SADL_CGBBHwid" value="545"/> <var name="SADL_CGBBVwid" value="400"/> <!-- Stiffener --> <!-- ATLLBUS_0018 & ATLLEUS_0021 --> <var name="SADL_StifLen" value="1149"/> <!-- extremity plate --> <var name="SADL_StEPwid" value="152"/> <var name="SADL_StEPthi" value="15"/> <!-- tube-square --> <var name="SADL_StTUthi" value="10"/> <var name="SADL_StTUext" value="100"/> <!-- rotation --> <var name="SADL_Stzrot" value="45"/> <!-- Doublet --> <!-- ATLLBUS_0003 --> <var name="SADL_SaddZmax" value="2820"/> <!-- Gusset surface is in this plane --> <!-- ATLLEUS_0002 --> <var name="SADL_ESadZmax" value="6150"/> <!-- Gusset surface is in this plane --> <!-- stiffener position --> <!-- ATLLBUS_0008 --> <var name="SADL_Stxpos" value=" 3362"/> <var name="SADL_Stypos" value="-2910"/> <!-- Barrel Blocking Jacks --> <!-- Barrel Blocking Jacks positions --> <array name="SADL_BlJazpos" values="529;2369;3989;5789" /> <var name="SADL_BlJaypos" value="-4390"/> <var name="SADL_BlJaxpos" value="3000"/> <var name="SADL_BBJPlen" value="520"/> <var name="SADL_BBJPwid" value="360"/> <var name="SADL_BBJPthi" value="45"/> <var name="SADL_BBJBCthi" value="290"/> <var name="SADL_BBJBCrad" value="152"/> <var name="SADL_BBJSCthi" value="55"/> <var name="SADL_BBJSCrad" value="98"/> <!-- Derived variables --> <!-- Box Beam --> <var name="SADL_BxBHyp1" value="-SADL_BxBHei/2.-SADL_BxBHThi1/2."/> <var name="SADL_BxBHyp2" value="SADL_BxBHei/2.+SADL_BxBHThi2/2."/> <var name="SADL_BxBVxpos" value="SADL_BxBWid/2.-SADL_BxBVThi/2."/> <!-- Gusset --> <var name="SADL_Guxa" value="0"/> <var name="SADL_Guya" value="0"/> <var name="SADL_Guxb" value="SADL_Guxa+SADL_GuthicAB*sin(SADL_GualphA*GENV_PiS180)"/> <var name="SADL_Guyb" value="SADL_Guya-SADL_GuthicAB*cos(SADL_GualphA*GENV_PiS180)"/> <var name="SADL_Guxc" value="SADL_Guxb+SADL_GuthicBC/tan(SADL_GualphA*GENV_PiS180)"/> <var name="SADL_Guyc" value="SADL_Guyb+SADL_GuthicBC"/> <var name="SADL_Guxf" value="SADL_Guxa+SADL_GudxAF"/> <var name="SADL_Guyf" value="SADL_Guya-SADL_GudyAF"/> <var name="SADL_Guxe" value="SADL_Guxf-SADL_GudxEF"/> <var name="SADL_Guye" value="SADL_Guyf"/> <var name="SADL_Guyd" value="SADL_Guyc"/> <var name="SADL_Guxd" value="SADL_Guxe-(SADL_Guyd-SADL_Guye)*tan(SADL_GualphE*GENV_PiS180)"/> <var name="SADL_Guxg" value="SADL_Guxf"/> <var name="SADL_Guyg" value="SADL_Guyf+SADL_GudyFG"/> <var name="SADL_Guxh" value="SADL_Guxg+SADL_GudxGH"/> <var name="SADL_Guyh" value="SADL_Guyg"/> <var name="SADL_Guxi" value="SADL_Guxf+SADL_GudxFI"/> <var name="SADL_Guyi" value="SADL_Guyh+SADL_GudyHI"/> <var name="SADL_Guxj" value="SADL_Guxf+SADL_GudxFJ"/> <var name="SADL_Guyj" value="SADL_Guya+SADL_GudyAJ"/> <var name="SADL_Guposxa" value="SADL_Guposxg-SADL_Guxg"/> <var name="SADL_Guposya" value="SADL_Guposyg-SADL_Guyg"/> <var name="SADL_Gusspz2" value="SADL_Gussdz2+SADL_GudZ"/> <var name="SADL_Gusspz1" value="SADL_Gussdz1+SADL_GudZ"/> <!-- Box beam positions --> <var name="SADL_BxBxpos" value="SADL_BxBxref+SADL_BxBWid/2"/> <var name="SADL_BxBypos" value="-SADL_BxByref+SADL_BxBHei/2+SADL_BxBHThi1"/> <!-- Connection Gusset / Box Beam --> <var name="SADL_CGBBHPx" value="SADL_Guposxg+SADL_CGBBHwid/2"/> <var name="SADL_CGBBHPy" value="SADL_Guposyg-SADL_CGBBthi/2"/> <var name="SADL_CGBBVPx" value="SADL_Guposxg+SADL_CGBBthi/2"/> <var name="SADL_CGBBVPy" value="SADL_Guposyg-SADL_CGBBVwid/2-SADL_CGBBthi"/> <!-- Stiffener --> <!-- height of flange --> <var name="SADL_StTFlhei" value="SADL_StTUext-2*SADL_StTUthi"/> <!-- x/y pos of flange/plate --> <var name="SADL_StTFlpos" value="SADL_StTUext/2-SADL_StTUthi/2"/> <!-- length --> <var name="SADL_StifLen0" value="SADL_StifLen-2*SADL_StEPthi"/> <!-- z pos of extremity plate --> <var name="SADL_StEPzpos" value="SADL_StifLen/2-SADL_StEPthi/2"/> <!-- Barrel Doublet --> <!-- ATLLBUS_0003 --> <var name="SADL_SaddZ2" value="SADL_SaddZmax-SADL_Gussdz1-1.5*SADL_GudZ"/> <!-- position of first unit is inferred from stiffener length --> <var name="SADL_SaddZ1" value="SADL_SaddZ2-3.*SADL_GudZ-2.*SADL_Gussdz2-SADL_StifLen"/> <!-- stiffener position --> <var name="SADL_Stzpos" value="(SADL_SaddZ1+SADL_SaddZ2)/2"/> <!-- Extended Barrel Doublet --> <!-- ATLLEUS_0002 --> <var name="SADL_ESaddZ2" value="SADL_ESadZmax-SADL_Gussdz1-1.5*SADL_GudZ"/> <!-- position of first unit is inferred from stiffener length --> <var name="SADL_ESaddZ1" value="SADL_ESaddZ2-3.*SADL_GudZ-2.*SADL_Gussdz2-SADL_StifLen"/> <!-- stiffener position --> <var name="SADL_EStzpos" value="(SADL_ESaddZ1+SADL_ESaddZ2)/2"/> <!-- Barrel Blocking Jacks --> <var name="SADL_BBJSCyp" value="SADL_BBJSCthi/2"/> <var name="SADL_BBJBCyp" value="SADL_BBJSCthi+SADL_BBJBCthi/2"/> <var name="SADL_BBJPyp" value="SADL_BBJSCthi+SADL_BBJBCthi+SADL_BBJPthi/2"/> <!-- Modelization --> <!-- Box Beam --> <box name="SADL_BoxBeam_HPlate_Lower" medium="active" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi1;SADL_BxBLen"/> <box name="SADL_BoxBeam_HPlate_Upper" medium="active" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi2;SADL_BxBLen"/> <box name="SADL_BoxBeam_VPlate" medium="active" X_Y_Z="SADL_BxBVThi;SADL_BxBHei ;SADL_BxBLen"/> <!-- Extended Barrel Box Beam --> <box name="SADL_Extended_BoxBeam_HPlate_Lower" medium="active" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi1;SADL_BxBELen"/> <box name="SADL_Extended_BoxBeam_HPlate_Upper" medium="active" X_Y_Z="SADL_BxBWid ;SADL_BxBHThi2;SADL_BxBELen"/> <box name="SADL_Extended_BoxBeam_VPlate" medium="active" X_Y_Z="SADL_BxBVThi;SADL_BxBHei ;SADL_BxBELen"/> <composition name="SADL_BoxBeam"> <posXYZ volume="SADL_BoxBeam_HPlate_Lower" X_Y_Z="0;SADL_BxBHyp1;0" /> <posXYZ volume="SADL_BoxBeam_HPlate_Upper" X_Y_Z="0;SADL_BxBHyp2;0" /> <posXYZ volume="SADL_BoxBeam_VPlate" X_Y_Z=" SADL_BxBVxpos;0;0" /> <posXYZ volume="SADL_BoxBeam_VPlate" X_Y_Z="-SADL_BxBVxpos;0;0" /> </composition> <composition name="SADL_Extended_BoxBeam"> <posXYZ volume="SADL_Extended_BoxBeam_HPlate_Lower" X_Y_Z="0;SADL_BxBHyp1;0" /> <posXYZ volume="SADL_Extended_BoxBeam_HPlate_Upper" X_Y_Z="0;SADL_BxBHyp2;0" /> <posXYZ volume="SADL_Extended_BoxBeam_VPlate" X_Y_Z=" SADL_BxBVxpos;0;0" /> <posXYZ volume="SADL_Extended_BoxBeam_VPlate" X_Y_Z="-SADL_BxBVxpos;0;0" /> </composition> <!-- Rounded Support --> <tubs name="SADL_RoundedSupportAC" medium="active" Rio_Z="SADL_RSrin SADL_RSrout SADL_RSLenAC" profile="SADL_RSprof1 SADL_RSprof2"/> <tubs name="SADL_RoundedSupportBD" medium="active" Rio_Z="SADL_RSrin SADL_RSrout SADL_RSLenBD" profile="SADL_RSprof1 SADL_RSprof2"/> <!-- Gusset --> <gvxy name="SADL_Gusset_Core" medium="active" dZ="SADL_GudZ"> <gvxy_point X_Y="SADL_Guxa;SADL_Guya"/> <gvxy_point X_Y="SADL_Guxb;SADL_Guyb"/> <gvxy_point X_Y="SADL_Guxc;SADL_Guyc"/> <gvxy_point X_Y="SADL_Guxd;SADL_Guyd"/> <gvxy_point X_Y="SADL_Guxe;SADL_Guye"/> <gvxy_point X_Y="SADL_Guxf;SADL_Guyf"/> <gvxy_point X_Y="SADL_Guxg;SADL_Guyg"/> <gvxy_point X_Y="SADL_Guxh;SADL_Guyh"/> <gvxy_point X_Y="SADL_Guxi;SADL_Guyi"/> <gvxy_point X_Y="SADL_Guxj;SADL_Guyj"/> </gvxy> <tubs name="SADL_Gusset_Cut" mediaum="active" Rio_Z="0 SADL_RSrout SADL_RSLenBD" profile="SADL_RSprof1 SADL_RSprof2" /> <subtraction name="SADL_Gusset_Plate" > <posXYZ volume="SADL_Gusset_Core" X_Y_Z="SADL_Guposxa;SADL_Guposya;0"/> <posXYZ volume="SADL_Gusset_Cut"/> </subtraction> <!-- Connection Gusset / Box Beam --> <box name="SADL_ConnGussetBBeam_HPlate" medium="active" X_Y_Z="SADL_CGBBHwid;SADL_CGBBthi;SADL_CGBBlen"/> <box name="SADL_ConnGussetBBeam_VPlate" medium="active" X_Y_Z="SADL_CGBBthi;SADL_CGBBVwid;SADL_CGBBlen"/> <composition name="SADL_Saddle_UnitA"> <posXYZ volume="SADL_RoundedSupportAC" /> <posXYZ volume="SADL_Gusset_Plate" /> <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;SADL_Gusspz1" /> <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;-SADL_Gusspz2" /> <posXYZ volume="SADL_ConnGussetBBeam_HPlate" X_Y_Z="SADL_CGBBHPx;SADL_CGBBHPy;0" /> <posXYZ volume="SADL_ConnGussetBBeam_VPlate" X_Y_Z="SADL_CGBBVPx;SADL_CGBBVPy;0" /> </composition> <composition name="SADL_Saddle_UnitB"> <posXYZ volume="SADL_RoundedSupportBD" /> <posXYZ volume="SADL_Gusset_Plate" /> <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;SADL_Gusspz2" /> <posXYZ volume="SADL_Gusset_Plate" X_Y_Z="0;0;-SADL_Gusspz2" /> <posXYZ volume="SADL_ConnGussetBBeam_HPlate" X_Y_Z="SADL_CGBBHPx;SADL_CGBBHPy;0" /> <posXYZ volume="SADL_ConnGussetBBeam_VPlate" X_Y_Z="SADL_CGBBVPx;SADL_CGBBVPy;0" /> </composition> <!-- Stiffener --> <box name="SADL_Stiffener_Plate" medium="active" X_Y_Z="SADL_StEPwid;SADL_StEPwid;SADL_StEPthi"/> <box name="SADL_Stiffener_Tube_Plate" medium="active" X_Y_Z="SADL_StTUext;SADL_StTUthi; SADL_StifLen0"/> <box name="SADL_Stiffener_Tube_Flange" medium="active" X_Y_Z="SADL_StTUthi;SADL_StTFlhei;SADL_StifLen0"/> <composition name="SADL_Stiffener"> <posXYZ volume="SADL_Stiffener_Tube_Flange" X_Y_Z=" SADL_StTFlpos;0;0" /> <posXYZ volume="SADL_Stiffener_Tube_Flange" X_Y_Z="-SADL_StTFlpos;0;0" /> <posXYZ volume="SADL_Stiffener_Tube_Plate" X_Y_Z="0; SADL_StTFlpos;0;0" /> <posXYZ volume="SADL_Stiffener_Tube_Plate" X_Y_Z="0;-SADL_StTFlpos;0;0" /> <posXYZ volume="SADL_Stiffener_Plate" X_Y_Z="0;0; SADL_StEPzpos" /> <posXYZ volume="SADL_Stiffener_Plate" X_Y_Z="0;0;-SADL_StEPzpos" /> </composition> <composition name="SADL_Saddle_Doublet"> <posXYZ volume="SADL_Saddle_UnitB" X_Y_Z="0;0;SADL_SaddZ1" /> <posXYZ volume="SADL_Saddle_UnitA" X_Y_Z="0;0;SADL_SaddZ2" /> <posXYZ volume="SADL_Stiffener" X_Y_Z="SADL_Stxpos;SADL_Stypos;SADL_Stzpos" rot="0;0;SADL_Stzrot" /> </composition> <composition name="SADL_Extended_Saddle_Doublet"> <posXYZ volume="SADL_Extended_BoxBeam" X_Y_Z="SADL_BxBxpos;SADL_BxBypos;SADL_EBxBzpos" /> <posXYZ volume="SADL_Saddle_UnitB" X_Y_Z="0;0;SADL_ESaddZ1" /> <posXYZ volume="SADL_Saddle_UnitA" X_Y_Z="0;0;SADL_ESaddZ2" /> <posXYZ volume="SADL_Stiffener" X_Y_Z="SADL_Stxpos;SADL_Stypos;SADL_EStzpos" rot="0;0;45" /> </composition> <composition name="SADL_Saddle_Quadruplet"> <posXYZ volume="SADL_Saddle_Doublet" /> <posXYZ volume="SADL_Saddle_Doublet" sym="X"/> </composition> <composition name="SADL_Extended_Saddle_Quadruplet"> <posXYZ volume="SADL_Extended_Saddle_Doublet" /> <posXYZ volume="SADL_Extended_Saddle_Doublet" sym="X" /> </composition> <!-- Barrel Blocking Jacks --> <box name="SADL_Barrel_Blocking_Jack_Plate" medium="active" X_Y_Z="SADL_BBJPlen;SADL_BBJPwid;SADL_BBJPthi"/> <tubs name="SADL_Barrel_Blocking_Jack_BigCylinder" medium="active" Rio_Z="0 SADL_BBJBCrad SADL_BBJBCthi" /> <tubs name="SADL_Barrel_Blocking_Jack_SmallCylinder" medium="active" Rio_Z="0 SADL_BBJSCrad SADL_BBJSCthi" /> <composition name="SADL_Barrel_Blocking_Jack_Unit"> <posXYZ volume="SADL_Barrel_Blocking_Jack_SmallCylinder" X_Y_Z="0;SADL_BBJSCyp;0" rot="90;0;0"/> <posXYZ volume="SADL_Barrel_Blocking_Jack_BigCylinder" X_Y_Z="0;SADL_BBJBCyp;0" rot="90;0;0"/> <posXYZ volume="SADL_Barrel_Blocking_Jack_Plate" X_Y_Z="0;SADL_BBJPyp;0" rot="90;0;0"/> </composition> <composition name="SADL_Barrel_Blocking_Jacks"> <foreach index="I" begin="0" loops="4" > <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z=" SADL_BlJaxpos;SADL_BlJaypos; SADL_BlJazpos[I]"/> <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z="-SADL_BlJaxpos;SADL_BlJaypos; SADL_BlJazpos[I]"/> <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z=" SADL_BlJaxpos;SADL_BlJaypos;-SADL_BlJazpos[I]"/> <posXYZ volume="SADL_Barrel_Blocking_Jack_Unit" X_Y_Z="-SADL_BlJaxpos;SADL_BlJaypos;-SADL_BlJazpos[I]"/> </foreach> </composition> <composition name="SADL_CalorimeterSaddle"> <posXYZ volume="SADL_BoxBeam" X_Y_Z=" SADL_BxBxpos;SADL_BxBypos;0" /> <posXYZ volume="SADL_BoxBeam" X_Y_Z="-SADL_BxBxpos;SADL_BxBypos;0" /> <posXYZ volume="SADL_Saddle_Quadruplet" /> <posXYZ volume="SADL_Saddle_Quadruplet" sym="Z" /> <posXYZ volume="SADL_Extended_Saddle_Quadruplet" /> <posXYZ volume="SADL_Extended_Saddle_Quadruplet" sym="Z" /> <posXYZ volume="SADL_Barrel_Blocking_Jacks" /> </composition> </section> </AGDD> X ----------------------------------------------------------------------------------------- * * * End --- NEW FILE: feet.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: ATLAS Feet --> <!-- $Log: feet.agdd,v $ Revision 1.1 2007/02/14 21:53:39 hrivnac gvxy added --> <!-- @version $Id: feet.agdd,v 1.1 2007/02/14 21:53:39 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <!-- @author Serguei Baranov, Daniel Pomarede --> <AGDD DTD_version = "v8" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> <section DTD_version = "v8" name = "ATLAS Feet" version = "$Id: feet.agdd,v 1.1 2007/02/14 21:53:39 hrivnac Exp $" date = "20 November 2003" author = "Daniel Pomarede" top_volume = "useless"> <!-- ************************************************************** ************************************************************** *** **** *** ATLAS Feet **** *** **** ************************************************************** ************************************************************** --> <section name = "General Variables" version = "7.0" date = "17 January 2005" author = "Serguei Baranov, Daniel Pomarede" top_volume = "useless"> <!-- Constants of general use --> <var name="GENV_Pi" value="3.141592654" /> <var name="GENV_Eps" value="0.1" /> <var name="GENV_PiS180" value="GENV_Pi/180." /> <var name="GENV_Si5" value="sin( 5.0*GENV_PiS180)"/> <var name="GENV_Co5" value="cos( 5.0*GENV_PiS180)"/> <var name="GENV_Ta15" value="tan(15.0*GENV_PiS180)"/> <var name="GENV_Ta20" value="tan(20.0*GENV_PiS180)"/> <var name="GENV_Si225" value="sin(22.5*GENV_PiS180)"/> <var name="GENV_Co225" value="cos(22.5*GENV_PiS180)"/> <var name="GENV_Ta225" value="tan(22.5*GENV_PiS180)"/> <var name="GENV_Ta375" value="tan(37.5*GENV_PiS180)"/> <var name="GENV_Si45" value="sin(45.0*GENV_PiS180)"/> <var name="GENV_Co45" value="cos(45.0*GENV_PiS180)"/> <var name="GENV_Ta45" value="tan(45.0*GENV_PiS180)"/> <var name="GENV_Si525" value="sin(52.5*GENV_PiS180)"/> <var name="GENV_Co525" value="cos(52.5*GENV_PiS180)"/> <var name="GENV_Ta55" value="tan(55.0*GENV_PiS180)"/> <var name="GENV_Si675" value="sin(67.5*GENV_PiS180)"/> <var name="GENV_Co675" value="cos(67.5*GENV_PiS180)"/> <var name="GENV_Ta675" value="tan(67.5*GENV_PiS180)"/> <var name="GENV_Ta77" value="tan(77.0*GENV_PiS180)"/> </section> <!-- Standard Feet --> <!-- Basic parameters extracted from drawing ATLHBFB_0003 --> <!-- Main Plate --> <var name="FEET_MainPlXo_MainPlateXorigin" value=" 0. " /> <var name="FEET_MnPlGXwi_MainPlate_GroundXwidth" value=" 1800. " /> <var name="FEET_MnPlRCdx_MainPlateRoundCutDX" value=" 868. " /> <var name="FEET_MnPldxex_MainPlateDXextr" value=" 733. " /> <var name="FEET_MnPlUpDx_MainPlateUpperDX" value=" 1234.5" /> <var name="FEET_MnPlUpXw_MainPlateUpperXwidth" value=" 1315. " /> <var name="FEET_MnPlMiDx_MainPlateMiddleDX" value=" 380. " /> <var name="FEET_MainPlYo_MainPlateYorigin" value=" 0. " /> <var name="FEET_MainPlHe_MainPlateHeight" value=" 5300. " /> <var name="FEET_MainPlH1_MainPlateHeight_intermediate1" value=" 1605. " /> <var name="FEET_MnPlRCYp_MainPlateRoundCut_Y" value=" 2173. " /> <var name="FEET_MnPlSRCY_MainPlateSecondaryRoundCut_Y" value=" 1958. " /> <var name="FEET_MnPlUpDy_MainPlateUpperDY" value=" 790. " /> <var name="FEET_MnPlMiDy_MainPlateMiddleDY" value=" 1813. " /> <var name="FEET_MnPlPeHe_MainPlate_PedestalHeight" value=" 60. " /> <var name="FEET_MainPldZ_MainPlateDZ" value=" 80. " /> <var name="FEET_MnPlZsep_MainPlateZsep" value=" 980. " /> <var name="FEET_MnPlRCra_MainPlateRoundCut_R" value=" 615. " /> <var name="FEET_MnPlSRCr_MainPlateSecondaryRoundCut_R" value=" 400. " /> <!-- Extremity Feet specific parameters --> <var name="FEET_ExMPheig_ExtremityMainPlate_Height" value=" 5420. " /> <var name="FEET_ExMPRCra_ExtremityMainPlateRoundCut_R" value=" 385. " /> <var name="FEET_ExMPRCdx_ExtremityMainPlateRoundCut_DX" value=" 1058. " /> <var name="FEET_ExMPRCyp_ExtremityMainPlateRoundCut_Y" value=" 2780. " /> <var name="FEET_ExMCPyhe_ExtremityMiniConnPlate_Yheight" value=" 75. " /> <var name="FEET_ExMCPzle_ExtremityMiniConnPlate_Zlength" value=" 1480. " /> <var name="FEET_ExGPzlen_ExtremityGroundPlate_Zlength" value=" 1480. " /> <var name="FEET_ExSCPzle_ExtremitySlantedConnPlate_Zlength" value=" 1480. " /> <var name="FEET_ExRSzoff_ExtremityRailSupport_Zoffset" value=" 60. " /> <var name="FEET_ExMPhei1_ExtremityMainPlate_Height_intermediate1" value=" 1727. " /> <var name="FEET_ExMPhei2_ExtremityMainPlate_Height_intermediate2" value=" 1558. " /> <var name="FEET_ExMPxwid_ExtremityMainPlate_Xwidth" value=" 1635. " /> <var name="FEET_ExMPxwi1_ExtremityMainPlate_Xwidth_inter1" value=" 1013. " /> <var name="FEET_ExMPxwi2_ExtremityMainPlate_Xwidth_inter2" value=" 510. " /> <var name="FEET_ExMPyhi1_ExtremityMainPlate_Yheight_inter1" value=" 93. " /> <var name="FEET_ExMPyhi2_ExtremityMainPlate_Yheight_inter2" value=" 4480. " /> <var name="FEET_ExMPyhi3_ExtremityMainPlate_Yheight_inter3" value=" 740. " /> <var name="FEET_ExMPyhi4_ExtremityMainPlate_Yheight_inter4" value=" 100. " /> <var name="FEET_ExMPxdi1_ExtremityMainPlate_Xdist_inter1" value=" 1070. " /> <var name="FEET_ExMPxdi2_ExtremityMainPlate_Xdist_inter2" value=" 688. " /> <var name="FEET_ExMPydi2_ExtremityMainPlate_Ydist_inter1" value=" 2834. " /> <var name="FEET_ExVCPldx_ExtremityVerticalConnPlate_DX" value=" 100. " /> <var name="FEET_ExVCPldy_ExtremityVerticalConnPlate_DY" value=" 1075. " /> <var name="FEET_ExMPzsep_ExtremityMainPlate_Zsep" value=" 1360. " /> <var name="FEET_ExSPRCra_ExtremitySlantedConnPlateRoundCut_Radius" value=" 230. " /> <var name="FEET_ExSPRCof_ExtremitySlantedConnPlateRoundCut_Offset" value=" -400. " /> <var name="FEET_ExVCPthi_ExtremityVerticalConnPlate_Thickness" value=" 80. " /> <var name="FEET_ExVCPxex_ExtremityVerticalConnPlate_Xext" value=" 284. " /> <var name="FEET_ExVCPhei_ExtremityVerticalConnPlate_Height" value=" 2005. " /> <var name="FEET_ExVCPycu_ExtremityVerticalConnPlate_CutY" value=" 337. " /> <var name="FEET_ExVCPxcu_ExtremityVerticalConnPlate_CutX" value=" 450. " /> <!-- Global Positions --> <var name="FEET_StdFooXp_StandardFoot_Xpos" value=" 2700. " /> <var name="FEET_StdFooYp_StandardFoot_Ypos" value="-10980. " /> <var name="FEET_ZposFee1" value=" 0. " /> <var name="FEET_ZposFee2" value=" 3425. " /> <var name="FEET_ZposFee3" value=" 6630. " /> <var name="FEET_ZposFee4" value=" 9380. " /> <var name="FEET_ZposFee5" value=" 12080. " /> <var name="FEET_GirdYHei_YHeightGirder" value=" 4020. " /> <var name="FEET_GirdXpos_XposGirder" value=" 2735.5 " /> <!-- Additional parameters of arbitrary values --> <var name="FEET_MPlaHcec_FeetMainPlate_Hcec" value=" 50. " /> <var name="FEET_dumz" value="2000. " /> <var name="FEET_dumphi" value=" 36 " /> <!-- Standard Feet Modelization of Main Plate --> <var name="FEET_MainPlXa" value=" FEET_MainPlXo_MainPlateXorigin " /> <var name="FEET_MainPlYa" value=" FEET_MainPlYo_MainPlateYorigin + FEET_MnPlPeHe_MainPlate_PedestalHeight " /> <var name="FEET_MainPlXb" value=" FEET_MnPlGXwi_MainPlate_GroundXwidth " /> <var name="FEET_MainPlYb" value=" FEET_MainPlYo_MainPlateYorigin + FEET_MnPlPeHe_MainPlate_PedestalHeight " /> <var name="FEET_MainPlXc" value=" FEET_MnPlGXwi_MainPlate_GroundXwidth " /> <var name="FEET_MainPlYc" value=" FEET_MainPlH1_MainPlateHeight_intermediate1 + FEET_MnPlPeHe_MainPlate_PedestalHeight" /> <!-- Circular extrusion --> <var name="FEET_MaPlRCXc_MainPlateRoundCut_XC" value=" FEET_MnPlGXwi_MainPlate_GroundXwidth-FEET_MnPlRCdx_MainPlateRoundCutDX " /> <var name="FEET_MaPlRCYc_MainPlateRoundCut_YC" value=" FEET_MnPlRCYp_MainPlateRoundCut_Y + FEET_MnPlPeHe_MainPlate_PedestalHeight " /> <var name="FEET_MaiPlXc3" value=" FEET_MaPlRCXc_MainPlateRoundCut_XC - FEET_MnPlRCra_MainPlateRoundCut_R * GENV_Co45 " /> <var name="FEET_MaiPlYc3" value=" FEET_MaPlRCYc_MainPlateRoundCut_YC + FEET_MnPlRCra_MainPlateRoundCut_R * GENV_Si45 " /> <!-- Additional circular extrusion --> <var name="FEET_MPlXextr_FeetMainPlate_Xextr" value=" FEET_MnPlGXwi_MainPlate_GroundXwidth - FEET_MnPldxex_MainPlateDXextr " /> <var name="FEET_MPlYextr_FeetMainPlate_Yextr" value=" FEET_MnPlSRCY_MainPlateSecondaryRoundCut_Y + FEET_MnPlPeHe_MainPlate_PedestalHeight" /> <var name="FEET_MPlRextr_FeetMainPlate_Rextr" value=" FEET_MnPlSRCr_MainPlateSecondaryRoundCut_R " /> <var name="FEET_MaiPlXc2" value=" FEET_MPlXextr_FeetMainPlate_Xextr + FEET_MPlRextr_FeetMainPlate_Rextr * GENV_Si225 " /> <var name="FEET_MaiPlYc2" value=" FEET_MPlYextr_FeetMainPlate_Yextr - FEET_MPlRextr_FeetMainPlate_Rextr * GENV_Co225 " /> <!-- Circular extrusions completion --> <var name="FEET_MPlXcec1" value=" FEET_MPlXextr_FeetMainPlate_Xextr " /> <var name="FEET_MPlYcec1" value=" FEET_MPlYextr_FeetMainPlate_Yextr - FEET_MPlRextr_FeetMainPlate_Rextr " /> <var name="FEET_MPlXcec2" value=" FEET_MaPlRCXc_MainPlateRoundCut_XC " /> <var name="FEET_MPlYcec2" value=" FEET_MaPlRCYc_MainPlateRoundCut_YC - FEET_MnPlRCra_MainPlateRoundCut_R " /> <var name="FEET_a" value=" GENV_Ta45 " /> <var name="FEET_b" value=" FEET_MaiPlYc3 - FEET_MaiPlXc3 * GENV_Ta45 " /> <var name="FEET_aprime" value="-GENV_Ta675 " /> <var name="FEET_bprime" value=" FEET_MainPlYc + FEET_MainPlXc * GENV_Ta675 " /> <var name="FEET_aseconde" value=" GENV_Ta225 " /> <var name="FEET_bseconde" value=" FEET_MaiPlYc2 - FEET_MaiPlXc2 * FEET_aseconde " /> <var name="FEET_MainPlXd" value=" -(FEET_b-FEET_bprime)/(FEET_a-FEET_aprime) " /> <var name="FEET_MainPlYd" value=" FEET_a*FEET_MainPlXd + FEET_b " /> <var name="FEET_MainPlXe" value=" FEET_MainPlXc - FEET_MnPlUpDx_MainPlateUpperDX " /> <var name="FEET_MainPlYe" value=" FEET_aprime*FEET_MainPlXe + FEET_bprime " /> <var name="FEET_MaiPlXc1" value=" -(FEET_bseconde-FEET_bprime)/(FEET_aseconde-FEET_aprime) " /> <var name="FEET_MaiPlYc1" value=" FEET_aseconde*FEET_MaiPlXc1 + FEET_bseconde " /> <var name="FEET_MainPlXf" value=" FEET_MainPlXe " /> <var name="FEET_MainPlYf" value=" FEET_MainPlHe_MainPlateHeight " /> <var name="FEET_MainPlXg" value=" FEET_MainPlXe - FEET_MnPlUpXw_MainPlateUpperXwidth " /> <var name="FEET_MainPlYg" value=" FEET_MainPlHe_MainPlateHeight " /> <var name="FEET_MainPlXh" value=" FEET_MainPlXg " /> <var name="FEET_MainPlYh" value=" FEET_MainPlHe_MainPlateHeight - FEET_MnPlUpDy_MainPlateUpperDY " /> <var name="FEET_MainPlXi" value=" FEET_MainPlXo_MainPlateXorigin - FEET_MnPlMiDx_MainPlateMiddleDX " /> <var name="FEET_MainPlYi" value=" FEET_MnPlMiDy_MainPlateMiddleDY + FEET_MnPlMiDx_MainPlateMiddleDX*GENV_Ta675 " /> <var name="FEET_MainPlXj" value=" FEET_MainPlXo_MainPlateXorigin " /> <var name="FEET_MainPlYj" value=" FEET_MnPlMiDy_MainPlateMiddleDY + FEET_MnPlPeHe_MainPlate_PedestalHeight" /> <gvxy name="FeetMainPlate" medium="active" dZ="FEET_MainPldZ_MainPlateDZ" > <gvxy_point X_Y=" FEET_MainPlXa ; FEET_MainPlYa " /> <gvxy_point X_Y=" FEET_MainPlXb ; FEET_MainPlYb " /> <gvxy_point X_Y=" FEET_MainPlXc ; FEET_MainPlYc " /> <gvxy_point X_Y=" FEET_MaiPlXc1 ; FEET_MaiPlYc1 " /> <gvxy_point X_Y=" FEET_MaiPlXc2 ; FEET_MaiPlYc2 " /> <gvxy_point X_Y=" FEET_MaiPlXc3 ; FEET_MaiPlYc3 " /> <gvxy_point X_Y=" FEET_MainPlXd ; FEET_MainPlYd " /> <gvxy_point X_Y=" FEET_MainPlXe ; FEET_MainPlYe " /> <gvxy_point X_Y=" FEET_MainPlXf ; FEET_MainPlYf " /> <gvxy_point X_Y=" FEET_MainPlXg ; FEET_MainPlYg " /> <gvxy_point X_Y=" FEET_MainPlXh ; FEET_MainPlYh " /> <gvxy_point X_Y=" FEET_MainPlXi ; FEET_MainPlYi " /> <gvxy_point X_Y=" FEET_MainPlXj ; FEET_MainPlYj " /> </gvxy> <tubs name="MainPlateRoundCut" medium="active" Rio_Z=" 0 ; FEET_MnPlRCra_MainPlateRoundCut_R ; FEET_dumz" nbPhi="FEET_dumphi" /> <tubs name="MainPlateSecondaryRoundCut" medium="active" Rio_Z=" 0 ; FEET_MPlRextr_FeetMainPlate_Rextr ; FEET_dumz" nbPhi="FEET_dumphi" /> <gvxy name="MainPlateRoundCutCompletion" medium="active" dZ="FEET_dumz" > <gvxy_point X_Y=" FEET_MPlXcec1 ; FEET_MPlYcec1 " /> <gvxy_point X_Y=" FEET_MPlXcec1 ; FEET_MPlYcec1 + FEET_MPlaHcec_FeetMainPlate_Hcec " /> <gvxy_point X_Y=" FEET_MPlXcec2 ; FEET_MPlYcec2 + FEET_MPlaHcec_FeetMainPlate_Hcec " /> <gvxy_point X_Y=" FEET_MPlXcec2 ; FEET_MPlYcec2 " /> </gvxy> </section> <!-- --> <!-- Perform Cuts on Main Plate --> <!-- --> <subtraction name="FeetMainPlate_inter1" > <posXYZ volume="FeetMainPlate" /> <posXYZ volume="MainPlateRoundCut" X_Y_Z="FEET_MaPlRCXc_MainPlateRoundCut_XC;FEET_MaPlRCYc_MainPlateRoundCut_YC; 0." /> </subtraction> <subtraction name="FeetMainPlate_inter2" > <posXYZ volume="FeetMainPlate_inter1" /> <posXYZ volume="MainPlateSecondaryRoundCut" X_Y_Z="FEET_MPlXextr_FeetMainPlate_Xextr;FEET_MPlYextr_FeetMainPlate_Yextr; 0." /> </subtraction> <subtraction name="FeetMainPlate_inter3" > <posXYZ volume="FeetMainPlate_inter2" /> <posXYZ volume="MainPlateRoundCutCompletion" /> </subtraction> <subtraction name="FeetMain" > <posXYZ volume="FeetMainPlate_inter3" /> <posXYZ volume="MiniConnPlate" X_Y_Z="FEET_MiCPxpos_MiniConnPlate_X;FEET_MiCPypos_MiniConnPlate_Y; 0." rot="0.;0.;FEET_MinCPltz_MiniConnPlate_ThetaZ" /> </subtraction> <composition name="StandardFoot" > <posXYZ volume="FeetMain" X_Y_Z="0.;0.; FEET_MnPlZsep_MainPlateZsep/2" /> <posXYZ volume="MiniConnPlate" X_Y_Z="FEET_MiCPxpos_MiniConnPlate_X;FEET_MiCPypos_MiniConnPlate_Y+GENV_Eps; 0." rot="0.;0.;FEET_MinCPltz_MiniConnPlate_ThetaZ" /> <posXYZ volume="SlantedConnPlate" X_Y_Z="FEET_SlCPxpos_SlantedConnPlate_X;FEET_SlCPypos_SlantedConnPlate_Y+GENV_Eps; 0." rot="0.;0.;FEET_SlaCPltz_SlantedConnPlate_ThetaZ" /> <posXYZ volume="GroundPlate" X_Y_Z="FEET_GrnPxpos_GroundPlate_X;FEET_GrnPypos_GroundPlate_Y; 0." /> <posXYZ volume="VerticalConnPlate" X_Y_Z="FEET_VeCPxpos_VerticalConnPlate_X;FEET_VeCPypos_VerticalConnPlate_Y; 0." /> <posXYZ volume="UpperConnPlate" X_Y_Z="FEET_UpCPxpos_UpperConnPlate_X;FEET_UpCPypos_UpperConnPlate_Y; 0." /> <posXYZ volume="RailSupport" X_Y_Z="FEET_posx;FEET_posy; 0." /> <posXYZ volume="ConnFeetVouss" X_Y_Z="FEET_CnFeVoXp_ConnFeetVouss_X;FEET_CnFeVoYp_ConnFeetVouss_Y; 0." /> </composition> </AGDD> |
|
From: Julius H. <hr...@us...> - 2007-02-14 21:53:47
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14205/net/hep/AGDD/GeometricModel/Reps Added Files: Gvxy.java Log Message: gvxy added --- NEW FILE: Gvxy.java --- package net.hep.AGDD.GeometricModel.Reps; import net.hep.AGDD.GeometricModel.Evaluator; import net.hep.AGDD.GeometricModel.Solid; // Generic Model import net.hep.AGDD.JAXB.GvxyType; import net.hep.AGDD.JAXB.GvxyPointType; // GraXML import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.BuildOptions; // FreeHEP import org.freehep.j3d.Extrusion; // Java3D import javax.media.j3d.Group; import javax.vecmath.Point2d; // JAXB import javax.xml.bind.JAXBElement; // Java import java.util.List; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} of <code>gvxy</code> AGDD element * connected via JAXB {@link GvxyType} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: Gvxy.java,v $ * Revision 1.1 2007/02/14 21:53:39 hrivnac * gvxy added * * Revision 1.7 2007/01/25 23:36:27 hrivnac * fixes for JAXB 2.0 * * Revision 1.6 2007/01/25 18:40:12 hrivnac * migrated to JAXB 2.0 * * Revision 1.5 2006/06/30 10:12:09 hrivnac * centered gvxy * * Revision 1.4 2005/10/07 15:53:47 hrivnac * Colors introduced * * Revision 1.3 2005/10/06 20:48:11 hrivnac * Identifiers example added * * Revision 1.2 2005/08/12 09:27:43 hrivnac * new version started, gvxy and phedra placed at z-center * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added * * Revision 1.3 2005/03/24 14:24:30 hrivnac * Optimisation optimised * * Revision 1.2 2005/03/23 16:20:50 hrivnac * optimisation fixed * * Revision 1.1 2005/01/20 17:54:36 hrivnac * all single solids added * * </pre> * </font></p> * @version $Id: Gvxy.java,v 1.1 2007/02/14 21:53:39 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class Gvxy extends Solid { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Verify and set builder type setBuilder(builder); // Verify element type if (! (element instanceof GvxyType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Get element properties Evaluator evaluator = builder().evaluator(); GvxyType gvxy = (GvxyType)element; // not used: gvxy.isSensitive(); String lUnit = gvxy.getUnitLength().value(); // not used: String aUnit = gvxy.getUnitAngle().value(); String name0 = gvxy.getName(); String name = builder().name(name0); List points = gvxy.getGvxyPoint(); float[] z = evaluator.valueOf(gvxy.getDZ(), lUnit); float[] xy; Point2d[] p = new Point2d[points.size()]; int i = 0; for (Object o : points) { if (o instanceof JAXBElement) { o = ((JAXBElement)o).getValue(); } if (o instanceof GvxyPointType) { xy = evaluator.valueOf(((GvxyPointType)o).getXY(), lUnit); p[i] = new Point2d(xy[0], xy[1]); i++; } } setColor(gvxy); // Verify reuse if (isLink(name0, name, parent, tg)) { return; } // Create Extrusion and use it use(new Extrusion(p, z[0], builder().appearance(name0, rgb(), transparency())), name, parent, tg); } /** Logging . */ private static Logger log = Logger.getLogger(Gvxy.class); } |
|
From: Julius H. <hr...@us...> - 2007-02-14 21:34:02
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6212 Modified Files: index.html Log Message: Extrussion added Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.html 20 Jan 2007 00:17:35 -0000 1.8 --- index.html 14 Feb 2007 21:33:27 -0000 1.9 *************** *** 150,153 **** --- 150,154 ---- <li>PolyGone added.</li> <li>PolyGoneSegment generalised.</li> + <li>Extrusion added.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-02-14 21:33:34
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6212/org/freehep/j3d Modified Files: PolyGone.java Solid.java Test.java Added Files: Extrusion.java Log Message: Extrussion added Index: PolyGone.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyGone.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PolyGone.java 20 Jan 2007 00:17:35 -0000 1.2 --- PolyGone.java 14 Feb 2007 21:33:27 -0000 1.3 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.3 2007/02/14 21:33:27 hrivnac + * Extrussion added + * * Revision 1.2 2007/01/20 00:17:35 hrivnac * PolyGoneSegment generalised *************** *** 36,54 **** // Constructors -------------------------------------------------------------- ! /** Initialise polyline to be constructed later. */ protected PolyGone() {} /** Create polygone. ! * @param points The array of {@link Point3d}s, points.length > 2. ! * It can be null. ! * @param contourCounts The numbers of points for each polygone, ! * first polygone forms external border, others are holes. ! * It can be null, then only one polygone is created. ! * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public PolyGone(Point3d[] points, ! int[] contourCounts, Appearance appearance) throws IllegalArgumentException { ! construct(points, contourCounts, appearance); } --- 39,57 ---- // Constructors -------------------------------------------------------------- ! /** Initialise polygone to be constructed later. */ protected PolyGone() {} /** Create polygone. ! * @param points The array of {@link Point3d}s, points.length > 2. ! * It can be null. ! * @param stripCounts The numbers of points for each polygone, ! * first polygone forms external border, others are holes. ! * It can be null, then only one polygone is created. ! * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public PolyGone(Point3d[] points, ! int[] stripCounts, Appearance appearance) throws IllegalArgumentException { ! construct(points, stripCounts, appearance); } Index: Test.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Test.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Test.java 20 Jan 2007 00:17:35 -0000 1.3 --- Test.java 14 Feb 2007 21:33:30 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- import javax.media.j3d.Alpha; import javax.media.j3d.RotationInterpolator; + import javax.vecmath.Point2d; import javax.vecmath.Point3d; import javax.vecmath.Color3f; *************** *** 34,37 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.4 2007/02/14 21:33:30 hrivnac + * Extrussion added + * * Revision 1.3 2007/01/20 00:17:35 hrivnac * PolyGoneSegment generalised *************** *** 254,257 **** --- 258,275 ---- transparentAppearance())); } + else if (name.equals("Extrusion")) { + Point2d[] points = {new Point2d(0.0, 0.0), + new Point2d(0.2, 0.3), + new Point2d(0.3, 0.4), + new Point2d(0.5, 0.5), + new Point2d(0.5, 0.7), + new Point2d(0.4, 0.6), + new Point2d(0.3, 0.6), + new Point2d(0.1, 0.4), + new Point2d(0.0, 0.2)}; + return(new Extrusion(points, // points + 0.1, // z + transparentAppearance())); + } else if (name.equals("BooleanTrapezoid")) { Trapezoid s1 = new Trapezoid(0.2, // xmu *************** *** 460,463 **** --- 478,482 ---- " PolyLine |\n" + " PolyGone |\n" + + " Extrusion |\n" + " BooleanTrapezoid |\n" + " BooleanConeSegment |\n" + Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Solid.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Solid.java 20 Jan 2007 00:17:35 -0000 1.4 --- Solid.java 14 Feb 2007 21:33:27 -0000 1.5 *************** *** 12,15 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.5 2007/02/14 21:33:27 hrivnac + * Extrussion added + * * Revision 1.4 2007/01/20 00:17:35 hrivnac * PolyGoneSegment generalised *************** *** 63,66 **** --- 66,86 ---- } + /** Adds geometry from <code>{@link GeometryInfo}.TRIANGLE_ARRAY + * coordinates. + * @param coordinates The triangle array descrfibing geometry. */ + protected void addCoordinatesTriangle(Point3d[] coordinates) { + GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.TRIANGLE_ARRAY); + geometryInfo.setCoordinates(coordinates); + _normalGenerator.generateNormals(geometryInfo); + _stripifier.stripify(geometryInfo); + if (_first) { + setGeometry(geometryInfo.getGeometryArray()); + _first = false; + } + else { + addGeometry(geometryInfo.getGeometryArray()); + } + } + /** Adds geometry from <code>{@link GeometryInfo}.POLYGON_ARRAY * coordinates. --- NEW FILE: Extrusion.java --- package org.freehep.j3d; // Java3D import javax.media.j3d.Appearance; import javax.media.j3d.Shape3D; import javax.media.j3d.LineStripArray; import javax.media.j3d.GeometryArray; import javax.vecmath.Point2d; import javax.vecmath.Point3d; import javax.vecmath.Vector3d; // Java import java.lang.IllegalArgumentException; /** <code>Extrusion</code> defined from points. * <img src="doc-files/Extrusion.gif"> * <p><font color="#880088"> * <pre> * $Log: Extrusion.java,v $ * Revision 1.1 2007/02/14 21:33:27 hrivnac * Extrussion added * * </pre> * </font></p> * @opt attributes * @opt operations * @opt types * @opt visibility * @version $Id: Extrusion.java,v 1.1 2007/02/14 21:33:27 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ // TBD: documentation picture public class Extrusion extends Solid { // Constructors -------------------------------------------------------------- /** Initialise extrusion to be constructed later. */ protected Extrusion() {} /** Create extrusion. * @param points The array of {@link Point2d}s, points.length > 2. * It can be null. * @param z The z-dimension. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public Extrusion(Point2d[] points, double z, Appearance appearance) throws IllegalArgumentException { construct(points, z, appearance); } // --------------------------------------------------------------------------- /** Perform the construction. // TBD: check for consistency * @param points The array of {@link Point2d}s, points.length > 2. * It can be null. * @param z The z-dimension. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ protected void construct(Point2d[] points, double z, Appearance appearance) throws IllegalArgumentException { // Check preconditins if (points != null && ! (points.length > 2)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + " it should be > 2."); } Point3d[] bottom = new Point3d[ points.length]; Point3d[] top = new Point3d[ points.length]; Point3d[] side = new Point3d[4 * points.length]; for (int i = 0; i < points.length; i++) { bottom[points.length - 1 - i] = new Point3d(points[i].x, points[i].y, 0.0); top[ i] = new Point3d(points[i].x, points[i].y, z ); } int j = 0; int next; for (int i = 0; i < points.length; i++) { next = (i + 1 == points.length) ? 0 : (i + 1); side[j++] = new Point3d(points[i ].x, points[i ].y, 0.0); side[j++] = new Point3d(points[next ].x, points[next ].y, 0.0); side[j++] = new Point3d(points[next ].x, points[next ].y, z ); side[j++] = new Point3d(points[i ].x, points[i ].y, z ); } int[] strips = new int[]{points.length}; // Add Geometry addCoordinatesPolygone(bottom, strips); addCoordinatesPolygone(top , strips); addCoordinates( side ); // Add Appearance setAppearance(appearance); } } |
|
From: Julius H. <hr...@us...> - 2007-02-12 15:57:28
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29360 Modified Files: index.html Log Message: sphere and torus added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** index.html 25 Jan 2007 18:40:02 -0000 1.23 --- index.html 12 Feb 2007 15:56:50 -0000 1.24 *************** *** 147,150 **** --- 147,151 ---- <li>Demo files exported to GraXML.</li> <li>Migrated to JAXB 2.0.</li> + <li>Included sphere and torus.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2007-02-12 15:57:16
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29360/net/hep/AGDD/Test/data Modified Files: Demo.agdd Solids.agdd Log Message: sphere and torus added Index: Demo.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Demo.agdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Demo.agdd 14 Jan 2007 17:15:23 -0000 1.1 --- Demo.agdd 12 Feb 2007 15:56:53 -0000 1.2 *************** *** 5,8 **** --- 5,11 ---- <!-- $Log$ + Revision 1.2 2007/02/12 15:56:53 hrivnac + sphere and torus added + Revision 1.1 2007/01/14 17:15:23 hrivnac embedded demos included *************** *** 427,450 **** top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="1000; 2000; 8000" /> ! <trd name="trd" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" /> ! <trd name="trd_skewed" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" inclination="15; 30"/> ! <tubs name="tubs_full" medium="active" Rio_Z=" 0; 1000; 8000" /> ! <tubs name="tubs_hole" medium="active" Rio_Z="500; 1000; 8000" /> ! <tubs name="tubs_angle" medium="active" Rio_Z="500; 1000; 8000" profile="0; 180" /> ! <cons name="cons_full" medium="active" Rio1_Rio2_Z=" 0; 0; 1000; 1400; 8000" /> ! <cons name="cons_hole" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" /> ! <cons name="cons_angle" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180" /> <composition name="TEST"> ! <posXYZ X_Y_Z=" 2000; 2000; 0"> <volume name="box" /> </posXYZ> ! <posXYZ X_Y_Z="-2000; 2000; 0"> <volume name="trd" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; 4000; 0"> <volume name="trd_skewed"/> </posXYZ> ! <posXYZ X_Y_Z=" 2000; -2000; 0"> <volume name="tubs_full" /> </posXYZ> ! <posXYZ X_Y_Z=" 4000; -4000; 0"> <volume name="tubs_hole" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; -6000; 0"> <volume name="tubs_angle"/> </posXYZ> ! <posXYZ X_Y_Z="-2000; -2000; 0"> <volume name="cons_full" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; -4000; 0"> <volume name="cons_hole" /> </posXYZ> ! <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="cons_angle"/> </posXYZ> </composition> --- 430,457 ---- top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="1000; 2000; 8000" /> ! <sphere name="sphere" medium="active" Rio="1000; 1500" profile="10; 300" slice="10; 100" /> ! <torus name="torus" medium="active" Rio_R="300; 800; 1200" profile="10; 300" /> ! <trd name="trd" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" /> ! <trd name="trd_skewed" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" inclination="15; 30"/> ! <tubs name="tubs_full" medium="active" Rio_Z=" 0; 1000; 8000" /> ! <tubs name="tubs_hole" medium="active" Rio_Z="500; 1000; 8000" /> ! <tubs name="tubs_angle" medium="active" Rio_Z="500; 1000; 8000" profile="0; 180" /> ! <cons name="cons_full" medium="active" Rio1_Rio2_Z=" 0; 0; 1000; 1400; 8000" /> ! <cons name="cons_hole" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" /> ! <cons name="cons_angle" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180" /> <composition name="TEST"> ! <posXYZ X_Y_Z=" 2000; 2000; 0"> <volume name="box" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; 6000; -2000"> <volume name="sphere" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; 6000; 2000"> <volume name="torus" /> </posXYZ> ! <posXYZ X_Y_Z="-2000; 2000; 0"> <volume name="trd" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; 4000; 0"> <volume name="trd_skewed"/> </posXYZ> ! <posXYZ X_Y_Z=" 2000; -2000; 0"> <volume name="tubs_full" /> </posXYZ> ! <posXYZ X_Y_Z=" 4000; -4000; 0"> <volume name="tubs_hole" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; -6000; 0"> <volume name="tubs_angle"/> </posXYZ> ! <posXYZ X_Y_Z="-2000; -2000; 0"> <volume name="cons_full" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; -4000; 0"> <volume name="cons_hole" /> </posXYZ> ! <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="cons_angle"/> </posXYZ> </composition> Index: Solids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Solids.agdd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Solids.agdd 12 Jan 2007 14:18:37 -0000 1.5 --- Solids.agdd 12 Feb 2007 15:56:53 -0000 1.6 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.6 2007/02/12 15:56:53 hrivnac + sphere and torus added + Revision 1.5 2007/01/12 14:18:37 hrivnac new version 0.8.0 started, corresponding to AGDD v8; small changes to XSD *************** *** 48,71 **** top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="1000; 2000; 8000" /> ! <trd name="trd" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" /> ! <trd name="trd_skewed" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" inclination="15; 30"/> ! <tubs name="tubs_full" medium="active" Rio_Z=" 0; 1000; 8000" /> ! <tubs name="tubs_hole" medium="active" Rio_Z="500; 1000; 8000" /> ! <tubs name="tubs_angle" medium="active" Rio_Z="500; 1000; 8000" profile="0; 180" /> ! <cons name="cons_full" medium="active" Rio1_Rio2_Z=" 0; 0; 1000; 1400; 8000" /> ! <cons name="cons_hole" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" /> ! <cons name="cons_angle" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180" /> <composition name="TEST"> ! <posXYZ X_Y_Z=" 2000; 2000; 0"> <volume name="box" /> </posXYZ> ! <posXYZ X_Y_Z="-2000; 2000; 0"> <volume name="trd" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; 4000; 0"> <volume name="trd_skewed"/> </posXYZ> ! <posXYZ X_Y_Z=" 2000; -2000; 0"> <volume name="tubs_full" /> </posXYZ> ! <posXYZ X_Y_Z=" 4000; -4000; 0"> <volume name="tubs_hole" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; -6000; 0"> <volume name="tubs_angle"/> </posXYZ> ! <posXYZ X_Y_Z="-2000; -2000; 0"> <volume name="cons_full" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; -4000; 0"> <volume name="cons_hole" /> </posXYZ> ! <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="cons_angle"/> </posXYZ> </composition> --- 51,78 ---- top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="1000; 2000; 8000" /> ! <sphere name="sphere" medium="active" Rio="1000; 1500" profile="10; 300" slice="10; 100" /> ! <torus name="torus" medium="active" Rio_R="300; 800; 1200" profile="10; 300" /> ! <trd name="trd" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" /> ! <trd name="trd_skewed" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" inclination="15; 30"/> ! <tubs name="tubs_full" medium="active" Rio_Z=" 0; 1000; 8000" /> ! <tubs name="tubs_hole" medium="active" Rio_Z="500; 1000; 8000" /> ! <tubs name="tubs_angle" medium="active" Rio_Z="500; 1000; 8000" profile="0; 180" /> ! <cons name="cons_full" medium="active" Rio1_Rio2_Z=" 0; 0; 1000; 1400; 8000" /> ! <cons name="cons_hole" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" /> ! <cons name="cons_angle" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180" /> <composition name="TEST"> ! <posXYZ X_Y_Z=" 2000; 2000; 0"> <volume name="box" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; 6000; -2000"> <volume name="sphere" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; 6000; 2000"> <volume name="torus" /> </posXYZ> ! <posXYZ X_Y_Z="-2000; 2000; 0"> <volume name="trd" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; 4000; 0"> <volume name="trd_skewed"/> </posXYZ> ! <posXYZ X_Y_Z=" 2000; -2000; 0"> <volume name="tubs_full" /> </posXYZ> ! <posXYZ X_Y_Z=" 4000; -4000; 0"> <volume name="tubs_hole" /> </posXYZ> ! <posXYZ X_Y_Z=" 6000; -6000; 0"> <volume name="tubs_angle"/> </posXYZ> ! <posXYZ X_Y_Z="-2000; -2000; 0"> <volume name="cons_full" /> </posXYZ> ! <posXYZ X_Y_Z="-4000; -4000; 0"> <volume name="cons_hole" /> </posXYZ> ! <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="cons_angle"/> </posXYZ> </composition> |
![http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.gif"/>](http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML.gif"/>){kind=link}