graxml-commit Mailing List for GraXML (Page 17)
Brought to you by:
hrivnac
Menu
▾
▴
graxml-commit — CVS commit notifications of GraXML
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(6) |
Jun
(2) |
Jul
|
Aug
(12) |
Sep
(32) |
Oct
(41) |
Nov
(16) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(10) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(12) |
Jul
|
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(169) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(100) |
Nov
(14) |
Dec
(10) |
| 2008 |
Jan
(37) |
Feb
(4) |
Mar
(10) |
Apr
(73) |
May
(22) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julius H. <hr...@us...> - 2007-01-15 21:53:49
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/ant Added Files: ToDo.txt build.xml generator.xml Log Message: works, but doesn't do anything usefull --- NEW FILE: ToDo.txt --- --- NEW FILE: generator.xml --- <project name="JAXB Generation" default="generate0" basedir="."> <description> JAXB Generation </description> <target name="generate0"> <exec dir="${dir}" executable="${JAXB.sh}" os="Linux"> <arg value="-extension"/> <arg value="-p"/> <arg value="${package}"/> <arg value="-b"/> <arg value="${binding}"/> <arg value="${schema}"/> </exec> </target> </project> --- NEW FILE: build.xml --- <project name="JiveGeometry" default="compile" basedir=".."> <description> Jive Geometry (GraXML library) </description> <!-- Setup ================================================================--> <property environment="env"/> <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> <property name="version" value="pre-0.0.0"/> <path id="classpath.build"> <pathelement path="${GraXML.core}"/> <pathelement path="${Xerces.API}"/> <pathelement path="${Xerces.Impl}"/> <pathelement path="${FreeHEP.Hep3D}"/> <pathelement path="${FreeHEP.J3D}"/> <pathelement path="${Java3D.core}"/> <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> <pathelement path="${JAXP.api}"/> <pathelement path="${JAXB.api}"/> <pathelement path="${JAXB.libs}"/> <pathelement path="${JAXB.impl}"/> <pathelement path="${JAXB.xjc}"/> <pathelement path="${JWSDP.relax}"/> <pathelement path="${JWSDP.xsd}"/> <pathelement path="${Log4J.core}"/> <pathelement path="${CLASSPATH}"/> <fileset dir="${lib}"> <include name="*.jar"/> <exclude name="${name}*.jar"/> </fileset> </path> <path id="classpath.run"> <pathelement path="${src}"/> <pathelement path="${build}"/> <path refid="classpath.build"/> </path> <!-- Init =================================================================--> <target name="init"> <tstamp> <format property="TSTAMP" pattern="dd/MMM/yyyy 'at' kk:mm:ss z"/> </tstamp> <ant antfile="${config.db}/standard.xml" target="standard.init" inheritRefs="true"/> <ant antfile="${config.db}/standard.xml" target="standard.info" inheritRefs="true"> <property name="package" value="net.hep.atlas.graphics.JiveGeometry.GeometricModel"/> <property name="place" value="${build}/net/hep/atlas/graphics/JiveGeometry/GeometricModel"/> </ant> </target> <!-- Copy =================================================================--> <target name="copy" if="local"> <copy todir="${lib}"> <fileset file="${GraXML.core}"/> <fileset file="${Xerces.API}"/> <fileset file="${Xerces.Impl}"/> <fileset file="${FreeHEP.Hep3D}"/> <fileset file="${FreeHEP.J3D}"/> <fileset file="${Java3D.core}"/> <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> <fileset dir="${Java3D.libdir}"/> <fileset file="${JAXP.api}"/> <fileset file="${JAXB.api}"/> <fileset file="${JAXB.libs}"/> <fileset file="${JAXB.impl}"/> <fileset file="${JAXB.xjc}"/> <fileset file="${JWSDP.relax}"/> <fileset file="${JWSDP.xsd}"/> <fileset file="${Log4J.core}"/> </copy> <copy todir="${etc}" flatten="true"> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/*.dtd"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/*.xsd"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/GeometricModel/pdg.xml"/> </copy> <copy todir="${misc}/Test" flatten="true"> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Test/data/*.xml"/> </copy> </target> <!-- Generate =============================================================--> <target name="generate" depends="init" description="Generate JAXB classes"> <ant antfile="ant/generator.xml" target="generate0"> <property name="dir" value="${build}"/> <property name="schema" value="${src}/net/hep/atlas/graphics/JiveGeometry/Schema/geometry.xsd"/> <property name="package" value="net.hep.atlas.graphics.JiveGeometry.JAXB"/> <property name="binding" value="${src}/net/hep/atlas/graphics/JiveGeometry/JAXB/JiveGeometry.xjs"/> </ant> </target> <!-- Compile ==============================================================--> <target name="compile" depends="init" description="Compile sources"> <ant antfile="${config.db}/standard.xml" target="standard.compile" inheritRefs="true"/> </target> <!-- JAR ==================================================================--> <target name="jar" depends="compile" description="Create JAR"> <ant antfile="${config.db}/standard.xml" target="standard.jar" inheritRefs="true"> <property name="jar.name" value=""/> <property name="scope" value=""/> <property name="main" value=""/> </ant> <jar jarfile="${lib}/${name}.jar" update="true"> <fileset dir="${src}" includes="log4j.properties"/> <fileset dir="${build}" includes="**/bgm.ser"/> <fileset dir="${build}" includes="**/*.properties"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/geometry.xsd"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml"/> </jar> </target> <!-- Distribution =========================================================--> <target name="dist" depends="copy,doc,jar" description="Create complete distribution"> <ant antfile="${config.db}/standard.xml" target="standard.dist" inheritRefs="true"/> </target> <!-- Check ================================================================--> <target name="check" depends="copy" description="Test"> <mkdir dir="${run}"/> <copy todir="${run}" flatten="true"> <fileset dir="${etc}" includes="**"/> <fileset dir="${src}/net/hep/atlas/graphics/JiveGeometry/Test/data" includes="*.xml"/> </copy> <echo/><echo>Testing JAXB Generic Model</echo> <java classname="net.hep.atlas.graphics.JiveGeometry.Test.JAXB" dir="${run}" fork="true" failonerror="false"> <arg value="AGeometryTB.xml"/> <classpath> <path refid="classpath.run"/> </classpath> </java> <echo/><echo>Testing Geometric Model</echo> <java classname="net.hep.atlas.graphics.JiveGeometry.Test.GeometricModel" dir="${run}" fork="true" failonerror="false"> <arg value="AGeometryTB.xml"/> <classpath> <path refid="classpath.run"/> </classpath> </java> </target> <!-- Clean ================================================================--> <target name="clean" description="Clean up"> <ant antfile="${config.db}/standard.xml" target="standard.clean" inheritRefs="true"/> </target> <!-- Deploy ===============================================================--> <target name="post" depends="dist" description="Put on WWW" if="local"> <ant antfile="${config.db}/standard.xml" target="standard.post" inheritRefs="true"/> </target> <!-- JavaDoc ==============================================================--> <target name="doc" depends="j2h,xsddoc,uml,viz" description="Construct documentation"> <mkdir dir="${doc}/JavaDoc"/> <mkdir dir="${doc}/Examples"/> <copy todir="${doc}" flatten="true"> <fileset dir="${src}" includes="index.html"/> </copy> <copy todir="${doc}/Examples" flatten="true"> <fileset dir="${src}/net/hep/atlas/graphics/JiveGeometry/Schema" includes="*.xsd"/> <fileset dir="${src}/net/hep/atlas/graphics/JiveGeometry/Test/data" includes="*.xml"/> </copy> <replace file="${doc}/index.html" token="@VERSION@" value="${version}"/> <replace file="${doc}/index.html" token="@BUILD@" value="${TSTAMP}"/> <javadoc packagenames="net.hep.atlas.graphics.JiveGeometry.JAXB*, net.hep.atlas.graphics.JiveGeometry.JAXB.impl*, net.hep.atlas.graphics.JiveGeometry.JAXB.impl.runtime*, net.hep.atlas.graphics.JiveGeometry.GeometricModel*, net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps*, net.hep.atlas.graphics.JiveGeometry.Test*" sourcepath="${src}:${build}" destdir="${doc}/JavaDoc" author="true" version="true" use="true" private="true" additionalparam=" -linksource -breakiterator -keywords" source="1.5" Overview="${src}/net/hep/atlas/graphics/JiveGeometry/overview.html" windowtitle="${name}"> <doctitle><![CDATA[<u>]]>${name}<![CDATA[</u>]]></doctitle> <Header><![CDATA[<center>]]>${name} version: ${version}<![CDATA[</center>]]></Header> <Footer><![CDATA[<center>Written by: <a href='http://hrivnac.home.cern.ch/hrivnac'>J.Hrivnac</a></center>]]></Footer> <bottom><![CDATA[<a href='http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/JiveGeometry'>Documentations</a>]]> built ${TODAY} on ${os.name} by ${user.name}</bottom> <group title="Generic Model" packages="net.hep.atlas.graphics.JiveGeometry.JAXB*"/> <group title="Geometric Model" packages="net.hep.atlas.graphics.JiveGeometry.GeometricModel*"/> <group title="Test" packages="net.hep.atlas.graphics.JiveGeometry.Test*"/> <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> <link href="http://java.sun.com/products/java-media/3D/forDevelopers/J3D_1_3_API/j3dapi/"/> <link href="http://java.sun.com/xml/jaxb/api"/> <link href="http://logging.apache.org/log4j/docs/api"/> <link href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/GraXML/JavaDoc"/> <link href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/HEP3D/JavaDoc"/> <classpath> <path refid="classpath.run"/> </classpath> </javadoc> <copy todir="${doc}/JavaDoc/net/hep/atlas/graphics/JiveGeometry/Test/doc-files" flatten="true"> <fileset dir="${src}/net/hep/atlas/graphics/JiveGeometry/Test/data" includes="*xml"/> </copy> </target> <!-- J2H ==================================================================--> <target name="j2h" description="Construct source documentation" depends="init" if="local"> <ant antfile="${config.db}/standard.xml" target="standard.j2h" inheritRefs="true"/> </target> <!-- Visualise ============================================================--> <target name="viz" depends="init" description="Create flow of build file" if="local"> <ant antfile="${config.db}/standard.xml" target="standard.viz" inheritRefs="true"/> </target> <!-- XSDDoc ===============================================================--> <target name="xsddoc" depends="init" description="Create XSD documentation" if="local"> <ant antfile="${config.db}/standard.xml" target="standard.xsddoc" inheritRefs="true"> <property name="dir" value="net/hep/atlas/graphics/JiveGeometry/Schema"/> <property name="schema" value="geometry"/> </ant> </target> <!-- FindBugs =============================================================--> <target name="findbugs" if="local" depends="init" description="Construct source documentation"> <ant antfile="${config.db}/standard.xml" target="standard.findbugs" inheritRefs="true"/> </target> <!-- UmlGraph =============================================================--> <target name="uml" if="local" depends="init" description="Construct UML documentation"> <ant antfile="${config.db}/standard.xml" target="standard.uml" inheritRefs="true"/> </target> <!--=======================================================================--> </project> |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:46:43
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src/net/hep/atlas/graphics/JiveGeometry Added Files: overview.html package.html Log Message: works, but doesn't do anything usefull --- NEW FILE: package.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <title>Jive Geometry Generic and Geometric Model (GraXML library)</title> </head> <body> Jive Geometry Generic and Geometric Model (GraXML library). </body> </html> --- NEW FILE: overview.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <title>Jive Geometry Generic and Geometric Model (GraXML library)</title> </head> <body> Jive Geometry Generic and Geometric Model (GraXML library). </body> </html> |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:23:37
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv696/src/net/hep/graphics/GraXML Modified Files: MasterBuilder.java SceneGroup.java Log Message: embedded demos included Index: SceneGroup.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/SceneGroup.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SceneGroup.java 30 Mar 2005 12:44:29 -0000 1.1 --- SceneGroup.java 14 Jan 2007 17:04:57 -0000 1.2 *************** *** 4,8 **** --- 4,11 ---- // Java + import java.io.InputStream; + import java.io.FileInputStream; import java.io.IOException; + import java.io.FileNotFoundException; // Log4J *************** *** 25,28 **** --- 28,34 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/14 17:04:57 hrivnac + * embedded demos included + * * Revision 1.1 2005/03/30 12:44:29 hrivnac * GraXML introduced *************** *** 55,67 **** public final class SceneGroup extends BranchGroup { ! /** Parse XML files and create BranchGroup. */ public SceneGroup(String file) throws GraXMLException { try { log.info("Reading Generic Model from " + file + " ..."); // Identify the Schema/DTD of the file to be able to choose proper Builder // SAX/DOM should be used DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder dbuilder = factory.newDocumentBuilder(); ! Document document = dbuilder.parse(file); log.info("Building Geometric Model ..."); // Create proper Builder --- 61,89 ---- public final class SceneGroup extends BranchGroup { ! /** Parse XML file and create {@link BranchGroup}. ! * @param file The filename of the geometrical file. ! * The filesystem is checked first, if a file ! * is not found there, it is searched in the classpath. */ public SceneGroup(String file) throws GraXMLException { + // Convert file into stream + InputStream stream0 = null; + InputStream stream1 = null; try { + stream0 = new FileInputStream(file); + stream1 = new FileInputStream(file); log.info("Reading Generic Model from " + file + " ..."); + } + catch (FileNotFoundException e) { + stream0 = SceneGroup.class.getClassLoader().getResourceAsStream(file); + stream1 = SceneGroup.class.getClassLoader().getResourceAsStream(file); + log.info("Reading Generic Model from embedded " + file + " ..."); + } + // Get document and call Builder + try { // Identify the Schema/DTD of the file to be able to choose proper Builder // SAX/DOM should be used DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder dbuilder = factory.newDocumentBuilder(); ! Document document = dbuilder.parse(stream0); log.info("Building Geometric Model ..."); // Create proper Builder *************** *** 69,89 **** // Build using DOM or JAXB if (builder != null) { ! builder.build(file, document, this); } else { ! log.warn("Can't create builder for file " + file); } } catch (FactoryConfigurationError e) { ! RootWindow.reportException("Can't create builder for file " + file, e, log); } catch (ParserConfigurationException e) { ! RootWindow.reportException("Can't create parser for file " + file, e, log); } catch (SAXException e) { ! RootWindow.reportException("Can't parse file " + file, e, log); } catch (IOException e) { ! RootWindow.reportException("Can't read file " + file, e, log); } } --- 91,111 ---- // Build using DOM or JAXB if (builder != null) { ! builder.build(stream1, document, this); } else { ! log.warn("Can't create builder for " + file); } } catch (FactoryConfigurationError e) { ! RootWindow.reportException("Can't create builder for " + file, e, log); } catch (ParserConfigurationException e) { ! RootWindow.reportException("Can't create parser for " + file, e, log); } catch (SAXException e) { ! RootWindow.reportException("Can't parse " + file, e, log); } catch (IOException e) { ! RootWindow.reportException("Can't read " + file, e, log); } } Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MasterBuilder.java 9 Jun 2006 13:05:53 -0000 1.9 --- MasterBuilder.java 14 Jan 2007 17:04:56 -0000 1.10 *************** *** 11,14 **** --- 11,15 ---- import java.util.Properties; import java.util.Enumeration; + import java.util.ArrayList; import java.util.Map; import java.util.TreeMap; *************** *** 60,63 **** --- 61,67 ---- * <pre> * $Log$ + * Revision 1.10 2007/01/14 17:04:56 hrivnac + * embedded demos included + * * Revision 1.9 2006/06/09 13:05:53 hrivnac * cleaning *************** *** 219,227 **** * @throws GraXMLException If Geometric Model can't be build. */ // TBD: JAXB currently doesn't use Document public final void build(String file, Document document, BranchGroup group) throws GraXMLException { - auxiliaryOutput(file); setSource(file); --- 223,231 ---- * @throws GraXMLException If Geometric Model can't be build. */ // TBD: JAXB currently doesn't use Document + // TBD: reafctor with stream-based build(...) public final void build(String file, Document document, BranchGroup group) throws GraXMLException { auxiliaryOutput(file); setSource(file); *************** *** 302,305 **** --- 306,398 ---- } + /** Build Geometric Model {@link BranchGroup} from JAXB + * Generic Model. + * If {@link RootWindow} exists, builds graphical SceneGraph, + * otherwise only non-graphical one. + * @param stream The XML {@link InputStream} containing the Generic Model. + * @param document The DOM {@link Document} containing the Generic Model. + * @param group The {@link BranchGroup} to be filled with the Geometric Model. + * @throws GraXMLException If Geometric Model can't be build. */ + // TBD: JAXB currently doesn't use Document + public final void build(InputStream stream, + Document document, + BranchGroup group) throws GraXMLException { + + //auxiliaryOutput(file); + //setSource(file); + _group = group; + + // If RootWindow exists, run in graphical mode + if (_window == null) { + Config.setGraphical(false); + } + else if (!Config.configured()) { + Config.set(); + } + log.info("Constructing and Optimizing Geometric Model (see sysout for progress report, GraXML.log for detailed messages) ..."); + // Do build + long time = System.currentTimeMillis(); + if (jaxb() != null) { + 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"); + InputStream schema = MasterBuilder.class.getClassLoader().getResourceAsStream(schemaEmbedded()); + 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(stream)); + // 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 " + stream, e); + } + catch (SAXNotSupportedException e) { + throw new GraXMLException("Can't find " + stream, e); + } + catch (SAXException e) { + throw new GraXMLException("Can't find " + stream, e); + } + catch (ParserConfigurationException e) { + throw new GraXMLException("Can't find " + stream, e); + } + catch (JAXBException e) { + throw new GraXMLException("Can't create JAXB Generic Model from " + stream, e); + } + traverse(element, _group, ""); + } + else { + throw new GraXMLException("JAXB model doesn't exist - can't traverse"); + } + // Report about results + time = System.currentTimeMillis() - time; + log.info("\n"); + log.info(count() + " elements processed"); + log.info("Optimised:\n" + optDB().toString()); + log.debug("Stripified:\n" + org.freehep.j3d.Solid.stripifier().getStripifierStats()); + System.gc(); + log.info((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024 + " MB of memory used"); + log.info(time / 1000.0 + " s of CPU spent\n"); + finish(); + } + // Configurator ------------------------------------------------------------- *************** *** 551,555 **** try { Class cl = Class.forName(builder); ! cl.newInstance(); } catch (ClassNotFoundException e) { --- 644,648 ---- try { Class cl = Class.forName(builder); ! _builderObjects.add((MasterBuilder)cl.newInstance()); } catch (ClassNotFoundException e) { *************** *** 613,618 **** --- 706,727 ---- protected abstract String schema(); + /** Get Embedded XML Schema file. + * @return The Embedded XML Schema file. */ + protected abstract String schemaEmbedded(); + + /** Get list of (embedded) demostration files. + * @return The list of (embedded) demostration files. */ + public abstract String[] demos(); + private static Map<String, String> _builders = new TreeMap<String, String>(); + /** Get list of {@link MasterBuilder} implementations. + * @return The list of {@link MasterBuilder} implementations. */ + public static ArrayList<MasterBuilder> builderObjects() { + return _builderObjects; + } + + private static ArrayList<MasterBuilder> _builderObjects = new ArrayList<MasterBuilder>(); + // Data ---------------------------------------------------------------------- |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:16:24
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src/net/hep/atlas/graphics/JiveGeometry/Test Added Files: GeometricModel.java JAXB.java package.html Log Message: works, but doesn't do anything usefull --- NEW FILE: JAXB.java --- package net.hep.atlas.graphics.JiveGeometry.Test; import net.hep.atlas.graphics.JiveGeometry.JAXB.*; // Java import java.io.FileInputStream; import java.util.List; // JAXB import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; // Log4J import org.apache.log4j.Logger; /** <code>JAXB</code> tests JiveGeometry JAXB Generic Model. * It opens a JiveGeometry file and gets several entries from it. * <p><font color="#880088"> * <pre> * $Log: JAXB.java,v $ * Revision 1.1 2007/01/14 21:41:18 hrivnac * works, but doesn't do anything usefull * * </pre> * </font></p> * @version $Id: JAXB.java,v 1.1 2007/01/14 21:41:18 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class JAXB { /** Do it. * @param args <ol> * <li>The filename of the JiveGeometry file.</li> * </ol> * @throws Exception if anything goes wrong. */ public static void main(String[] args) throws Exception { // Initiate JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveGeometry.JAXB"); Unmarshaller u = jc.createUnmarshaller(); u.setValidating(true); log.info("Opening " + args[0]); // Get geometry GeometryType geometry = (GeometryType)u.unmarshal(new FileInputStream(args[0])); // Get APoint List aGeometryTBs = geometry.getAGeometryTB(); List aGeneralPaths = ((AGeometryTBType)(aGeometryTBs.get(0))).getAGeneralPath(); List aPoints = ((AGeneralPath)(aGeneralPaths.get(0))).getAPoint(); log.info("\tAPoint.x: " + ((APointType)(aPoints.get(0))).getX()); } /** Logging . */ private static Logger log = Logger.getLogger(JAXB.class); } --- NEW FILE: package.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <title>Jive Geometry Generic and Geometric Model (GraXML library) - Testing</title> </head> <body> Jive Geometry Generic and Geometric Model (GraXML library) - Testing. </body> </html> --- NEW FILE: GeometricModel.java --- package net.hep.atlas.graphics.JiveGeometry.Test; import net.hep.atlas.graphics.JiveGeometry.JAXB.*; // Java import java.io.FileInputStream; import java.util.List; // JAXB import javax.xml.bind.JAXBContext; import javax.xml.bind.Unmarshaller; // Log4J import org.apache.log4j.Logger; /** <code>GeometricModel</code> tests JiveGeometry JAXB Generic Model. * It opens a Jive Geometry file and ... * <p><font color="#880088"> * <pre> * $Log: GeometricModel.java,v $ * Revision 1.1 2007/01/14 21:41:18 hrivnac * works, but doesn't do anything usefull * * </pre> * </font></p> * @version $Id: GeometricModel.java,v 1.1 2007/01/14 21:41:18 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class GeometricModel { /** Do it. * @param args <ol> * <li>The filename of the JiveEvent file.</li> * </ol> * @throws Exception if anything goes wrong. */ public static void main(String[] args) throws Exception { // Initiate JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveGeometry.JAXB"); Unmarshaller u = jc.createUnmarshaller(); u.setValidating(true); log.info("Opening " + args[0]); // Get geometry GeometryType geometry = (GeometryType)u.unmarshal(new FileInputStream(args[0])); } /** Logging . */ private static Logger log = Logger.getLogger(GeometricModel.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:14:30
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11101/ant Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/ant added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 20:37:29
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16673/src/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: JiveGeometry builder added Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Guide.html 14 Jan 2007 17:04:59 -0000 1.15 --- Guide.html 14 Jan 2007 21:47:06 -0000 1.16 *************** *** 924,927 **** --- 924,928 ---- <ul> <li>Demonstration examples are callable directly from GUI.</li> + <li>JiveGeometry builder added.</li> </ul> <li>Bug fixes:</li> |
|
From: Julius H. <hr...@us...> - 2007-01-15 20:14:38
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv696/ant Modified Files: build.xml Log Message: embedded demos included Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.xml 11 Jan 2007 13:57:11 -0000 1.10 --- build.xml 14 Jan 2007 17:04:56 -0000 1.11 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="3.1.10"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="pre-3.1.11"/> <path id="classpath.build"> *************** *** 270,274 **** <target name="post" ! depends="dist" description="Put on WWW" if="local"> --- 270,274 ---- <target name="post" ! depends="init" description="Put on WWW" if="local"> *************** *** 284,288 **** <fileset file="${lib}/*.jar"/> </signjar> ! <copy todir="${user.home}/WWW/Activities/Packages/WebStart"> <fileset file="${src}/*.jnlp"/> <fileset file="${lib}/*.jar"/> --- 284,288 ---- <fileset file="${lib}/*.jar"/> </signjar> ! <copy todir="${user.home}/WWW/Activities/Packages/WebStart" overwrite="true"> <fileset file="${src}/*.jnlp"/> <fileset file="${lib}/*.jar"/> |
|
From: Julius H. <hr...@us...> - 2007-01-15 20:06:49
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src/net/hep/atlas/graphics/JiveGeometry/Schema Added Files: AGeometryTB.dtd geometry.xsd Log Message: works, but doesn't do anything usefull --- NEW FILE: AGeometryTB.dtd --- <!DOCTYPE AGeometry [ <!ELEMENT AGeometry (AGeneralPath*) > <!ELEMENT AGeometryConstant EMPTY > <!ATTLIST AGeometryConstant n CDATA #REQUIRED value CDATA #REQUIRED> <!ELEMENT APoint EMPTY > <!ATTLIST APoint x CDATA #REQUIRED y CDATA #REQUIRED> <!ELEMENT AGeneralPath (APoint*) > <!ATTLIST AGeneralPath p CDATA #REQUIRED c CDATA #REQUIRED n CDATA #REQUIRED numPoints CDATA #REQUIRED xR (YES|NO) "NO" yR (YES|NO) "NO"> ]> --- NEW FILE: geometry.xsd --- <?xml version="1.0"?> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="Geometry"> <xs:complexType> <xs:choice> <xs:element minOccurs="0" maxOccurs="unbounded" ref="AGeometryTB" /> </xs:choice> </xs:complexType> </xs:element> <xs:element name="AGeometryTB"> <xs:complexType> <xs:choice> <xs:element minOccurs="0" maxOccurs="unbounded" ref="AGeneralPath" /> </xs:choice> <xs:attribute name="p" type="xs:string" /> <xs:attribute name="value" type="xs:string" /> </xs:complexType> </xs:element> <xs:element name="AGeneralPath"> <xs:complexType> <xs:choice> <xs:element minOccurs="0" maxOccurs="unbounded" ref="APoint" /> </xs:choice> <xs:attribute name="p" type="xs:string" /> <xs:attribute name="c" type="xs:string" /> <xs:attribute name="n" type="xs:string" /> <xs:attribute name="numPoints" type="xs:int" /> <xs:attribute name="xR" default="NO"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:enumeration value="YES" /> <xs:enumeration value="NO" /> </xs:restriction> </xs:simpleType> </xs:attribute> <xs:attribute name="yR" default="NO"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:enumeration value="YES" /> <xs:enumeration value="NO" /> </xs:restriction> </xs:simpleType> </xs:attribute> </xs:complexType> </xs:element> <xs:element name="APoint"> <xs:complexType> <xs:attribute name="x" type="xs:float" /> <xs:attribute name="y" type="xs:float" /> </xs:complexType> </xs:element> </xs:schema> |
|
From: Julius H. <hr...@us...> - 2007-01-15 19:59:46
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/JAXB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src/net/hep/atlas/graphics/JiveGeometry/JAXB Added Files: JiveGeometry.xjs package.html Log Message: works, but doesn't do anything usefull --- NEW FILE: package.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <title>Jive Geometry Generic and Geometric Model (GraXML library) - JAXB Generic Model</title> </head> <body> Jive Geometry Generic and Geometric Model (GraXML library) - JAXB Generic Model. </body> </html> --- NEW FILE: JiveGeometry.xjs --- <?xml version="1.0" encoding="ISO-8859-1" ?> <!-- JAXB binding customisation for JiveGeometry. --> <!-- It is currently just a placeholder. --> <!-- $Id: JiveGeometry.xjs,v 1.1 2007/01/14 21:41:17 hrivnac Exp $ --> <!-- $Log: JiveGeometry.xjs,v $ Revision 1.1 2007/01/14 21:41:17 hrivnac works, but doesn't do anything usefull --> <!-- @version 0.0.0 --> <!-- @author Jul...@ce... --> <jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0"> <jaxb:bindings schemaLocation="../Schema/geometry.xsd" node="/xs:schema"> <jaxb:schemaBindings> <!-- <jaxb:nameXmlTransform> <jaxb:elementName suffix="Rep"/> <jaxb:typeName suffix="Rep"/> <jaxb:modelGroupName suffix="Rep"/> </jaxb:nameXmlTransform> --> </jaxb:schemaBindings> </jaxb:bindings> </jaxb:bindings> |
|
From: Julius H. <hr...@us...> - 2007-01-15 18:14:27
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Added Files: package.html Log Message: works, but doesn't do anything usefull --- NEW FILE: package.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <title>Jive Geometry Generic and Geometric Model (GraXML library) - Geometric Model</title> </head> <body> Jive Geometry Generic and Geometric Model (GraXML library) - Geometric Model. <br> <img SRC="doc-files/Reps.gif"> </body> </html> |
|
From: Julius H. <hr...@us...> - 2007-01-15 16:51:46
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16673/src/net/hep/graphics/GraXML/GUI/Components Modified Files: Dimensions.java Fonts.java Log Message: JiveGeometry builder added Index: Dimensions.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/Dimensions.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Dimensions.java 14 Jan 2007 17:04:58 -0000 1.2 --- Dimensions.java 14 Jan 2007 21:47:06 -0000 1.3 *************** *** 20,24 **** public static final Dimension BIG = new Dimension(30, 30); ! public static final Dimension LONG = new Dimension(160, 20); } --- 20,24 ---- public static final Dimension BIG = new Dimension(30, 30); ! public static final Dimension LONG = new Dimension(160, 15); } Index: Fonts.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/Fonts.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Fonts.java 30 Mar 2005 12:44:30 -0000 1.1 --- Fonts.java 14 Jan 2007 21:47:06 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/14 21:47:06 hrivnac + * JiveGeometry builder added + * * Revision 1.1 2005/03/30 12:44:30 hrivnac * GraXML introduced *************** *** 29,32 **** --- 32,37 ---- public final class Fonts { + public static final Font SMALL = new Font("Helvetica", Font.PLAIN, 5); + public static final Font PLAIN = new Font("Helvetica", Font.PLAIN, 10); |
|
From: Julius H. <hr...@us...> - 2007-01-15 16:37:22
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16673/ant Modified Files: build.xml Log Message: JiveGeometry builder added Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** build.xml 14 Jan 2007 17:04:56 -0000 1.11 --- build.xml 14 Jan 2007 21:47:06 -0000 1.12 *************** *** 31,34 **** --- 31,35 ---- <pathelement path="${GDML.core}"/> <pathelement path="${JiveEvent.core}"/> + <pathelement path="${JiveGeometry.core}"/> <pathelement path="${JAXP.api}"/> <pathelement path="${JAXB.api}"/> *************** *** 86,89 **** --- 87,91 ---- <fileset file="${GDML.core}"/> <fileset file="${JiveEvent.core}"/> + <fileset file="${JiveGeometry.core}"/> <fileset file="${JAXP.api}"/> <fileset file="${JAXB.api}"/> *************** *** 113,116 **** --- 115,119 ---- <antcall target="copy.GDML"/> <antcall target="copy.JiveEvent"/> + <antcall target="copy.JiveGeometry"/> </target> *************** *** 135,139 **** </target> ! <target name="copy.JiveEvent" if="JiveEvent"> <copy todir="${etc}"> <fileset dir="${JiveEvent}/etc"/> --- 138,142 ---- </target> ! <target name="copy.JiveEvent" if="JiveEvent"> <copy todir="${etc}"> <fileset dir="${JiveEvent}/etc"/> *************** *** 145,148 **** --- 148,161 ---- </target> + <target name="copy.JiveGeometry" if="JiveGeometry"> + <copy todir="${etc}"> + <fileset dir="${JiveGeometry}/etc"/> + </copy> + <copy todir="${misc}/Test"> + <fileset dir="${JiveGeometry}/etc"/> + <fileset dir="${JiveGeometry}/misc/Test"/> + </copy> + </target> + <!-- Compile ==============================================================--> |
|
From: Julius H. <hr...@us...> - 2007-01-15 16:28:29
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12922/Schema Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 15:12:36
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12387/hep Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 15:04:58
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src/net/hep/atlas/graphics/JiveGeometry/Test/data Added Files: AGeometryTB.xml Log Message: works, but doesn't do anything usefull --- NEW FILE: AGeometryTB.xml --- <?xml version="1.0"?> <Geometry> <AGeometryTB> <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > <APoint x="19.2628" y="-1.46904" /> <APoint x="19.1599" y="-1.41392" /> <APoint x="19.9344" y="0.0316653" /> <APoint x="20.0373" y="-0.0234584" /> </AGeneralPath> </AGeometryTB> </Geometry> |
|
From: Julius H. <hr...@us...> - 2007-01-15 15:02:57
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12566/JiveGeometry Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 15:00:50
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12922/GeometricModel Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:49:21
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8299/net/hep/atlas/graphics/JiveGeometry/Test Modified Files: GeometricModel.java JAXB.java Log Message: makes hierarchy, not yet picture Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/JAXB.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JAXB.java 14 Jan 2007 21:41:18 -0000 1.1 --- JAXB.java 15 Jan 2007 14:41:53 -0000 1.2 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/15 14:41:53 hrivnac + * makes hierarchy, not yet picture + * * Revision 1.1 2007/01/14 21:41:18 hrivnac * works, but doesn't do anything usefull *************** *** 44,48 **** List aGeometryTBs = geometry.getAGeometryTB(); List aGeneralPaths = ((AGeometryTBType)(aGeometryTBs.get(0))).getAGeneralPath(); ! List aPoints = ((AGeneralPath)(aGeneralPaths.get(0))).getAPoint(); log.info("\tAPoint.x: " + ((APointType)(aPoints.get(0))).getX()); } --- 47,51 ---- List aGeometryTBs = geometry.getAGeometryTB(); List aGeneralPaths = ((AGeometryTBType)(aGeometryTBs.get(0))).getAGeneralPath(); ! List aPoints = ((AGeneralPathType)(aGeneralPaths.get(0))).getAPoint(); log.info("\tAPoint.x: " + ((APointType)(aPoints.get(0))).getX()); } Index: GeometricModel.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/GeometricModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GeometricModel.java 14 Jan 2007 21:41:18 -0000 1.1 --- GeometricModel.java 15 Jan 2007 14:41:53 -0000 1.2 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/15 14:41:53 hrivnac + * makes hierarchy, not yet picture + * * Revision 1.1 2007/01/14 21:41:18 hrivnac * works, but doesn't do anything usefull *************** *** 30,34 **** /** Do it. * @param args <ol> ! * <li>The filename of the JiveEvent file.</li> * </ol> * @throws Exception if anything goes wrong. */ --- 33,37 ---- /** Do it. * @param args <ol> ! * <li>The filename of the JiveGeometry file.</li> * </ol> * @throws Exception if anything goes wrong. */ |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:49:13
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8299/net/hep/atlas/graphics/JiveGeometry/Test/data Modified Files: AGeometryTB.xml Log Message: makes hierarchy, not yet picture Index: AGeometryTB.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGeometryTB.xml 14 Jan 2007 21:41:18 -0000 1.1 --- AGeometryTB.xml 15 Jan 2007 14:41:53 -0000 1.2 *************** *** 1,11 **** <?xml version="1.0"?> <Geometry> ! <AGeometryTB> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="19.2628" y="-1.46904" /> ! <APoint x="19.1599" y="-1.41392" /> ! <APoint x="19.9344" y="0.0316653" /> ! <APoint x="20.0373" y="-0.0234584" /> ! </AGeneralPath> ! </AGeometryTB> ! </Geometry> --- 1,412 ---- <?xml version="1.0"?> <Geometry> ! <AGeometryTB> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="19.2628" y="-1.46904" /> ! <APoint x="19.1599" y="-1.41392" /> ! <APoint x="19.9344" y="0.0316653" /> ! <APoint x="20.0373" y="-0.0234584" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="-1.80994" y="19.3187" /> ! <APoint x="4.26894" y="19.212" /> ! <APoint x="4.26894" y="19.9344" /> ! <APoint x="-1.80994" y="20.0373" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="19.4878" y="-0.095879" /> ! <APoint x="19.3735" y="-0.0719739" /> ! <APoint x="19.7094" y="1.53326" /> ! <APoint x="19.8237" y="1.50936" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="-1.80994" y="19.488" /> ! <APoint x="4.26894" y="19.3737" /> ! <APoint x="4.26894" y="19.769" /> ! <APoint x="-1.80994" y="19.881" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="23.1296" y="-1.5" /> ! <APoint x="23.0236" y="-1.45116" /> ! <APoint x="23.7099" y="0.0383565" /> ! <APoint x="23.8159" y="-0.0104852" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="-1.80994" y="23.1782" /> ! <APoint x="4.26894" y="23.0693" /> ! <APoint x="4.26894" y="23.7099" /> ! <APoint x="-1.80994" y="23.8159" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="23.2602" y="-0.0756059" /> ! <APoint x="23.1476" y="-0.044879" /> ! <APoint x="23.5793" y="1.53727" /> ! <APoint x="23.6919" y="1.50655" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="-1.80994" y="23.2603" /> ! <APoint x="4.26894" y="23.1476" /> ! <APoint x="4.26894" y="23.6294" /> ! <APoint x="-1.80994" y="23.7398" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="26.5547" y="-1.51507" /> ! <APoint x="26.4476" y="-1.4686" /> ! <APoint x="27.1006" y="0.0358155" /> ! <APoint x="27.2077" y="-0.0106547" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="-1.80994" y="26.5979" /> ! <APoint x="4.26894" y="26.4884" /> ! <APoint x="4.26894" y="27.1006" /> ! <APoint x="-1.80994" y="27.2077" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="26.6502" y="-0.0630437" /> ! <APoint x="26.5383" y="-0.0298182" /> ! <APoint x="27.0051" y="1.54233" /> ! <APoint x="27.117" y="1.50911" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="-1.80994" y="26.6503" /> ! <APoint x="4.26894" y="26.5383" /> ! <APoint x="4.26894" y="27.0491" /> ! <APoint x="-1.80994" y="27.159" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="37.8197" y="-0.687473" /> ! <APoint x="37.8197" y="-0.463982" /> ! <APoint x="37.8197" y="6.46826" /> ! <APoint x="37.8197" y="4.744" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.82423" y="37.826" /> ! <APoint x="-7.32062" y="37.8226" /> ! <APoint x="-6.76195" y="38.3689" /> ! <APoint x="5.26195" y="38.1161" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="37.9163" y="-0.452023" /> ! <APoint x="37.9163" y="-0.714411" /> ! <APoint x="37.9163" y="6.23463" /> ! <APoint x="37.9163" y="4.99261" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.94765" y="37.9189" /> ! <APoint x="-7.19642" y="37.923" /> ! <APoint x="-6.91543" y="38.4254" /> ! <APoint x="5.1678" y="38.2435" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="38.3717" y="-5.99261" /> ! <APoint x="38.3717" y="-7.23463" /> ! <APoint x="38.3717" y="-0.285589" /> ! <APoint x="38.3717" y="-0.547977" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.1678" y="38.8369" /> ! <APoint x="-6.91543" y="39.0478" /> ! <APoint x="-7.19642" y="38.3728" /> ! <APoint x="4.94765" y="38.3757" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="38.4682" y="-5.744" /> ! <APoint x="38.4682" y="-7.46826" /> ! <APoint x="38.4682" y="-0.536018" /> ! <APoint x="38.4682" y="-0.312527" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.26195" y="38.8947" /> ! <APoint x="-6.76195" y="39.1865" /> ! <APoint x="-7.32062" y="38.472" /> ! <APoint x="4.82423" y="38.4695" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="44.9697" y="-0.187473" /> ! <APoint x="44.9697" y="0.0360181" /> ! <APoint x="44.9697" y="6.96826" /> ! <APoint x="44.9697" y="5.244" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.82423" y="44.9701" /> ! <APoint x="-7.32062" y="44.9698" /> ! <APoint x="-6.76195" y="45.5064" /> ! <APoint x="5.26195" y="45.2745" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="45.0663" y="0.0479774" /> ! <APoint x="45.0663" y="-0.214411" /> ! <APoint x="45.0663" y="6.73463" /> ! <APoint x="45.0663" y="5.49261" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.94765" y="45.0663" /> ! <APoint x="-7.19642" y="45.0668" /> ! <APoint x="-6.91543" y="45.5667" /> ! <APoint x="5.1678" y="45.3997" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="45.5217" y="-5.49261" /> ! <APoint x="45.5217" y="-6.73463" /> ! <APoint x="45.5217" y="0.214411" /> ! <APoint x="45.5217" y="-0.0479774" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.1678" y="45.8519" /> ! <APoint x="-6.91543" y="46.0172" /> ! <APoint x="-7.19642" y="45.5223" /> ! <APoint x="4.94765" y="45.5218" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="45.6183" y="-5.244" /> ! <APoint x="45.6183" y="-6.96826" /> ! <APoint x="45.6183" y="-0.0360181" /> ! <APoint x="45.6183" y="0.187473" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.26195" y="45.9187" /> ! <APoint x="-6.76195" y="46.1474" /> ! <APoint x="-7.32062" y="45.6183" /> ! <APoint x="4.82423" y="45.6186" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="52.1698" y="-0.187473" /> ! <APoint x="52.1698" y="0.0360181" /> ! <APoint x="52.1698" y="6.96826" /> ! <APoint x="52.1698" y="5.244" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.82423" y="52.1701" /> ! <APoint x="-7.32062" y="52.1698" /> ! <APoint x="-6.76195" y="52.6331" /> ! <APoint x="5.26195" y="52.4326" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="52.2662" y="0.0479774" /> ! <APoint x="52.2662" y="-0.214411" /> ! <APoint x="52.2662" y="6.73463" /> ! <APoint x="52.2662" y="5.49261" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.94765" y="52.2663" /> ! <APoint x="-7.19642" y="52.2667" /> ! <APoint x="-6.91543" y="52.6984" /> ! <APoint x="5.1678" y="52.5541" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="52.7218" y="-5.49261" /> ! <APoint x="52.7218" y="-6.73463" /> ! <APoint x="52.7218" y="0.214411" /> ! <APoint x="52.7218" y="-0.0479774" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.1678" y="53.0071" /> ! <APoint x="-6.91543" y="53.1501" /> ! <APoint x="-7.19642" y="52.7222" /> ! <APoint x="4.94765" y="52.7218" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="52.8182" y="-5.244" /> ! <APoint x="52.8182" y="-6.96826" /> ! <APoint x="52.8182" y="-0.0360181" /> ! <APoint x="52.8182" y="0.187473" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.26195" y="53.0779" /> ! <APoint x="-6.76195" y="53.2759" /> ! <APoint x="-7.32062" y="52.8183" /> ! <APoint x="4.82423" y="52.8186" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="59.2698" y="0.312527" /> ! <APoint x="59.2698" y="0.536018" /> ! <APoint x="59.2698" y="7.46826" /> ! <APoint x="59.2698" y="5.744" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.82423" y="59.2706" /> ! <APoint x="-7.32062" y="59.2722" /> ! <APoint x="-6.76195" y="59.7384" /> ! <APoint x="5.26195" y="59.5474" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="59.3663" y="0.547977" /> ! <APoint x="59.3663" y="0.285589" /> ! <APoint x="59.3663" y="7.23463" /> ! <APoint x="59.3663" y="5.99261" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="4.94765" y="59.3688" /> ! <APoint x="-7.19642" y="59.3669" /> ! <APoint x="-6.91543" y="59.8054" /> ! <APoint x="5.1678" y="59.6679" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="59.8217" y="-4.99261" /> ! <APoint x="59.8217" y="-6.23463" /> ! <APoint x="59.8217" y="0.714411" /> ! <APoint x="59.8217" y="0.452023" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.1678" y="60.0297" /> ! <APoint x="-6.91543" y="60.1458" /> ! <APoint x="-7.19642" y="59.826" /> ! <APoint x="4.94765" y="59.8235" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > ! <APoint x="59.9183" y="-4.744" /> ! <APoint x="59.9183" y="-6.46826" /> ! <APoint x="59.9183" y="0.463982" /> ! <APoint x="59.9183" y="0.687473" /> ! </AGeneralPath> ! <AGeneralPath p="RZ" c="PIX" n="Si" numPoints="4" > ! <APoint x="5.26195" y="60.1058" /> ! <APoint x="-6.76195" y="60.2664" /> ! <APoint x="-7.32062" y="59.92" /> ! <APoint x="4.82423" y="59.9222" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="169.868" y="-17.076" /> ! <APoint x="183.541" y="-15.3237" /> ! <APoint x="184.791" y="-2.26159" /> ! <APoint x="171.764" y="-6.5564" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="184.227" y="-15.5556" /> ! <APoint x="198.059" y="-25.7607" /> ! <APoint x="201.113" y="-9.67311" /> ! <APoint x="185.501" y="-2.27255" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="198.724" y="-26.0632" /> ! <APoint x="220.173" y="-22.941" /> ! <APoint x="222.202" y="-2.6258" /> ! <APoint x="201.817" y="-9.79176" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="171.853" y="-6.07248" /> ! <APoint x="184.928" y="-1.76445" /> ! <APoint x="183.88" y="11.3175" /> ! <APoint x="171.933" y="4.64183" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="185.639" y="-1.78005" /> ! <APoint x="201.204" y="-9.16859" /> ! <APoint x="201.334" y="7.23258" /> ! <APoint x="184.57" y="11.5233" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="201.907" y="-9.2575" /> ! <APoint x="222.343" y="-2.0888" /> ! <APoint x="220.643" y="18.2588" /> ! <APoint x="202.039" y="7.33155" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="169.868" y="-17.076" /> ! <APoint x="183.541" y="-15.3237" /> ! <APoint x="184.791" y="-2.26159" /> ! <APoint x="171.764" y="-6.5564" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="184.227" y="-15.5556" /> ! <APoint x="198.059" y="-25.7607" /> ! <APoint x="201.113" y="-9.67311" /> ! <APoint x="185.501" y="-2.27255" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="198.724" y="-26.0632" /> ! <APoint x="220.173" y="-22.941" /> ! <APoint x="222.202" y="-2.6258" /> ! <APoint x="201.817" y="-9.79176" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="171.853" y="-6.07248" /> ! <APoint x="184.928" y="-1.76445" /> ! <APoint x="183.88" y="11.3175" /> ! <APoint x="171.933" y="4.64183" /> ! </AGeneralPath> ! <AGeneralPath p="YX" c="TRT" n="TRT" numPoints="4" > ! <APoint x="185.639" y="-1.78005" /> ! <APoint x="201.204" y="-9.16859" /> ! <APoint x="201.334" y="7.23258" /> ! <APoint x="184.57" y="11.5233" /> ! </AGeneralPath> ! ! ! ! <!-- commented out values were generated by the JiveXML GeometryWriter, ! adjustments of LAr and Tile positions were made on 2005-06-14 ! xTrans = 260.70524, phiRot = 0.400263 ! --> ! <!-- ! <AGeneralPath p="YX" c="HCAL" n="TILE" numPoints="4" > ! <APoint x="213.82" y="-39.0142" /> ! <APoint x="213.82" y="39.0142" /> ! <APoint x="401" y="71.6012" /> ! <APoint x="401" y="-71.6012" /> ! </AGeneralPath> ! --> ! <AGeneralPath p="YX" c="HCAL" n="TILE" numPoints="4" > ! <APoint x="474.52524" y="-39.0142" /> ! <APoint x="474.52524" y="39.0142" /> ! <APoint x="661.70524" y="71.6012" /> ! <APoint x="661.70524" y="-71.6012" /> ! </AGeneralPath> ! <!-- ! <AGeneralPath p="RZ" c="HCAL" n="TILE" numPoints="4" > ! <APoint x="-288.747" y="215" /> ! <APoint x="288.747" y="215" /> ! <APoint x="288.747" y="401" /> ! <APoint x="-288.747" y="401" /> ! </AGeneralPath> ! --> ! <AGeneralPath p="RZ" c="HCAL" n="TILE" numPoints="4" > ! <APoint x="-349.701039123" y="346.198007209" /> ! <APoint x="182.146994935" y="571.224647195" /> ! <APoint x="109.67012931" y="742.522936589" /> ! <APoint x="-422.177904749" y="517.496296602" /> ! </AGeneralPath> ! <!-- ! <AGeneralPath p="RZ" c="HCAL" n="TILE" numPoints="4" > ! <APoint x="375.874" y="215" /> ! <APoint x="605.683" y="215" /> ! <APoint x="605.683" y="416" /> ! <APoint x="375.874" y="416" /> ! </AGeneralPath> ! --> ! <AGeneralPath p="RZ" c="HCAL" n="TILE" numPoints="4" > ! <APoint x="262.387350096" y="605.174603493" /> ! <APoint x="474.031912393" y="694.722108937" /> ! <APoint x="395.710138249" y="879.834776507" /> ! <APoint x="184.065575953" y="790.287271063" /> ! </AGeneralPath> ! <!-- ! <AGeneralPath p="YX" c="ECAL" n="LAr" numPoints="4" > ! <APoint x="137.701" y="-33.3469" /> ! <APoint x="137.701" y="33.3467" /> ! <APoint x="200.337" y="42.3467" /> ! <APoint x="200.337" y="-42.3469" /> ! </AGeneralPath> ! --> ! <AGeneralPath p="YX" c="ECAL" n="LAr" numPoints="4" > ! <APoint x="394.40624" y="-33.3469" /> ! <APoint x="394.40624" y="33.3467" /> ! <APoint x="461.04224" y="42.3467" /> ! <APoint x="461.04224" y="-42.3469" /> ! </AGeneralPath> ! <!-- ! <AGeneralPath p="RZ" c="ECAL" n="LAr" numPoints="4" > ! <APoint x="0.678424" y="141.23" /> ! <APoint x="312.734" y="141.23" /> ! <APoint x="312.734" y="200.35" /> ! <APoint x="0.678424" y="200.35" /> ! </AGeneralPath> ! --> ! <AGeneralPath p="RZ" c="ECAL" n="LAr" numPoints="4" > ! <APoint x="-56.4069616216" y="385.036570409" /> ! <APoint x="238.98328765" y="509.632323363" /> ! <APoint x="214.946554877" y="567.079392551" /> ! <APoint x="-79.4436943946" y="445.483639597" /> ! </AGeneralPath> ! </AGeometryTB> ! </Geometry> |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:42:09
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8299/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Added Files: AGeneralPath.java Geometry.java Log Message: makes hierarchy, not yet picture --- NEW FILE: Geometry.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.GeometryType; import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeometryTBType; import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeneralPathType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; // JAXB import javax.xml.bind.Element; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>Geometry</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.GeometryType} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: Geometry.java,v $ * Revision 1.1 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture * * </pre> * </font></p> * @version $Id: Geometry.java,v 1.1 2007/01/15 14:41:53 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class Geometry implements GraXMLJAXBRep { // TBD: remove, obsolete public final void traverse(MasterBuilder builder, org.w3c.dom.Node node, Group tg, String parent) {} public final void traverse(MasterBuilder builder0, Element element, Group tg, String parent) { // Verify builder type if (! (builder0 instanceof JiveGeometryBuilder)) { log.error(element + " can't be traversed using " + builder0 + " builder"); return; } JiveGeometryBuilder builder = (JiveGeometryBuilder)builder0; // Verify element type if (! (element instanceof GeometryType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Get element properties GeometryType geometry = (GeometryType)element; // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup();; // - AGeneralPath AGeometryTBType aGeometryTB; AGeneralPathType aGeneralPath; int i = 0; for (Object o1 : geometry.getAGeometryTB()) { aGeometryTB = (AGeometryTBType)o1; for (Object o2 : aGeometryTB.getAGeneralPath()) { aGeneralPath = (AGeneralPathType)o2; (new AGeneralPath()).traverse(builder, aGeneralPath, branch, _name); } } // Register BranchGroup into Connections database builder.conDB().addConnection(new DetachableConnection(_name, parent, tg, branch, null)); } private static String _name = "AGeneralPath"; /** Logging . */ private static Logger log = Logger.getLogger(Geometry.class); } --- NEW FILE: AGeneralPath.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.AGeneralPathType; import net.hep.atlas.graphics.JiveGeometry.JAXB.APointType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // FreeHEP import org.freehep.j3d.PolyLine; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>AGeneralPath</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.AGeneralPath} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: AGeneralPath.java,v $ * Revision 1.1 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture * * </pre> * </font></p> * @version $Id: AGeneralPath.java,v 1.1 2007/01/15 14:41:53 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class AGeneralPath extends JiveRep { public final void traverse(JiveGeometryBuilder builder, AGeneralPathType aGeneralPath, Group tg, String parent) { // Set values set(builder, tg, parent); // Get element properties int num = aGeneralPath.getNumPoints(); String p = aGeneralPath.getP(); String c = aGeneralPath.getC(); String n = aGeneralPath.getN(); String name = p + "_" + c + "_" + n + "_" + k++; Appearance appearance = builder().appearance(name, name + "x"); setAppearance(appearance); APointType aPoint; Point3d[] points = new Point3d[num]; int i = 0; for (Object o : aGeneralPath.getAPoint()) { aPoint = (APointType)o; points[i++] = new Point3d(aPoint.getX(), aPoint.getY(), 0.0); } PolyLine polyline = new PolyLine(points, appearance); use(polyline, name, name + "x"); } private static int k = 0; /** Logging . */ private static Logger log = Logger.getLogger(AGeneralPath.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:41:58
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8299 Modified Files: log4j.properties Log Message: makes hierarchy, not yet picture Index: log4j.properties =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/log4j.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** log4j.properties 14 Jan 2007 21:41:16 -0000 1.1 --- log4j.properties 15 Jan 2007 14:41:53 -0000 1.2 *************** *** 9,13 **** log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.Append=true ! log4j.appender.file.File=JiveEvent.log log4j.appender.file.MaxFileSize=10MB log4j.appender.file.MaxBackupIndex=1 --- 9,13 ---- log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.Append=true ! log4j.appender.file.File=JiveGeometry.log log4j.appender.file.MaxFileSize=10MB log4j.appender.file.MaxBackupIndex=1 |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:41:55
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8299/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java JiveRep.java Added Files: package.html Log Message: makes hierarchy, not yet picture --- NEW FILE: package.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <title>Jive Geometry Generic and Geometric Model (GraXML library) - GraXML Representations</title> </head> <body> Jive Geometry Generic and Geometric Model (GraXML library) - GaXML Representation. </body> </html> Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JiveRep.java 14 Jan 2007 21:41:17 -0000 1.1 --- JiveRep.java 15 Jan 2007 14:41:53 -0000 1.2 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/15 14:41:53 hrivnac + * makes hierarchy, not yet picture + * * Revision 1.1 2007/01/14 21:41:17 hrivnac * works, but doesn't do anything usefull *************** *** 70,75 **** * @param info The detailed information about the element. */ protected void use(BranchGroup bg, ! String name, ! String info) { // Register proper BranchGroup into Connections database --- 73,78 ---- * @param info The detailed information about the element. */ protected void use(BranchGroup bg, ! String name, ! String info) { // Register proper BranchGroup into Connections database Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JiveGeometryBuilder.java 14 Jan 2007 21:41:17 -0000 1.1 --- JiveGeometryBuilder.java 15 Jan 2007 14:41:53 -0000 1.2 *************** *** 21,24 **** --- 21,27 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/15 14:41:53 hrivnac + * makes hierarchy, not yet picture + * * Revision 1.1 2007/01/14 21:41:17 hrivnac * works, but doesn't do anything usefull *************** *** 46,50 **** } ! /** Get GDML JAXB Generic Model package name. * @return The package name of the JAXB Generic Model of JiveGeometry. */ protected String jaxb() { --- 49,53 ---- } ! /** Get JiveGeometry JAXB Generic Model package name. * @return The package name of the JAXB Generic Model of JiveGeometry. */ protected String jaxb() { *************** *** 52,56 **** } ! /** Get JiveEvent Schema file. * @return The JiveGeometry Schema file. */ protected String schema() { --- 55,59 ---- } ! /** Get JiveGeometry Schema file. * @return The JiveGeometry Schema file. */ protected String schema() { |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:30:38
|
Update of /cvsroot/graxml/DetDescr/JiveEvent In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8847/JiveEvent Log Message: Directory /cvsroot/graxml/DetDescr/JiveEvent added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:24:57
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/misc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11101/misc Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/misc added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 14:20:43
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12460/graphics Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics added to the repository |
