graxml-commit Mailing List for GraXML (Page 23)
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...> - 2005-12-05 15:19:12
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31115/src/net/hep/graphics/GraXML Modified Files: MasterBuilder.java Log Message: Schema inside model jar Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MasterBuilder.java 23 Nov 2005 16:16:49 -0000 1.3 --- MasterBuilder.java 5 Dec 2005 15:19:03 -0000 1.4 *************** *** 60,63 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.4 2005/12/05 15:19:03 hrivnac + * Schema inside model jar + * * Revision 1.3 2005/11/23 16:16:49 hrivnac * new Xerces *************** *** 231,235 **** // Set Parser Properties saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema"); ! saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schemaSource", schema()); // Get Reader XMLReader xmlReader = saxParser.getXMLReader(); --- 234,238 ---- // Set Parser Properties saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema"); ! saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schemaSource", getClass().getClassLoader().getResourceAsStream(schema())); // Get Reader XMLReader xmlReader = saxParser.getXMLReader(); |
|
From: Julius H. <hr...@us...> - 2005-11-24 16:11:13
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/doc-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22922/net/hep/AGDD/Test/doc-files Modified Files: ParametrisedColors.wrl.gz Log Message: examples up-to-date Index: ParametrisedColors.wrl.gz =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/doc-files/ParametrisedColors.wrl.gz,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsUZhd9N and /tmp/cvss0ojho differ |
|
From: Julius H. <hr...@us...> - 2005-11-24 16:11:06
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22922/net/hep/AGDD/Test/data Modified Files: ParametrisedColors.agdd Log Message: examples up-to-date Index: ParametrisedColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/ParametrisedColors.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ParametrisedColors.agdd 23 Nov 2005 16:13:10 -0000 1.2 --- ParametrisedColors.agdd 24 Nov 2005 16:10:55 -0000 1.3 *************** *** 1,6 **** --- 1,12 ---- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: Parametrised Colors --> + <!-- Appearance should not be optimised: + OptimisationDB.setAppearanceOptimisation(false); + --> <!-- $Log$ + Revision 1.3 2005/11/24 16:10:55 hrivnac + examples up-to-date + Revision 1.2 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 34,38 **** <foreach index="y" begin="0" step="64" loops="5"> <foreach index="z" begin="0" step="64" loops="5"> ! <posXYZ X_Y_Z="x * 40; y * 40; z * 40"> <var name="red" value="x"/> <var name="green" value="y"/> --- 40,44 ---- <foreach index="y" begin="0" step="64" loops="5"> <foreach index="z" begin="0" step="64" loops="5"> ! <posXYZ X_Y_Z="x * 20; y * 20; z * 20"> <var name="red" value="x"/> <var name="green" value="y"/> *************** *** 40,44 **** <volume name="parametrisedBox"/> </posXYZ> ! <posXYZ X_Y_Z="- x * 40; - y * 40; - z * 40"> <volume name="randomBox"/> </posXYZ> --- 46,50 ---- <volume name="parametrisedBox"/> </posXYZ> ! <posXYZ X_Y_Z="- x * 20; - y * 20; - z * 20"> <volume name="randomBox"/> </posXYZ> |
|
From: Julius H. <hr...@us...> - 2005-11-24 16:11:04
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22922 Modified Files: index.html Log Message: examples up-to-date Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** index.html 23 Nov 2005 16:13:10 -0000 1.15 --- index.html 24 Nov 2005 16:10:55 -0000 1.16 *************** *** 37,41 **** <li><a href="Examples/Including.agdd">Including.agdd</a>, <a href="Examples/IncludedBuildingBlock.agdd">IncludedBuildingBlock.agdd</a>, ! <a href="Examples/IncludedBuildingBlock.agdd">IncludedComposition.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Including.wrl.gz">Including.wrl</a></li> <li><a href="Examples/MultiplePositioners.agdd">MultiplePositioners.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/MultiplePositioners.wrl.gz">MultiplePositioners.wrl</a></li> <li><a href="Examples/ParametrisedColors.agdd">ParametrisedColors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/ParametrisedColors.wrl.gz">ParametrisedColors.wrl</a></li> --- 37,41 ---- <li><a href="Examples/Including.agdd">Including.agdd</a>, <a href="Examples/IncludedBuildingBlock.agdd">IncludedBuildingBlock.agdd</a>, ! <a href="Examples/IncludedComposition.agdd">IncludedComposition.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Including.wrl.gz">Including.wrl</a></li> <li><a href="Examples/MultiplePositioners.agdd">MultiplePositioners.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/MultiplePositioners.wrl.gz">MultiplePositioners.wrl</a></li> <li><a href="Examples/ParametrisedColors.agdd">ParametrisedColors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/ParametrisedColors.wrl.gz">ParametrisedColors.wrl</a></li> *************** *** 46,50 **** <li><a href="Examples/StandardColors.agdd">StandardColors.agdd</a></li> <li><a href="Examples/StandardMaterials.agdd">StandardMaterials.agdd</a></li> ! <li><a href="Examples/StandardMaterials.agdd">StandardMedias.agdd</a></li> <li><a href="Examples/Solids.agdd">Solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Solids.wrl.gz">Solids.wrl</a></li> <li><a href="Examples/arrays.agdd">arrays.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/arrays.wrl.gz">arrays.wrl</a></li> --- 46,50 ---- <li><a href="Examples/StandardColors.agdd">StandardColors.agdd</a></li> <li><a href="Examples/StandardMaterials.agdd">StandardMaterials.agdd</a></li> ! <li><a href="Examples/StandardMedia.agdd">StandardMedia.agdd</a></li> <li><a href="Examples/Solids.agdd">Solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Solids.wrl.gz">Solids.wrl</a></li> <li><a href="Examples/arrays.agdd">arrays.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/arrays.wrl.gz">arrays.wrl</a></li> |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:17:09
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14490 Modified Files: build.xml Log Message: new Xerces Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 12 Aug 2005 09:29:11 -0000 1.4 --- build.xml 23 Nov 2005 16:17:00 -0000 1.5 *************** *** 31,34 **** --- 31,35 ---- <pathelement path="${GDML.core}"/> <pathelement path="${JiveEvent.core}"/> + <pathelement path="${JAXP.api}"/> <pathelement path="${JAXB.api}"/> <pathelement path="${JAXB.libs}"/> *************** *** 85,88 **** --- 86,90 ---- <fileset file="${GDML.core}"/> <fileset file="${JiveEvent.core}"/> + <fileset file="${JAXP.api}"/> <fileset file="${JAXB.api}"/> <fileset file="${JAXB.libs}"/> *************** *** 100,104 **** <chmod dir="${bin}" perm="a+rx" includes="*.sh"/> <copy todir="${etc}" flatten="true"> - <fileset dir="${src}" includes="net/hep/graphics/GraXML/Test/*.dtd"/> <fileset dir="${src}" includes="net/hep/graphics/GraXML/FrontEnd/builders.properties"/> <fileset dir="${src}" includes="net/hep/graphics/GraXML/Java3DExtensions/colormap.xml"/> --- 102,105 ---- *************** *** 107,112 **** <mkdir dir="${top}/misc/Test"/> <copy todir="${top}/misc/Test" flatten="true"> - <fileset dir="${src}" includes="net/hep/graphics/GraXML/Test/*.xml"/> - <fileset dir="${src}" includes="net/hep/graphics/GraXML/Test/*.apdd"/> <fileset dir="${src}" includes="net/hep/graphics/GraXML/Test/*.bsh"/> </copy> --- 108,111 ---- *************** *** 121,124 **** --- 120,124 ---- </copy> <copy todir="${misc}/Test"> + <fileset dir="${AGDD}/etc"/> <fileset dir="${AGDD}/misc/Test"/> </copy> *************** *** 130,133 **** --- 130,134 ---- </copy> <copy todir="${misc}/Test"> + <fileset dir="${GDML}/etc"/> <fileset dir="${GDML}/misc/Test"/> </copy> *************** *** 139,142 **** --- 140,144 ---- </copy> <copy todir="${misc}/Test"> + <fileset dir="${JiveEvent}/etc"/> <fileset dir="${JiveEvent}/misc/Test"/> </copy> *************** *** 229,233 **** </delete> <copy todir="${run}" flatten="true"> ! <fileset dir="${etc}" includes="*.dtd"/> <fileset dir="${misc}/Test" includes="*.agdd"/> <fileset dir="${misc}/Test" includes="*.gdml"/> --- 231,235 ---- </delete> <copy todir="${run}" flatten="true"> ! <fileset dir="${etc}" includes="*.xsd"/> <fileset dir="${misc}/Test" includes="*.agdd"/> <fileset dir="${misc}/Test" includes="*.gdml"/> |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:16:57
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14418/net/hep/graphics/GraXML/Java3DExtensions Modified Files: DistanceComparator.java Log Message: new Xerces Index: DistanceComparator.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/DistanceComparator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DistanceComparator.java 30 Mar 2005 12:44:31 -0000 1.1 --- DistanceComparator.java 23 Nov 2005 16:16:49 -0000 1.2 *************** *** 3,7 **** // Java import java.util.Comparator; ! // import static java.lang.Math.signum; // TBD: 1.5 // Java3D --- 3,7 ---- // Java import java.util.Comparator; ! import static java.lang.Math.signum; // Java3D *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2005/11/23 16:16:49 hrivnac + * new Xerces + * * Revision 1.1 2005/03/30 12:44:31 hrivnac * GraXML introduced *************** *** 43,53 **** - p2.x * p2.x - p2.y * p2.y - p2.z * p2.z); } - - // TBD: 1.5 - private int signum(double x) { - if (x > 0) return 1; - else if (x < 0) return -1; - else return 0; - } } --- 46,49 ---- |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:16:57
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14418/net/hep/graphics/GraXML Modified Files: MasterBuilder.java Log Message: new Xerces Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MasterBuilder.java 7 Oct 2005 15:54:15 -0000 1.2 --- MasterBuilder.java 23 Nov 2005 16:16:49 -0000 1.3 *************** *** 32,40 **** import javax.xml.bind.JAXBException; ! // XML4J import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Element; /** <code>MasterBuilder</code> factory organises the building of --- 32,49 ---- import javax.xml.bind.JAXBException; ! // XML import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Element; + import org.xml.sax.SAXException; + import org.xml.sax.SAXNotRecognizedException; + import org.xml.sax.SAXNotSupportedException; + import org.xml.sax.XMLReader; + import org.xml.sax.InputSource; + import javax.xml.parsers.SAXParserFactory; + import javax.xml.parsers.SAXParser; + import javax.xml.parsers.ParserConfigurationException; + import javax.xml.transform.sax.SAXSource; /** <code>MasterBuilder</code> factory organises the building of *************** *** 51,54 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.3 2005/11/23 16:16:49 hrivnac + * new Xerces + * * Revision 1.2 2005/10/07 15:54:15 hrivnac * Colors introduced *************** *** 137,140 **** --- 149,153 ---- * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ + // TBD: only JAXB supported public abstract class MasterBuilder { *************** *** 207,214 **** javax.xml.bind.Element element = null; try { JAXBContext jc = JAXBContext.newInstance(jaxb()); Unmarshaller u = jc.createUnmarshaller(); u.setValidating(true); ! element = (javax.xml.bind.Element)(u.unmarshal(new FileInputStream(file))); } catch (JAXBException e) { --- 220,260 ---- javax.xml.bind.Element element = null; try { + // Get Parser Factory + System.setProperty("javax.xml.parsers.SAXParserFactory", "org.apache.xerces.jaxp.SAXParserFactoryImpl"); + SAXParserFactory spf = SAXParserFactory.newInstance(); + // Set Parser Factory Properties + spf.setNamespaceAware(true); + spf.setXIncludeAware(true); + spf.setValidating(true); + // Get Parser + SAXParser saxParser = spf.newSAXParser(); + // Set Parser Properties + saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema"); + saxParser.setProperty("http://java.sun.com/xml/jaxp/properties/schemaSource", schema()); + // Get Reader + XMLReader xmlReader = saxParser.getXMLReader(); + // Set Reader Properties + xmlReader.setFeature("http://apache.org/xml/features/xinclude", true); + xmlReader.setFeature("http://apache.org/xml/features/xinclude/fixup-base-uris", true); + xmlReader.setFeature("http://apache.org/xml/features/xinclude/fixup-language", true); + // Get Source + SAXSource source = new SAXSource(xmlReader, new InputSource(new FileInputStream(file))); + // Proccess as JAXB JAXBContext jc = JAXBContext.newInstance(jaxb()); Unmarshaller u = jc.createUnmarshaller(); u.setValidating(true); ! element = (javax.xml.bind.Element)(u.unmarshal(source)); ! } ! catch (SAXNotRecognizedException e) { ! throw new GraXMLException("Can't find " + file, e); ! } ! catch (SAXNotSupportedException e) { ! throw new GraXMLException("Can't find " + file, e); ! } ! catch (SAXException e) { ! throw new GraXMLException("Can't find " + file, e); ! } ! catch (ParserConfigurationException e) { ! throw new GraXMLException("Can't find " + file, e); } catch (JAXBException e) { *************** *** 493,497 **** /** Register builders for from Properties. */ - // TBD: use 1.5 features public static void setBuilders() { // Get Properies --- 539,542 ---- *************** *** 535,543 **** /** Get JAXB Generic Model package name. ! * @return The package name of the JAXB Generic Model, ! * null if JAXB is not used. */ ! protected String jaxb() { ! return null; ! } private static Map<String, String> _builders = new TreeMap<String, String>(); --- 580,589 ---- /** Get JAXB Generic Model package name. ! * @return The package name of the JAXB Generic Model. */ ! protected abstract String jaxb(); ! ! /** Get XML Schema file. ! * @return The XML Schema file. */ ! protected abstract String schema(); private static Map<String, String> _builders = new TreeMap<String, String>(); |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:16:57
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14418/net/hep/graphics/GraXML/Java3DExtensions/Interactivity Modified Files: CallBack.java Log Message: new Xerces Index: CallBack.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/CallBack.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CallBack.java 30 Mar 2005 20:36:02 -0000 1.2 --- CallBack.java 23 Nov 2005 16:16:49 -0000 1.3 *************** *** 31,34 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.3 2005/11/23 16:16:49 hrivnac + * new Xerces + * * Revision 1.2 2005/03/30 20:36:02 hrivnac * custom exporters enabled *************** *** 84,88 **** for (int i = 0; i < tg.numChildren(); i++) { Node shape = tg.getChild(i); ! if (shape instanceof Shape3D && (shape.getClass().getPackage().toString().indexOf("org.freehep.j3d") > -1)) { // TBD: 1.5.0 // Appearance Appearance appearance = ((Shape3D)shape).getAppearance(); --- 87,91 ---- for (int i = 0; i < tg.numChildren(); i++) { Node shape = tg.getChild(i); ! if (shape instanceof Shape3D && (shape.getClass().getPackage().toString().contains("org.freehep.j3d"))) { // Appearance Appearance appearance = ((Shape3D)shape).getAppearance(); |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:16:57
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14418 Modified Files: GraXML.sh GraXMLConverter.sh Log Message: new Xerces Index: GraXMLConverter.sh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXMLConverter.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GraXMLConverter.sh 30 Mar 2005 12:44:29 -0000 1.1 --- GraXMLConverter.sh 23 Nov 2005 16:16:49 -0000 1.2 *************** *** 7,9 **** export LD_LIBRARY_PATH=${GRAXML_HOME}/lib:${JAVA_HOME}/jre/lib/i386/xawt:${LD_LIBRARY_PATH} ! java -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration -Xmx512M -jar ${GRAXML_HOME}/lib/GraXMLConverter.exe.jar $* --- 7,9 ---- export LD_LIBRARY_PATH=${GRAXML_HOME}/lib:${JAVA_HOME}/jre/lib/i386/xawt:${LD_LIBRARY_PATH} ! java -Xmx512M -jar ${GRAXML_HOME}/lib/GraXMLConverter.exe.jar $* Index: GraXML.sh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GraXML.sh 30 Mar 2005 12:44:29 -0000 1.1 --- GraXML.sh 23 Nov 2005 16:16:49 -0000 1.2 *************** *** 7,9 **** export LD_LIBRARY_PATH=${GRAXML_HOME}/lib:${JAVA_HOME}/jre/lib/i386/xawt:${LD_LIBRARY_PATH} ! java -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration -Xmx512M -jar ${GRAXML_HOME}/lib/GraXMLDisplay.exe.jar $* --- 7,9 ---- export LD_LIBRARY_PATH=${GRAXML_HOME}/lib:${JAVA_HOME}/jre/lib/i386/xawt:${LD_LIBRARY_PATH} ! java -Xmx512M -jar ${GRAXML_HOME}/lib/GraXMLDisplay.exe.jar $* |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:16:04
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14211/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: JiveEventBuilder.java Log Message: xsd should be known Index: JiveEventBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/JiveEventBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JiveEventBuilder.java 30 Mar 2005 13:10:21 -0000 1.1 --- JiveEventBuilder.java 23 Nov 2005 16:15:55 -0000 1.2 *************** *** 21,24 **** --- 21,27 ---- * <pre> * $Log$ + * Revision 1.2 2005/11/23 16:15:55 hrivnac + * xsd should be known + * * Revision 1.1 2005/03/30 13:10:21 hrivnac * JiveEvent introduced *************** *** 65,68 **** --- 68,79 ---- } + /** Get JiveEvent Schema file. + * @return The JiveEvent Schema file. */ + protected String schema() { + return _schema; + } + + private static String _schema = "event.xsd"; + private PDG _pdg; |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:15:24
|
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14059/net/hep/geant4/GDML/GeometricModel Modified Files: GDMLBuilder.java Log Message: xsd should be known Index: GDMLBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/GDMLBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GDMLBuilder.java 30 Mar 2005 13:51:16 -0000 1.1 --- GDMLBuilder.java 23 Nov 2005 16:15:16 -0000 1.2 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.2 2005/11/23 16:15:16 hrivnac + * xsd should be known + * * Revision 1.1 2005/03/30 13:51:16 hrivnac * GDML added *************** *** 184,189 **** --- 187,200 ---- return _jaxb; } + + /** Get GDML Schema file. + * @return The GDML Schema file. */ + protected String schema() { + return _schema; + } private static String _jaxb = "net.hep.geant4.GDML.JAXB"; + + private static String _schema = "gdml.xsd"; /** Zero vector. */ |
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/net/hep/AGDD/Test/data Modified Files: AliPolys.agdd AliSolids.agdd BinaryOperators.agdd Colors.agdd Copies.agdd Envelopes.agdd Identifiers.agdd Including.agdd MultiplePositioners.agdd ParametrisedColors.agdd Polys.agdd Reflections.agdd Rotations.agdd Shifts.agdd Solids.agdd arrays.agdd foreach.agdd math.agdd positioners.agdd solids.agdd stacks.agdd vars.agdd Added Files: IncludedBuildingBlock.agdd IncludedComposition.agdd StandardColors.agdd StandardMaterials.agdd StandardMedia.agdd Removed Files: Included.agdd Log Message: media and colors added, buildingBlock added Index: arrays.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/arrays.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** arrays.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- arrays.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 29,34 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 32,38 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 59,63 **** <var name="i" value="t[1][3]" /> ! <box X_Y_Z="x; y; z" material="Lead" name="box"/> <composition name="TEST"> --- 63,67 ---- <var name="i" value="t[1][3]" /> ! <box X_Y_Z="x; y; z" medium="active" name="box"/> <composition name="TEST"> Index: AliSolids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/AliSolids.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AliSolids.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- AliSolids.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,60 **** top_volume = "TEST"> ! <box name="box" material="Lead" X_Y_Z="1000; 2000; 8000" /> ! <trap name="trap_decl" material="Lead" Xmumdpupd_Ymp_Z="600; 400; 1200; 800; 1000; 2000; 8000" declination="15; 30" /> ! <trap name="trap_incl" material="Lead" Xmumdpupd_Ymp_Z="600; 400; 1200; 800; 1000; 2000; 8000" inclination="15; 30" /> ! <trd name="trd" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" /> ! <trd name="trd_skewed" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" inclination="15; 30" /> ! <para name="para" material="Lead" X_Y_Z="500; 1000; 8000" alpha="30" theta="40" phi="50" /> ! <tubs name="tubs_full" material="Lead" Rio_Z=" 0; 1000; 8000" /> ! <tubs name="tubs_hole" material="Lead" Rio_Z="500; 1000; 8000" /> ! <tubs name="tubs_angle" material="Lead" Rio_Z="500; 1000; 8000" profile="0; 180" /> ! <cons name="cons_full" material="Lead" Rio1_Rio2_Z=" 0; 0; 1000; 1400; 8000" /> ! <cons name="cons_hole" material="Lead" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" /> ! <cons name="cons_angle" material="Lead" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180" /> --- 42,64 ---- top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="1000; 2000; 8000" /> ! <trap name="trap_decl" medium="active" Xmumdpupd_Ymp_Z="600; 400; 1200; 800; 1000; 2000; 8000" declination="15; 30" /> ! <trap name="trap_incl" medium="active" Xmumdpupd_Ymp_Z="600; 400; 1200; 800; 1000; 2000; 8000" inclination="15; 30" /> ! <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" /> ! <para name="para" medium="active" X_Y_Z="500; 1000; 8000" alpha="30" theta="40" phi="50" /> ! <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" /> Index: BinaryOperators.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/BinaryOperators.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BinaryOperators.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- BinaryOperators.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> Index: vars.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/vars.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vars.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- vars.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 29,34 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 32,38 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 45,51 **** <var name="var3" value="3000"/> ! <box name="box1" X_Y_Z="var1; var2; var3" material="Lead"/> ! <box name="box2" X_Y_Z="var1; var2+1000; var3+1000" material="Lead"/> ! <box name="box3" X_Y_Z="var1; var2+2000; var3+2000" material="Lead"/> <composition name="comp"> --- 49,55 ---- <var name="var3" value="3000"/> ! <box name="box1" X_Y_Z="var1; var2; var3" medium="active"/> ! <box name="box2" X_Y_Z="var1; var2+1000; var3+1000" medium="active"/> ! <box name="box3" X_Y_Z="var1; var2+2000; var3+2000" medium="active"/> <composition name="comp"> Index: Rotations.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Rotations.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Rotations.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Rotations.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,46 **** top_volume = "TEST"> ! <trd name="trd0" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdX" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdY" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdZ" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdT" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> <composition name="O-rotated"> --- 42,50 ---- top_volume = "TEST"> ! <trd name="trd0" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdX" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdY" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdZ" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> ! <trd name="trdT" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> <composition name="O-rotated"> Index: AliPolys.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/AliPolys.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AliPolys.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- AliPolys.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,42 **** top_volume = "TEST"> ! <pcon name="polycone_full" material="Lead"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> --- 42,46 ---- top_volume = "TEST"> ! <pcon name="polycone_full" medium="active"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> *************** *** 44,48 **** </pcon> ! <pcon name="polycone_hole" material="Lead"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> --- 48,52 ---- </pcon> ! <pcon name="polycone_hole" medium="active"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> *************** *** 50,54 **** </pcon> ! <pcon name="polycone_angle" material="Lead" profile="0; 210"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> --- 54,58 ---- </pcon> ! <pcon name="polycone_angle" medium="active" profile="0; 210"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> *************** *** 56,60 **** </pcon> ! <pcon name="polycone_angle_hole" material="Lead" profile="0; 210"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> --- 60,64 ---- </pcon> ! <pcon name="polycone_angle_hole" medium="active" profile="0; 210"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> *************** *** 67,71 **** Ros="4000; 2500; 2000" Zs=" 0; 4000; 8000" ! material="Lead"/> <phedra name="polyhedra_hole" --- 71,75 ---- Ros="4000; 2500; 2000" Zs=" 0; 4000; 8000" ! medium="active"/> <phedra name="polyhedra_hole" *************** *** 74,78 **** Ros="4000; 2500; 2000" Zs=" 0; 4000 ; 8000" ! material="Lead"/> <phedra name="polyhedra_angle" --- 78,82 ---- Ros="4000; 2500; 2000" Zs=" 0; 4000 ; 8000" ! medium="active"/> <phedra name="polyhedra_angle" *************** *** 82,86 **** Zs=" 0; 4000; 8000" profile="0; 210" ! material="Lead"/> <phedra name="polyhedra_angle_hole" --- 86,90 ---- Zs=" 0; 4000; 8000" profile="0; 210" ! medium="active"/> <phedra name="polyhedra_angle_hole" *************** *** 90,94 **** Zs=" 0; 4000; 8000" profile="0; 210" ! material="Lead"/> <composition name="TEST"> --- 94,98 ---- Zs=" 0; 4000; 8000" profile="0; 210" ! medium="active"/> <composition name="TEST"> --- NEW FILE: StandardMedia.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- AGDD Standard Media (to use with XInclude) --> <!-- $Log: StandardMedia.agdd,v $ Revision 1.1 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added --> <!-- @version $Id: StandardMedia.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <media version="$Id: StandardMedia.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $" date="2005-11-23" author="Julius Hrivnac" DTD_version="v7"> <medium name="active" material="Iron" color="random" sensitive="true" parameters=""/> <medium name="passive" material="Lead" color="randomTransparent" sensitive="false" parameters=""/> </media> Index: Copies.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Copies.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Copies.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Copies.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,42 **** top_volume = "TEST"> ! <box name="box" material="Lead" X_Y_Z="1000; 2000; 8000"/> <composition name="TEST"> --- 42,46 ---- top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="1000; 2000; 8000"/> <composition name="TEST"> Index: Solids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Solids.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Solids.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Solids.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 29,34 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 32,38 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 41,53 **** top_volume = "TEST"> ! <box name="box" material="Lead" X_Y_Z="1000; 2000; 8000" /> ! <trd name="trd" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" /> ! <trd name="trd_skewed" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 8000" inclination="15; 30"/> ! <tubs name="tubs_full" material="Iron" Rio_Z=" 0; 1000; 8000" /> ! <tubs name="tubs_hole" material="Iron" Rio_Z="500; 1000; 8000" /> ! <tubs name="tubs_angle" material="Iron" Rio_Z="500; 1000; 8000" profile="0; 180" /> ! <cons name="cons_full" material="Copper" Rio1_Rio2_Z=" 0; 0; 1000; 1400; 8000" /> ! <cons name="cons_hole" material="Copper" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" /> ! <cons name="cons_angle" material="Copper" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180" /> <composition name="TEST"> --- 45,57 ---- 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"> Index: Identifiers.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Identifiers.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Identifiers.agdd 7 Oct 2005 15:53:47 -0000 1.2 --- Identifiers.agdd 23 Nov 2005 16:13:10 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.2 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 14,19 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 17,23 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 26,30 **** top_volume = "TEST"> ! <box name="box" material="Lead" X_Y_Z="500; 500; 500" /> <composition name="TEST"> --- 30,34 ---- top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="500; 500; 500" /> <composition name="TEST"> Index: MultiplePositioners.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/MultiplePositioners.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MultiplePositioners.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- MultiplePositioners.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 29,34 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 32,38 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 41,45 **** top_volume = "TEST"> ! <box name="box" material="Lead" X_Y_Z="500; 1000; 1500" /> <composition name="line"> --- 45,49 ---- top_volume = "TEST"> ! <box name="box" medium="active" X_Y_Z="500; 1000; 1500" /> <composition name="line"> --- NEW FILE: IncludedComposition.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: XInclude constituent --> <!-- $Log: IncludedComposition.agdd,v $ Revision 1.1 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added Revision 1.1 2005/03/30 13:42:56 hrivnac AGDD added Revision 1.1 2005/02/16 16:37:53 hrivnac XInclude possible --> <!-- @version $Id: IncludedComposition.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <composition name="TEST"> <posXYZ X_Y_Z=" 2000; 2000; 0"> <volume name="box"/> </posXYZ> </composition> Index: Including.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Including.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Including.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Including.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 20,25 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 23,29 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedias.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 32,38 **** top_volume = "TEST"> ! <box name="box" material="Lead" X_Y_Z="1000; 2000; 8000"/> ! ! <xi:include href="Included.agdd"/> </section> --- 36,41 ---- top_volume = "TEST"> ! <xi:include href="IncludedBuildingBlock.agdd"/> ! <xi:include href="IncludedComposition.agdd"/> </section> --- Included.agdd DELETED --- Index: Shifts.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Shifts.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Shifts.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Shifts.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,42 **** top_volume = "TEST"> ! <trd name="trd" material="Lead" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> <composition name="TEST"> --- 42,46 ---- top_volume = "TEST"> ! <trd name="trd" medium="active" Xmp_Ymp_Z="500; 1000; 1000; 2000; 4000"/> <composition name="TEST"> --- NEW FILE: StandardMaterials.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- AGDD Standard Materials (to use with XInclude) --> <!-- $Log: StandardMaterials.agdd,v $ Revision 1.1 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added Revision 1.3 2005/10/07 15:53:46 hrivnac Colors introduced Revision 1.2 2005/10/06 20:48:11 hrivnac Identifiers example added Revision 1.1 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 --> <!-- @version $Id: StandardMaterials.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <materials version="$Id: StandardMaterials.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $" date="2001-10-03" author="Stan Bentvelsen, Julius Hrivnac" DTD_version="v7"> <!-- isotops ================================================================== --> <isotope name="Bor_10" z="5" n="10" a="10"/> <isotope name="Bor_11" z="5" n="11" a="11"/> <!-- elements ================================================================= --> <element symbol="H" ><atom zeff=" 1.0" aweight="1.00797" /></element> <element symbol="D" ><atom zeff=" 1.0" aweight="2.01" /></element> <element symbol="He"><atom zeff=" 2.0" aweight="4.0026" /></element> <element symbol="Li"><atom zeff=" 3.0" aweight="6.9410" /></element> <element symbol="Be"><atom zeff=" 4.0" aweight="9.0122" /></element> <element symbol="C" ><atom zeff=" 6.0" aweight="12.011" /></element> <element symbol="N" ><atom zeff=" 7.0" aweight="14.0067" /></element> <element symbol="O" ><atom zeff=" 8.0" aweight="15.9995" /></element> <element symbol="F" ><atom zeff=" 9.0" aweight="18.9984" /></element> <element symbol="Ne"><atom zeff="10.0" aweight="20.179" /></element> <element symbol="Na"><atom zeff="11.0" aweight="22.9898" /></element> <element symbol="Mg"><atom zeff="12.0" aweight="24.305" /></element> <element symbol="Al"><atom zeff="13.0" aweight="26.9815" /></element> <element symbol="Si"><atom zeff="14.0" aweight="28.086" /></element> <element symbol="P" ><atom zeff="15.0" aweight="30.9738" /></element> <element symbol="S" ><atom zeff="16.0" aweight="32.06" /></element> <element symbol="Cl"><atom zeff="17.0" aweight="35.453" /></element> <element symbol="Ar"><atom zeff="18.0" aweight="39.948" /></element> <element symbol="K" ><atom zeff="19.0" aweight="39.098" /></element> <element symbol="Ca"><atom zeff="20.0" aweight="40.08" /></element> <element symbol="Sc"><atom zeff="21.0" aweight="44.956" /></element> <element symbol="Ti"><atom zeff="22.0" aweight="47.90" /></element> <element symbol="V" ><atom zeff="23.0" aweight="50.9414" /></element> <element symbol="Cr"><atom zeff="24.0" aweight="51.996" /></element> <element symbol="Mn"><atom zeff="25.0" aweight="54.9830" /></element> <element symbol="Fe"><atom zeff="26.0" aweight="55.847" /></element> <element symbol="Co"><atom zeff="27.0" aweight="58.9332" /></element> <element symbol="Ni"><atom zeff="28.0" aweight="58.70" /></element> <element symbol="Cu"><atom zeff="29.0" aweight="63.546" /></element> <element symbol="Zn"><atom zeff="30.0" aweight="65.38" /></element> <element symbol="Ga"><atom zeff="31.0" aweight="69.72" /></element> <element symbol="Ge"><atom zeff="32.0" aweight="72.59" /></element> <element symbol="As"><atom zeff="33.0" aweight="74.9216" /></element> <element symbol="Se"><atom zeff="34.0" aweight="78.96" /></element> <element symbol="Br"><atom zeff="35.0" aweight="79.904" /></element> <element symbol="Kr"><atom zeff="36.0" aweight="83.80" /></element> <element symbol="Rb"><atom zeff="37.0" aweight="85.4678" /></element> <element symbol="Sr"><atom zeff="38.0" aweight="87.62" /></element> <element symbol="Y" ><atom zeff="39.0" aweight="88.909" /></element> <element symbol="Zr"><atom zeff="40.0" aweight="91.22" /></element> <element symbol="Nb"><atom zeff="41.0" aweight="92.9064" /></element> <element symbol="Mo"><atom zeff="42.0" aweight="95.94" /></element> <element symbol="Tc"><atom zeff="43.0" aweight="97" /></element> <element symbol="Ru"><atom zeff="44.0" aweight="101.07" /></element> <element symbol="Rh"><atom zeff="45.0" aweight="102.905" /></element> <element symbol="Pd"><atom zeff="46.0" aweight="106.04" /></element> <element symbol="Ag"><atom zeff="47.0" aweight="107.868" /></element> <element symbol="Cd"><atom zeff="48.0" aweight="112.40" /></element> <element symbol="In"><atom zeff="49.0" aweight="114.82" /></element> <element symbol="Sn"><atom zeff="50.0" aweight="118.69" /></element> <element symbol="Sb"><atom zeff="51.0" aweight="121.75" /></element> <element symbol="Te"><atom zeff="52.0" aweight="127.60" /></element> <element symbol="I" ><atom zeff="53.0" aweight="126.9046"/></element> <element symbol="Xe"><atom zeff="54.0" aweight="131.30" /></element> <element symbol="Cs"><atom zeff="55.0" aweight="132.905" /></element> <element symbol="Ba"><atom zeff="56.0" aweight="137.34" /></element> <element symbol="La"><atom zeff="57.0" aweight="138.91" /></element> <element symbol="Ce"><atom zeff="58.0" aweight="140.12" /></element> <element symbol="Pr"><atom zeff="59.0" aweight="140.908" /></element> <element symbol="Nd"><atom zeff="60.0" aweight="144.24" /></element> <element symbol="Pm"><atom zeff="61.0" aweight="145" /></element> <element symbol="Sm"><atom zeff="62.0" aweight="150.4" /></element> <element symbol="Eu"><atom zeff="63.0" aweight="151.96" /></element> <element symbol="Gd"><atom zeff="64.0" aweight="157.25" /></element> <element symbol="Tb"><atom zeff="65.0" aweight="158.925" /></element> <element symbol="Dy"><atom zeff="66.0" aweight="162.50" /></element> <element symbol="Ho"><atom zeff="67.0" aweight="164.930" /></element> <element symbol="Er"><atom zeff="68.0" aweight="167.26" /></element> <element symbol="Tm"><atom zeff="69.0" aweight="168.934" /></element> <element symbol="Yb"><atom zeff="70.0" aweight="173.04" /></element> <element symbol="Lu"><atom zeff="71.0" aweight="174.97" /></element> <element symbol="Hf"><atom zeff="72.0" aweight="178.49" /></element> <element symbol="Ta"><atom zeff="73.0" aweight="180.948" /></element> <element symbol="W" ><atom zeff="74.0" aweight="183.85" /></element> <element symbol="Re"><atom zeff="75.0" aweight="186.207" /></element> <element symbol="Os"><atom zeff="76.0" aweight="190.2" /></element> <element symbol="Ir"><atom zeff="77.0" aweight="192.22" /></element> <element symbol="Pt"><atom zeff="78.0" aweight="195.09" /></element> <element symbol="Au"><atom zeff="79.0" aweight="196.967" /></element> <element symbol="Hg"><atom zeff="80.0" aweight="200.59" /></element> <element symbol="Tl"><atom zeff="81.0" aweight="204.37" /></element> <element symbol="Pb"><atom zeff="82.0" aweight="207.2" /></element> <element symbol="Bi"><atom zeff="83.0" aweight="208.980" /></element> <element symbol="Po"><atom zeff="84.0" aweight="209" /></element> <element symbol="At"><atom zeff="85.0" aweight="210" /></element> <element symbol="Rn"><atom zeff="86.0" aweight="222" /></element> <element symbol="Fr"><atom zeff="87.0" aweight="223" /></element> <element symbol="Ra"><atom zeff="88.0" aweight="226.03" /></element> <element symbol="Ac"><atom zeff="89.0" aweight="227" /></element> <element symbol="Th"><atom zeff="90.0" aweight="232.038" /></element> <element symbol="Pa"><atom zeff="91.0" aweight="231.038" /></element> <element symbol="U" ><atom zeff="92.0" aweight="238.03" /></element> <element symbol="Np"><atom zeff="93.0" aweight="237.048" /></element> <element symbol="B"> <addisotope name="Bor_10" natoms="2"/> <addisotope name="Bor_11" natoms="8"/> </element> <!-- materials ================================================================ --> <material name="Hydrogen" density="0.0708" state="gas"> <addelement name="H" natoms="1"/> </material> <material name="Deuterium" density="0.162"> <addelement name="D" natoms="1"/> </material> <material name="Helium" density="0.125"> <addelement name="He" natoms="1"/> </material> <material name="Lithium" density="0.534"> <addelement name="Li" natoms="1"/> </material> <material name="Beryllium" density="1.8480"> <addelement name="Be" natoms="1"/> </material> <material name="Boron" density="2.34"> <addelement name="B" natoms="1"/> </material> <material name="Carbon" density="2.2650"> <addelement name="C" natoms="1"/> </material> <material name="Nitrogen" density="0.808"> <addelement name="N" natoms="1"/> </material> <material name="Oxygen" density="0.00143"> <addelement name="O" natoms="1"/> </material> <material name="Fluorine" density="1.1080"> <addelement name="F" natoms="1"/> </material> <material name="Neon" density="1.2070"> <addelement name="Ne" natoms="1"/> </material> <material name="Sodium" density="0.969"> <addelement name="Na" natoms="1"/> </material> <material name="Magnesium" density="1.735"> <addelement name="Mg" natoms="1"/> </material> <material name="Aluminum" density="2.700"> <addelement name="Al" natoms="1"/> </material> <material name="Silicon" density="2.33"> <addelement name="Si" natoms="1"/> </material> <material name="Phosphorus" density="1.82"> <addelement name="P" natoms="1"/> </material> <material name="Sulfur" density="2.07"> <addelement name="S" natoms="1"/> </material> <material name="Chlorine" density="1.56"> <addelement name="Cl" natoms="1"/> </material> <material name="Argon" density="0.001639"> <addelement name="Ar" natoms="1"/> </material> <material name="Potassium" density="0.860"> <addelement name="K" natoms="1"/> </material> <material name="Calcium" density="1.55"> <addelement name="Ca" natoms="1"/> </material> <material name="Scandium" density="2.98"> <addelement name="Sc" natoms="1"/> </material> <material name="Titanium" density="4.53"> <addelement name="Ti" natoms="1"/> </material> <material name="Vanadium" density="6.10"> <addelement name="V" natoms="1"/> </material> <material name="Chromium" density="7.18"> <addelement name="Cr" natoms="1"/> </material> <material name="Manganese" density="7.43"> <addelement name="Mn" natoms="1"/> </material> <material name="Iron" density="7.87"> <addelement name="Fe" natoms="1"/> </material> <material name="Cobalt" density="8.90"> <addelement name="Co" natoms="1"/> </material> <material name="Nickel" density="8.876"> <addelement name="Ni" natoms="1"/> </material> <material name="Copper" density="8.96"> <addelement name="Cu" natoms="1"/> </material> <material name="Zinc" density="7.112"> <addelement name="Zn" natoms="1"/> </material> <material name="Gallium" density="5.877"> <addelement name="Ga" natoms="1"/> </material> <material name="Germanium" density="5.3230"> <addelement name="Ge" natoms="1"/> </material> <material name="Arsenic" density="5.72"> <addelement name="As" natoms="1"/> </material> <material name="Selenium" density="4.78"> <addelement name="Se" natoms="1"/> </material> <material name="Bromine" density="3.11"> <addelement name="Br" natoms="1"/> </material> <material name="Krypton" density="2.60"> <addelement name="Kr" natoms="1"/> </material> <material name="Rubidium" density="1.529"> <addelement name="Rb" natoms="1"/> </material> <material name="Strontium" density="2.54"> <addelement name="Sr" natoms="1"/> </material> <material name="Yttrium" density="4.456"> <addelement name="Y" natoms="1"/> </material> <material name="Zirconium" density="6.494"> <addelement name="Zr" natoms="1"/> </material> <material name="Niobium" density="8.55"> <addelement name="Nb" natoms="1"/> </material> <material name="Molybdenum" density="10.20"> <addelement name="Mo" natoms="1"/> </material> <material name="Technetium" density="11.48"> <addelement name="Tc" natoms="1"/> </material> <material name="Ruthenium" density="12.39"> <addelement name="Ru" natoms="1"/> </material> <material name="Rhodium" density="12.39"> <addelement name="Rh" natoms="1"/> </material> <material name="Palladium" density="12.00"> <addelement name="Pd" natoms="1"/> </material> <material name="Silver" density="10.48"> <addelement name="Ag" natoms="1"/> </material> <material name="Cadmium" density="8.63"> <addelement name="Cd" natoms="1"/> </material> <material name="Indium" density="7.30"> <addelement name="In" natoms="1"/> </material> <material name="Tin" density="7.31"> <addelement name="Sn" natoms="1"/> </material> <material name="Antimony" density="6.679"> <addelement name="Sb" natoms="1"/> </material> <material name="Tellurium" density="6.23"> <addelement name="Te" natoms="1"/> </material> <material name="Iodine" density="7.30"> <addelement name="I" natoms="1"/> </material> <material name="Xenon" density="3.057"> <addelement name="Xe" natoms="1"/> </material> <material name="Cesium" density="1.870"> <addelement name="Cs" natoms="1"/> </material> <material name="Barium" density="3.50"> <addelement name="Ba" natoms="1"/> </material> <material name="Larthanum" density="6.127"> <addelement name="La" natoms="1"/> </material> <material name="Cerium" density="6.637"> <addelement name="Ce" natoms="1"/> </material> <material name="Tungsten" density="19.3"> <addelement name="W" natoms="1"/> </material> <material name="Gold" density="18.85"> <addelement name="Au" natoms="1"/> </material> <material name="Lead" density="11.35"> <addelement name="Pb" natoms="1"/> </material> <material name="Bismuth" density="9.37"> <addelement name="Bi" natoms="1"/> </material> <material name="Uranium" density="18.950"> <addelement name="U" natoms="1"/> </material> <material name="Air" density="0.001214"> <addelement name="N" natoms="0.7494"/> <addelement name="O" natoms="0.2369"/> <addelement name="Ar" natoms="0.0129"/> <addelement name="H" natoms="0.0008"/> </material> <material name="Vacuum" zeff="1.0e-15" aweight="1.0e-15" density="1.0e-15" x0="1.0e+17" lambda="1.0e+17"> </material> </materials> Index: Reflections.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Reflections.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Reflections.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Reflections.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,45 **** top_volume = "TEST"> ! <cons name="cons0" material="Lead" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> ! <cons name="consX" material="Lead" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> ! <cons name="consY" material="Lead" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> ! <cons name="consZ" material="Lead" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> <composition name="O-reflected"> --- 42,49 ---- top_volume = "TEST"> ! <cons name="cons0" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> ! <cons name="consX" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> ! <cons name="consY" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> ! <cons name="consZ" medium="active" Rio1_Rio2_Z="500; 900; 1000; 1400; 8000" profile="0; 180"/> <composition name="O-reflected"> Index: solids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/solids.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** solids.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- solids.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 46,54 **** <var name="a7" value="a6 + 1000"/> ! <box name="box" X_Y_Z="a1; a2; a3" material="Lead" /> ! <trd name="trd" Xmp_Ymp_Z="a1; a2; a3; a4; a5" material="Lead" /> ! <tubs name="tubs" Rio_Z="a1; a2; a3" material="Lead" /> ! <cons name="cons" Rio1_Rio2_Z="a1; a2; a3; a4; a5" material="Lead" /> ! <pcon name="pcon" material="Lead" > <polyplane Rio_Z="a1; a2; a3" /> <polyplane Rio_Z="a1+1000; a2+1000; a3+1000" /> --- 50,58 ---- <var name="a7" value="a6 + 1000"/> ! <box name="box" X_Y_Z="a1; a2; a3" medium="active" /> ! <trd name="trd" Xmp_Ymp_Z="a1; a2; a3; a4; a5" medium="active" /> ! <tubs name="tubs" Rio_Z="a1; a2; a3" medium="active" /> ! <cons name="cons" Rio1_Rio2_Z="a1; a2; a3; a4; a5" medium="active" /> ! <pcon name="pcon" medium="active" > <polyplane Rio_Z="a1; a2; a3" /> <polyplane Rio_Z="a1+1000; a2+1000; a3+1000" /> --- NEW FILE: IncludedBuildingBlock.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: XInclude constituent --> <!-- $Log: IncludedBuildingBlock.agdd,v $ Revision 1.1 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added Revision 1.1 2005/03/30 13:42:56 hrivnac AGDD added Revision 1.1 2005/02/16 16:37:53 hrivnac XInclude possible --> <!-- @version $Id: IncludedBuildingBlock.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <buildingBlock> <box name="box" medium="active" X_Y_Z="1000; 2000; 8000"/> </buildingBlock> Index: ParametrisedColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/ParametrisedColors.agdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ParametrisedColors.agdd 10 Oct 2005 14:19:47 -0000 1.1 --- ParametrisedColors.agdd 23 Nov 2005 16:13:10 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.2 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.1 2005/10/10 14:19:47 hrivnac Parametrised Colors example added *************** *** 11,16 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 14,20 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 23,27 **** top_volume = "TEST"> ! <box name="box" material="Lead" X_Y_Z="1000; 1000; 1000" color="parametrised"/> <composition name="TEST"> --- 27,32 ---- top_volume = "TEST"> ! <box name="parametrisedBox" medium="active" X_Y_Z="1000; 1000; 1000" color="parametrised"/> ! <box name="randomBox" medium="active" X_Y_Z="1000; 1000; 1000" color="random"/> <composition name="TEST"> *************** *** 33,37 **** <var name="green" value="y"/> <var name="blue" value="z"/> ! <volume name="box"/> </posXYZ> </foreach> --- 38,45 ---- <var name="green" value="y"/> <var name="blue" value="z"/> ! <volume name="parametrisedBox"/> ! </posXYZ> ! <posXYZ X_Y_Z="- x * 40; - y * 40; - z * 40"> ! <volume name="randomBox"/> </posXYZ> </foreach> Index: Polys.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Polys.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Polys.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Polys.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,42 **** top_volume = "TEST"> ! <pcon name="polycone_full" material="Lead"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> --- 42,46 ---- top_volume = "TEST"> ! <pcon name="polycone_full" medium="active"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> *************** *** 44,48 **** </pcon> ! <pcon name="polycone_hole" material="Lead"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> --- 48,52 ---- </pcon> ! <pcon name="polycone_hole" medium="active"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> *************** *** 50,54 **** </pcon> ! <pcon name="polycone_angle" material="Lead" profile="0; 210"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> --- 54,58 ---- </pcon> ! <pcon name="polycone_angle" medium="active" profile="0; 210"> <polyplane Rio_Z="0; 2000; 0"/> <polyplane Rio_Z="0; 2500; 4000"/> *************** *** 56,60 **** </pcon> ! <pcon name="polycone_angle_hole" material="Lead" profile="0; 210"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> --- 60,64 ---- </pcon> ! <pcon name="polycone_angle_hole" medium="active" profile="0; 210"> <polyplane Rio_Z=" 500; 2000; 0"/> <polyplane Rio_Z="1000; 2500; 4000"/> Index: math.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/math.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** math.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- math.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 38,42 **** version = "$Id$"> ! <box name="box" X_Y_Z="1000; 2000; 3000" material="Lead"/> <composition name="TEST"> --- 42,46 ---- version = "$Id$"> ! <box name="box" X_Y_Z="1000; 2000; 3000" medium="active"/> <composition name="TEST"> Index: foreach.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/foreach.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** foreach.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- foreach.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 20,25 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 23,29 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 32,36 **** version = "$Id$"> ! <box name="box" X_Y_Z="1000; 1000; 1000" material="Lead"/> <composition name="TEST"> --- 36,40 ---- version = "$Id$"> ! <box name="box" X_Y_Z="1000; 1000; 1000" medium="active"/> <composition name="TEST"> --- NEW FILE: StandardColors.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- AGDD Standard Colors (to use with XInclude) --> <!-- $Log: StandardColors.agdd,v $ Revision 1.1 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added Revision 1.5 2005/10/10 23:23:40 hrivnac dtd fix Revision 1.4 2005/10/10 14:19:47 hrivnac Parametrised Colors example added Revision 1.2 2005/10/07 17:24:20 hrivnac standard Colors included Revision 1.1 2005/10/07 15:53:46 hrivnac Colors introduced --> <!-- @version $Id: StandardColors.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <colormap version="$Id: StandardColors.agdd,v 1.1 2005/11/23 16:13:10 hrivnac Exp $" date="2005-10-07" author="Julius Hrivnac" DTD_version="v7"> <!-- Standards ================================================================ --> <color name="parametrised" rgb="red; green; blue"/> <color name="random" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()"/> <color name="randomTransparent" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()" transparency="0.5"/> <color name="black" rgb=" 0; 0; 0"/> <color name="blue" rgb=" 0; 0; 255"/> <color name="cyan" rgb=" 0; 255; 255"/> <color name="darkGray" rgb=" 64; 64; 64"/> <color name="gray" rgb="128; 128; 128"/> <color name="green" rgb=" 0; 255; 0"/> <color name="lightGray" rgb="192; 192; 192"/> <color name="magenta" rgb="255; 0; 255"/> <color name="orange" rgb="255; 200; 0"/> <color name="pink" rgb="255; 175; 175"/> <color name="red" rgb="255; 0; 0"/> <color name="white" rgb="255; 255; 255"/> <color name="yellow" rgb="255; 255; 0"/> <!-- Atlantis ================================================================= --> <color name="atlantis_0" rgb=" 0; 204; 255"/> <color name="atlantis_1" rgb=" 0; 0; 0"/> <color name="atlantis_2" rgb="255; 0; 0"/> <color name="atlantis_3" rgb="255; 210; 0"/> <color name="atlantis_4" rgb=" 0; 0; 0"/> <color name="atlantis_5" rgb=" 0; 255; 0"/> <color name="atlantis_6" rgb=" 0; 0; 255"/> <color name="atlantis_7" rgb="153; 153; 153"/> <color name="atlantis_8" rgb="255; 255; 255"/> <color name="atlantis_9" rgb=" 0; 255; 0"/> <color name="atlantis_10" rgb="255; 255; 0"/> <color name="atlantis_11" rgb="255; 115; 0"/> <color name="atlantis_12" rgb="255; 0; 0"/> <color name="atlantis_13" rgb="255; 0; 255"/> <color name="atlantis_14" rgb=" 0; 255; 255"/> <color name="atlantis_15" rgb="102; 128; 255"/> <color name="atlantis_16" rgb="102; 128; 255"/> <!-- Atlantis - Solid ========================================================= --> <color name="solidatlantis_0" rgb=" 0; 255; 255"/> <color name="solidatlantis_1" rgb=" 0; 0; 0"/> <color name="solidatlantis_2" rgb="255; 102; 0"/> <color name="solidatlantis_3" rgb="255; 210; 0"/> <color name="solidatlantis_4" rgb="153; 153; 153"/> <color name="solidatlantis_5" rgb="130; 200; 130"/> <color name="solidatlantis_6" rgb=" 0; 0; 20"/> <color name="solidatlantis_7" rgb="153; 153; 153"/> <color name="solidatlantis_8" rgb="255; 255; 255"/> <color name="solidatlantis_9" rgb=" 0; 255; 0"/> <color name="solidatlantis_10" rgb="255; 255; 0"/> <color name="solidatlantis_11" rgb="255; 115; 0"/> <color name="solidatlantis_12" rgb="255; 0; 0"/> <color name="solidatlantis_13" rgb="255; 0; 255"/> <color name="solidatlantis_14" rgb=" 0; 204; 255"/> <color name="solidatlantis_15" rgb="102; 128; 255"/> <color name="solidatlantis_16" rgb="102; 128; 255"/> </colormap> Index: positioners.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/positioners.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** positioners.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- positioners.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 29,34 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 32,38 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 45,49 **** <var name="a3" value="a2 + 1"/> ! <box name="box" X_Y_Z="500; 500; 500" material="Lead"/> <composition name="TEST"> --- 49,53 ---- <var name="a3" value="a2 + 1"/> ! <box name="box" X_Y_Z="500; 500; 500" medium="active"/> <composition name="TEST"> Index: Envelopes.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Envelopes.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Envelopes.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- Envelopes.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> *************** *** 39,47 **** <box name="A" material="Air" X_Y_Z="1000; 2000; 4000"/> ! <box name="B1" material="Lead" X_Y_Z=" 200; 400; 800"/> <box name="B2" material="Air" X_Y_Z="1000; 2000; 4000"/> ! <box name="C1" material="Lead" X_Y_Z=" 200; 400; 800"/> ! <box name="C2" material="Lead" X_Y_Z=" 200; 400; 800"/> ! <box name="C3" material="Lead" X_Y_Z=" 200; 400; 800"/> <composition name="TEST"> --- 43,51 ---- <box name="A" material="Air" X_Y_Z="1000; 2000; 4000"/> ! <box name="B1" medium="active" X_Y_Z=" 200; 400; 800"/> <box name="B2" material="Air" X_Y_Z="1000; 2000; 4000"/> ! <box name="C1" medium="active" X_Y_Z=" 200; 400; 800"/> ! <box name="C2" medium="active" X_Y_Z=" 200; 400; 800"/> ! <box name="C3" medium="active" X_Y_Z=" 200; 400; 800"/> <composition name="TEST"> Index: stacks.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/stacks.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** stacks.agdd 7 Oct 2005 15:53:47 -0000 1.3 --- stacks.agdd 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.3 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 26,31 **** <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> --- 29,35 ---- <AGDD DTD_version = "v7" ! xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="StandardMedia.agdd"/> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"... [truncated message content] |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:13:18
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594 Modified Files: index.html Log Message: media and colors added, buildingBlock added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** index.html 10 Oct 2005 14:19:45 -0000 1.14 --- index.html 23 Nov 2005 16:13:10 -0000 1.15 *************** *** 28,56 **** <li>Testing/Example files (with VRML snapshots created with GraXMLConverter): <ul> ! <li><a href="Examples/AliPolys.agdd">AliPolys.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/AliPolys.wrl.gz">AliPolys.wrl</a></li> ! <li><a href="Examples/AliSolids.agdd">AliSolids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/AliSolids.wrl.gz">AliSolids.wrl</a></li> <li><a href="Examples/BinaryOperators.agdd">BinaryOperators.agdd</a></li> ! <li><a href="Examples/Colors.agdd">Colors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Colors.wrl.gz">Colors.wrl</a></li> ! <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/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>, ! <a href="Examples/Included.agdd">Included.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Including.wrl.gz">Including.wrl</a></li> ! <li><a href="Examples/MultiplePositioners.agdd">MultiplePositioners.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/MultiplePositioners.wrl.gz">MultiplePositioners.wrl</a></li> ! <li><a href="Examples/ParametrisedColors.agdd">ParametrisedColors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/ParametrisedColors.wrl.gz">ParametrisedColors.wrl</a></li> ! <li><a href="Examples/Polys.agdd">Polys.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Polys.wrl.gz">Polys.wrl</a></li> ! <li><a href="Examples/Reflections.agdd">Reflections.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Reflections.wrl.gz">Reflections.wrl</a></li> ! <li><a href="Examples/Rotations.agdd">Rotations.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Rotations.wrl.gz">Rotations.wrl</a></li> ! <li><a href="Examples/Shifts.agdd">Shifts.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Shifts.wrl.gz">Shifts.wrl</a></li> <li><a href="Examples/StandardColors.agdd">StandardColors.agdd</a></li> <li><a href="Examples/StandardMaterials.agdd">StandardMaterials.agdd</a></li> ! <li><a href="Examples/Solids.agdd">Solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Solids.wrl.gz">Solids.wrl</a></li> ! <li><a href="Examples/arrays.agdd">arrays.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/arrays.wrl.gz">arrays.wrl</a></li> ! <li><a href="Examples/foreach.agdd">foreach.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/foreach.wrl.gz">foreach.wrl</a></li> ! <li><a href="Examples/math.agdd">math.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/math.wrl.gz">math.wrl</a></li> ! <li><a href="Examples/positioners.agdd">positioners.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/positioners.wrl.gz">positioners.wrl</a></li> ! <li><a href="Examples/solids.agdd">solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/solids.wrl.gz">solids.wrl</a></li> <li><a href="Examples/stacks.agdd">stacks.agdd</a></li> ! <li><a href="Examples/vars.agdd">vars.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/vars.wrl.gz">vars.wrl</a></li> </ul> <li>GraXML <a href="https://sourceforge.net/projects/graxml">SourceForge</a> project containing AGDD.</li> --- 28,58 ---- <li>Testing/Example files (with VRML snapshots created with GraXMLConverter): <ul> ! <li><a href="Examples/AliPolys.agdd">AliPolys.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/AliPolys.wrl.gz">AliPolys.wrl</a></li> ! <li><a href="Examples/AliSolids.agdd">AliSolids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/AliSolids.wrl.gz">AliSolids.wrl</a></li> <li><a href="Examples/BinaryOperators.agdd">BinaryOperators.agdd</a></li> ! <li><a href="Examples/Colors.agdd">Colors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Colors.wrl.gz">Colors.wrl</a></li> ! <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/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>, ! <a href="Examples/IncludedBuildingBlock.agdd">IncludedBuildingBlock.agdd</a>, ! <a href="Examples/IncludedBuildingBlock.agdd">IncludedComposition.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Including.wrl.gz">Including.wrl</a></li> ! <li><a href="Examples/MultiplePositioners.agdd">MultiplePositioners.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/MultiplePositioners.wrl.gz">MultiplePositioners.wrl</a></li> ! <li><a href="Examples/ParametrisedColors.agdd">ParametrisedColors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/ParametrisedColors.wrl.gz">ParametrisedColors.wrl</a></li> ! <li><a href="Examples/Polys.agdd">Polys.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Polys.wrl.gz">Polys.wrl</a></li> ! <li><a href="Examples/Reflections.agdd">Reflections.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Reflections.wrl.gz">Reflections.wrl</a></li> ! <li><a href="Examples/Rotations.agdd">Rotations.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Rotations.wrl.gz">Rotations.wrl</a></li> ! <li><a href="Examples/Shifts.agdd">Shifts.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Shifts.wrl.gz">Shifts.wrl</a></li> <li><a href="Examples/StandardColors.agdd">StandardColors.agdd</a></li> <li><a href="Examples/StandardMaterials.agdd">StandardMaterials.agdd</a></li> ! <li><a href="Examples/StandardMaterials.agdd">StandardMedias.agdd</a></li> ! <li><a href="Examples/Solids.agdd">Solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Solids.wrl.gz">Solids.wrl</a></li> ! <li><a href="Examples/arrays.agdd">arrays.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/arrays.wrl.gz">arrays.wrl</a></li> ! <li><a href="Examples/foreach.agdd">foreach.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/foreach.wrl.gz">foreach.wrl</a></li> ! <li><a href="Examples/math.agdd">math.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/math.wrl.gz">math.wrl</a></li> ! <li><a href="Examples/positioners.agdd">positioners.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/positioners.wrl.gz">positioners.wrl</a></li> ! <li><a href="Examples/solids.agdd">solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/solids.wrl.gz">solids.wrl</a></li> <li><a href="Examples/stacks.agdd">stacks.agdd</a></li> ! <li><a href="Examples/vars.agdd">vars.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/vars.wrl.gz">vars.wrl</a></li> </ul> <li>GraXML <a href="https://sourceforge.net/projects/graxml">SourceForge</a> project containing AGDD.</li> *************** *** 123,127 **** <li>New features: <ul> ! <li>...</li> </ul> </li> --- 125,131 ---- <li>New features: <ul> ! <li>Media and Materials included.<li> ! <li>Flexible Color specification included.</li> ! <li>BuildingBlock included.</li> </ul> </li> *************** *** 130,135 **** <li>mposPhi fixed (thanks to M.Potekhin).</li> <li>pcon, phedra centered in z (thanks to M.Potekhin).</li> - <li>Materials included.<li> - <li>Flexible Color specification included.</li> </ul> </li> --- 134,137 ---- |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:13:18
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/net/hep/AGDD/Test Modified Files: JAXB.java Log Message: media and colors added, buildingBlock added Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/JAXB.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JAXB.java 7 Oct 2005 15:53:47 -0000 1.2 --- JAXB.java 23 Nov 2005 16:13:10 -0000 1.3 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.3 2005/11/23 16:13:10 hrivnac + * media and colors added, buildingBlock added + * * Revision 1.2 2005/10/07 15:53:47 hrivnac * Colors introduced *************** *** 49,53 **** // Get definitions and loop over them log.info("DTD Version: " + agdd.getDTDVersion()); ! List sections = agdd.getMaterialsOrColormapOrSection(); for (Object s : sections) { if (s instanceof SectionType) { --- 52,56 ---- // Get definitions and loop over them log.info("DTD Version: " + agdd.getDTDVersion()); ! List sections = agdd.getMediaOrMaterialsOrColormap(); for (Object s : sections) { if (s instanceof SectionType) { |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:13:18
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/net/hep/AGDD/GeometricModel Modified Files: AGDDBuilder.java Solid.java Log Message: media and colors added, buildingBlock added Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Solid.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Solid.java 7 Oct 2005 15:53:47 -0000 1.3 --- Solid.java 23 Nov 2005 16:13:10 -0000 1.4 *************** *** 2,5 **** --- 2,6 ---- // Generic Model + import net.hep.AGDD.JAXB.MediumType; import net.hep.AGDD.JAXB.ColorType; *************** *** 32,35 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.4 2005/11/23 16:13:10 hrivnac + * media and colors added, buildingBlock added + * * Revision 1.3 2005/10/07 15:53:47 hrivnac * Colors introduced *************** *** 203,209 **** --- 207,218 ---- /** Extract and remember color attributes from {@link net.hep.AGDD.JAXB.Solid}. + * Try first <em>color</em> attribute, then <em>medium/color</em> attribute. * @param s The colorfull {@link net.hep.AGDD.JAXB.Solid}. */ public void setColor(net.hep.AGDD.JAXB.Solid s) { ColorType color = (ColorType)(s.getColor()); + if (color == null) { + MediumType medium = (MediumType)(s.getMedium()); + color = (ColorType)(medium.getColor()); + } if (color != null) { float[] rgb = builder().evaluator().valueOf(color.getRgb(), "1"); Index: AGDDBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/AGDDBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGDDBuilder.java 7 Oct 2005 15:53:47 -0000 1.2 --- AGDDBuilder.java 23 Nov 2005 16:13:10 -0000 1.3 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2005/11/23 16:13:10 hrivnac + * media and colors added, buildingBlock added + * * Revision 1.2 2005/10/07 15:53:47 hrivnac * Colors introduced *************** *** 134,138 **** /** Get builder version. ! * @return The version and build time of GDML. */ public final String version() { return Info.version(); --- 137,141 ---- /** Get builder version. ! * @return The version and build time of AGDD. */ public final String version() { return Info.version(); *************** *** 140,149 **** /** Get AGDD JAXB Generic Model package name. ! * @return The package name of the JAXB Generic Model of GDML. */ protected String jaxb() { return _jaxb; } private static String _jaxb = "net.hep.AGDD.JAXB"; /** Zero vector. */ --- 143,160 ---- /** Get AGDD JAXB Generic Model package name. ! * @return The package name of the JAXB Generic Model of AGDD. */ protected String jaxb() { return _jaxb; } + + /** Get AGDD Schema file. + * @return The AGDD Schema file. */ + protected String schema() { + return _schema; + } private static String _jaxb = "net.hep.AGDD.JAXB"; + + private static String _schema = "AGDD.xsd"; /** Zero vector. */ |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:13:18
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/net/hep/AGDD/GeometricModel/Reps Modified Files: AGDD.java Log Message: media and colors added, buildingBlock added Index: AGDD.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/AGDD.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGDD.java 7 Oct 2005 15:53:47 -0000 1.2 --- AGDD.java 23 Nov 2005 16:13:10 -0000 1.3 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2005/11/23 16:13:10 hrivnac + * media and colors added, buildingBlock added + * * Revision 1.2 2005/10/07 15:53:47 hrivnac * Colors introduced *************** *** 67,71 **** BranchGroup branch = new BranchGroup(); // - Section (others are used via their references) ! List sections = agdd.getMaterialsOrColormapOrSection(); for (Object o : sections) { if (o instanceof Element && --- 70,74 ---- BranchGroup branch = new BranchGroup(); // - Section (others are used via their references) ! List sections = agdd.getMediaOrMaterialsOrColormap(); for (Object o : sections) { if (o instanceof Element && |
|
From: Julius H. <hr...@us...> - 2005-11-23 16:13:18
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/net/hep/AGDD/Schema Modified Files: AGDD.xsd Log Message: media and colors added, buildingBlock added Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AGDD.xsd 7 Oct 2005 15:53:47 -0000 1.5 --- AGDD.xsd 23 Nov 2005 16:13:10 -0000 1.6 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.6 2005/11/23 16:13:10 hrivnac + media and colors added, buildingBlock added + Revision 1.5 2005/10/07 15:53:47 hrivnac Colors introduced *************** *** 97,101 **** </p> <p> ! "composition", "section", "solid", "data" "colormap" and "materials" elements can be linked from another file using XInclude mechanism. </p> --- 100,104 ---- </p> <p> ! "composition", "section", "solid", "data" "colormap" , "materials" and "media" elements can be linked from another file using XInclude mechanism. </p> *************** *** 112,116 **** <ul> <li><b>section</b>, which is a definition of the main division of the detector</li> ! <li><b>materials</b>, which define all used materials</li> <li><b>colormap</b>, which define all used colors</li> </ul> --- 115,120 ---- <ul> <li><b>section</b>, which is a definition of the main division of the detector</li> ! <li><b>media</b>, which define all used media</li> ! <li><b>materials</b>, which define all used media</li> <li><b>colormap</b>, which define all used colors</li> </ul> *************** *** 124,127 **** --- 128,132 ---- <xs:complexType> <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="media"/> <xs:element ref="materials"/> <xs:element ref="colormap"/> *************** *** 146,150 **** of detector. A section is primarily made of "volume" elements but also may receive a set of named and typed parameter blocks (used to specify ! constants). <br></br> Attributes of section are: --- 151,155 ---- of detector. A section is primarily made of "volume" elements but also may receive a set of named and typed parameter blocks (used to specify ! constants). Solids can be encapsulated in a buildingBlock. <br></br> Attributes of section are: *************** *** 164,167 **** --- 169,173 ---- <xs:element ref="abstractBooleanVolume"/> <xs:element ref="abstractData"/> + <xs:element ref="buildingBlock"/> <xs:element ref="composition"/> </xs:choice> *************** *** 655,669 **** <xs:documentation> A solid is basic geometry unit. Specialized types provide for specific ! shapes. A solid references a material and may be declared as "sensitive" ! (which opens the not-yet-implemented capability of producing hits). </xs:documentation> </xs:annotation> <xs:complexContent> <xs:extension base="volumeInstance"> ! <xs:attribute name="material" type="xs:IDREF" use="required"/> ! <xs:attribute name="sensitive" type="xs:boolean" default="false"/> <xs:attribute name="unit_length" type="unit_length" default="mm"/> <xs:attribute name="unit_angle" type="unit_angle" default="deg"/> - <xs:attribute name="color" type="xs:IDREF"/> <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> </xs:extension> --- 661,673 ---- <xs:documentation> A solid is basic geometry unit. Specialized types provide for specific ! shapes. A solid references a medium. </xs:documentation> </xs:annotation> <xs:complexContent> <xs:extension base="volumeInstance"> ! <xs:attribute name="medium" type="xs:IDREF" use="required"/> ! <xs:attribute name="color" type="xs:IDREF"/> <xs:attribute name="unit_length" type="unit_length" default="mm"/> <xs:attribute name="unit_angle" type="unit_angle" default="deg"/> <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> </xs:extension> *************** *** 1046,1050 **** done via single positioners. <br></br> ! Note that it is required that the materials of the boolean volumes are identical. This is however not checked (or forced) within the XML syntax, and is left to the responsibility of the user (and the --- 1050,1054 ---- done via single positioners. <br></br> ! Note that it is required that the mediums of the boolean volumes are identical. This is however not checked (or forced) within the XML syntax, and is left to the responsibility of the user (and the *************** *** 1110,1114 **** </xs:element> ! <!-- Volume Instances / Composition =========================================== --> <!-- composition .............................................................. --> --- 1114,1136 ---- </xs:element> ! <!-- Building Blocks/ Compositions ============================================ --> ! ! <!-- buildingBlock ............................................................ --> ! <xs:element name="buildingBlock"> ! <xs:annotation> ! <xs:documentation> ! BuildingBlock can encapsulate a set of Solids ! </xs:documentation> ! </xs:annotation> ! <xs:complexType> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="abstractSolid"/> ! <xs:element ref="abstractStack"/> ! <xs:element ref="abstractBooleanVolume"/> ! <xs:element ref="abstractData"/> ! </xs:choice> ! <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> ! </xs:complexType> ! </xs:element> <!-- composition .............................................................. --> *************** *** 1436,1439 **** --- 1458,1502 ---- </xs:simpleType> + <!-- Media ==================================================================== --> + + <!-- media .................................................................... --> + <xs:element name="media"> + <xs:annotation> + <xs:documentation> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="medium" /> + </xs:sequence> + <xs:attribute name="version" type="xs:string" use="required" /> + <xs:attribute name="author" type="xs:string" use="required" /> + <xs:attribute name="date" type="xs:date" use="required" /> + <xs:attribute name="DTD_version" use="required"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="v7"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> + </xs:complexType> + </xs:element> + + <!-- medium ................................................................... --> + <xs:element name="medium"> + <xs:annotation> + <xs:documentation> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="name" type="xs:ID" use="required" /> + <xs:attribute name="material" type="xs:IDREF" /> + <xs:attribute name="color" type="xs:IDREF" /> + <xs:attribute name="parameters" type="xs:string" /> + <xs:attribute name="sensitive" type="xs:boolean" default="true" /> + </xs:complexType> + </xs:element> + <!-- Materials ================================================================ --> |
|
From: Julius H. <hr...@us...> - 2005-10-10 23:23:38
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29345 Modified Files: StandardColors.agdd Log Message: dtd fix Index: StandardColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardColors.agdd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StandardColors.agdd 10 Oct 2005 14:19:47 -0000 1.4 --- StandardColors.agdd 10 Oct 2005 23:23:40 -0000 1.5 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.5 2005/10/10 23:23:40 hrivnac + dtd fix + Revision 1.4 2005/10/10 14:19:47 hrivnac Parametrised Colors example added *************** *** 16,24 **** <!-- @author Jul...@ce... --> ! <colormap name="default_colormap" ! version="$Id$" ! date="2005-10-07" ! author="Julius Hrivnac" ! DTD_version="v7"> <!-- Standards ================================================================ --> --- 19,26 ---- <!-- @author Jul...@ce... --> ! <colormap version="$Id$" ! date="2005-10-07" ! author="Julius Hrivnac" ! DTD_version="v7"> <!-- Standards ================================================================ --> |
|
From: Julius H. <hr...@us...> - 2005-10-10 14:20:21
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/doc-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29739/src/net/hep/AGDD/Test/doc-files Added Files: ParametrisedColors.wrl.gz Log Message: Parametrised Colors example added --- NEW FILE: ParametrisedColors.wrl.gz --- (This appears to be a binary file; contents omitted.) |
|
From: Julius H. <hr...@us...> - 2005-10-10 14:20:17
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29739/src/net/hep/AGDD/Data Modified Files: StandardColors.agdd Log Message: Parametrised Colors example added Index: StandardColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardColors.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StandardColors.agdd 7 Oct 2005 19:07:18 -0000 1.3 --- StandardColors.agdd 10 Oct 2005 14:19:47 -0000 1.4 *************** *** 3,8 **** <!-- $Log$ ! Revision 1.3 2005/10/07 19:07:18 hrivnac ! tests improved Revision 1.2 2005/10/07 17:24:20 hrivnac --- 3,8 ---- <!-- $Log$ ! Revision 1.4 2005/10/10 14:19:47 hrivnac ! Parametrised Colors example added Revision 1.2 2005/10/07 17:24:20 hrivnac *************** *** 24,27 **** --- 24,29 ---- <!-- Standards ================================================================ --> + <color name="parametrised" rgb="red; green; blue"/> + <color name="black" rgb=" 0; 0; 0"/> <color name="blue" rgb=" 0; 0; 255"/> |
|
From: Julius H. <hr...@us...> - 2005-10-10 14:20:17
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29739/src/net/hep/AGDD/Test/data Added Files: ParametrisedColors.agdd Log Message: Parametrised Colors example added --- NEW FILE: ParametrisedColors.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: Parametrised Colors --> <!-- $Log: ParametrisedColors.agdd,v $ Revision 1.1 2005/10/10 14:19:47 hrivnac Parametrised Colors example added --> <!-- @version $Id: ParametrisedColors.agdd,v 1.1 2005/10/10 14:19:47 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" name = "Parametrised Colors" version = "$Id: ParametrisedColors.agdd,v 1.1 2005/10/10 14:19:47 hrivnac Exp $" date = "10 October 2005" author = "Julius Hrivnac" top_volume = "TEST"> <box name="box" material="Lead" X_Y_Z="1000; 1000; 1000" color="parametrised"/> <composition name="TEST"> <foreach index="x" begin="0" step="64" loops="5"> <foreach index="y" begin="0" step="64" loops="5"> <foreach index="z" begin="0" step="64" loops="5"> <posXYZ X_Y_Z="x * 40; y * 40; z * 40"> <var name="red" value="x"/> <var name="green" value="y"/> <var name="blue" value="z"/> <volume name="box"/> </posXYZ> </foreach> </foreach> </foreach> </composition> </section> </AGDD> |
|
From: Julius H. <hr...@us...> - 2005-10-10 14:20:17
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29739/src Modified Files: index.html Log Message: Parametrised Colors example added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** index.html 7 Oct 2005 23:52:09 -0000 1.13 --- index.html 10 Oct 2005 14:19:45 -0000 1.14 *************** *** 38,41 **** --- 38,42 ---- <a href="Examples/Included.agdd">Included.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Including.wrl.gz">Including.wrl</a></li> <li><a href="Examples/MultiplePositioners.agdd">MultiplePositioners.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/MultiplePositioners.wrl.gz">MultiplePositioners.wrl</a></li> + <li><a href="Examples/ParametrisedColors.agdd">ParametrisedColors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/ParametrisedColors.wrl.gz">ParametrisedColors.wrl</a></li> <li><a href="Examples/Polys.agdd">Polys.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Polys.wrl.gz">Polys.wrl</a></li> <li><a href="Examples/Reflections.agdd">Reflections.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Reflections.wrl.gz">Reflections.wrl</a></li> |
|
From: Julius H. <hr...@us...> - 2005-10-07 23:52:18
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3244 Modified Files: index.html Log Message: oops Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** index.html 7 Oct 2005 15:53:46 -0000 1.12 --- index.html 7 Oct 2005 23:52:09 -0000 1.13 *************** *** 31,35 **** <li><a href="Examples/AliSolids.agdd">AliSolids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/AliSolids.wrl.gz">AliSolids.wrl</a></li> <li><a href="Examples/BinaryOperators.agdd">BinaryOperators.agdd</a></li> ! <li><a href="Examples/Copies.agdd">Colors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Colors.wrl.gz">Colors.wrl</a></li> <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> --- 31,35 ---- <li><a href="Examples/AliSolids.agdd">AliSolids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/AliSolids.wrl.gz">AliSolids.wrl</a></li> <li><a href="Examples/BinaryOperators.agdd">BinaryOperators.agdd</a></li> ! <li><a href="Examples/Colors.agdd">Colors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Colors.wrl.gz">Colors.wrl</a></li> <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> |
|
From: Julius H. <hr...@us...> - 2005-10-07 19:07:26
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12134/ant Modified Files: build.xml Log Message: tests improved Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 7 Oct 2005 17:24:20 -0000 1.6 --- build.xml 7 Oct 2005 19:07:18 -0000 1.7 *************** *** 94,97 **** --- 94,98 ---- <copy todir="${misc}/Test" flatten="true"> <fileset dir="${src}" includes="net/hep/AGDD/Test/data/*.agdd"/> + <fileset dir="${src}" includes="net/hep/AGDD/Data/*.agdd"/> </copy> </target> |
|
From: Julius H. <hr...@us...> - 2005-10-07 19:07:26
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12134/src/net/hep/AGDD/Data Modified Files: StandardColors.agdd Log Message: tests improved Index: StandardColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardColors.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StandardColors.agdd 7 Oct 2005 17:24:20 -0000 1.2 --- StandardColors.agdd 7 Oct 2005 19:07:18 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 19:07:18 hrivnac + tests improved + Revision 1.2 2005/10/07 17:24:20 hrivnac standard Colors included *************** *** 21,24 **** --- 24,28 ---- <!-- Standards ================================================================ --> + <color name="black" rgb=" 0; 0; 0"/> <color name="blue" rgb=" 0; 0; 255"/> <color name="cyan" rgb=" 0; 255; 255"/> |
