graxml-commit Mailing List for GraXML (Page 16)
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-18 15:29:25
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20232/net/hep/graphics/GraXML/GUI Modified Files: RootWindow.java Log Message: multiple loading possible Index: RootWindow.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/RootWindow.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RootWindow.java 14 Jan 2007 17:04:58 -0000 1.3 --- RootWindow.java 18 Jan 2007 15:29:22 -0000 1.4 *************** *** 11,15 **** import net.hep.graphics.GraXML.Java3DExtensions.J3DFrame; import net.hep.graphics.GraXML.Java3DExtensions.SelectedColor; ! import net.hep.graphics.GraXML.Disconnecter.ViewerTree; import net.hep.graphics.GraXML.Disconnecter.ViewerTreeMouseListener; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; --- 11,15 ---- import net.hep.graphics.GraXML.Java3DExtensions.J3DFrame; import net.hep.graphics.GraXML.Java3DExtensions.SelectedColor; ! import net.hep.graphics.GraXML.Disconnecter.ViewerTreeFactory; import net.hep.graphics.GraXML.Disconnecter.ViewerTreeMouseListener; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; *************** *** 41,44 **** --- 41,45 ---- import javax.swing.JPopupMenu; import javax.swing.JToolBar; + import javax.swing.JTree; import javax.swing.BoxLayout; import javax.swing.event.ChangeListener; *************** *** 77,80 **** --- 78,84 ---- * <pre> * $Log$ + * Revision 1.4 2007/01/18 15:29:22 hrivnac + * multiple loading possible + * * Revision 1.3 2007/01/14 17:04:58 hrivnac * embedded demos included *************** *** 206,215 **** /** Unload {@link BranchGroup} and clean picture. */ public final void clean() { ! if (_dirty) { ! _j3d.detachGroup(); ! removeTree(); ! _interacters.setup(); ! _dirty = false; ! } } --- 210,216 ---- /** Unload {@link BranchGroup} and clean picture. */ public final void clean() { ! _j3d.detachGroup(); ! removeTree(); ! _interacters.setup(); } *************** *** 229,236 **** * @param file The filename with Generic Model of the geometry to show. */ public final void show(String file) { - if (_dirty) { - setError("File already shown, clean it first to show another one."); - return; - } _file = file; try { --- 230,233 ---- *************** *** 245,253 **** * @param file The filename of vthe embedded file with Generic Model of the geometry to show. */ public final void showEmbedded(String file) { - if (_dirty) { - clean(); - SelectedColor.setPaletteOffset(); - System.gc(); - } try { show(new SceneGroup(_demos.get(file))); --- 242,245 ---- *************** *** 273,286 **** /** Show {@link BranchGroup}. * @param topGroup The {@link BranchGroup} to show. */ - // TBD: allow adding SceneGraphs public final void show(BranchGroup topGroup) { ! if (_dirty) { ! setError("SceneGraph already shown, clean it first to show another one."); ! } ! else { ! _j3d.attachGroup(topGroup); ! addTree(); ! _dirty = true; ! } } --- 265,271 ---- /** Show {@link BranchGroup}. * @param topGroup The {@link BranchGroup} to show. */ public final void show(BranchGroup topGroup) { ! _j3d.attachGroup(topGroup); ! addTree(); } *************** *** 465,470 **** public final void addTree() { _j3d.conDB().buildTree(); ! ViewerTree tree = new ViewerTree(this); ! tree.addMouseListener(new ViewerTreeMouseListener(this, tree)); _treePanel = new TreePanel(tree); _center.setRightComponent(_treePanel); --- 450,454 ---- public final void addTree() { _j3d.conDB().buildTree(); ! JTree tree = ViewerTreeFactory.createTree(this); _treePanel = new TreePanel(tree); _center.setRightComponent(_treePanel); *************** *** 739,744 **** private static boolean _exists = false; - - private boolean _dirty; /** Logging . */ --- 723,726 ---- |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:56:31
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23676/src/org/freehep/j3d Modified Files: BooleanOperation.java BooleanShape3D.java Colors3D.java ConeSegment.java Equalator.java OutlinedShape3DFactory.java PolyConeSegment.java PolyGoneSegment.java PolyLine.java Solid.java SphereSegment.java Test.java TorusSegment.java Trapezoid.java Added Files: PolyGone.java Log Message: PolyGone added Index: Trapezoid.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Trapezoid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Trapezoid.java 5 Sep 2005 12:16:26 -0000 1.1 --- Trapezoid.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 15,18 **** --- 15,21 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 56,59 **** --- 59,66 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: TorusSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/TorusSegment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TorusSegment.java 5 Sep 2005 12:16:26 -0000 1.1 --- TorusSegment.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 16,19 **** --- 16,22 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 57,60 **** --- 60,67 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: BooleanShape3D.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/BooleanShape3D.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BooleanShape3D.java 5 Sep 2005 12:16:26 -0000 1.1 --- BooleanShape3D.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 37,40 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 76,79 **** --- 79,86 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Equalator.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Equalator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Equalator.java 5 Sep 2005 12:16:26 -0000 1.1 --- Equalator.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 21,24 **** --- 24,31 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Colors3D.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Colors3D.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Colors3D.java 5 Sep 2005 12:16:26 -0000 1.1 --- Colors3D.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 9,12 **** --- 9,15 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 20,23 **** --- 23,30 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: SphereSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/SphereSegment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SphereSegment.java 5 Sep 2005 12:16:26 -0000 1.1 --- SphereSegment.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 16,19 **** --- 16,22 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 60,63 **** --- 63,70 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Solid.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Solid.java 7 Jun 2006 15:59:32 -0000 1.2 --- Solid.java 16 Jan 2007 14:56:25 -0000 1.3 *************** *** 12,15 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.2 2006/06/07 15:59:32 hrivnac * Shape3Ds are stripified, it should help performance *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ *************** *** 52,55 **** --- 59,81 ---- } } + + /** Adds geometry from <code>{@link GeometryInfo}.POLYGON_ARRAY + * coordinates. Just one countour is created (there are no holes). + * @param coordinates The polygon array describing geometry. */ + protected void addCoordinatesPolygone(Point3d[] coordinates) { + GeometryInfo geometryInfo = new GeometryInfo(GeometryInfo.POLYGON_ARRAY); + geometryInfo.setCoordinates(coordinates); + int[] stripCounts = {coordinates.length}; + geometryInfo.setStripCounts(stripCounts); + _normalGenerator.generateNormals(geometryInfo); + _stripifier.stripify(geometryInfo); + if (_first) { + setGeometry(geometryInfo.getGeometryArray()); + _first = false; + } + else { + addGeometry(geometryInfo.getGeometryArray()); + } + } /** Give associated {@link Stripifier}. It can be Index: PolyConeSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyConeSegment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PolyConeSegment.java 5 Sep 2005 12:16:26 -0000 1.1 --- PolyConeSegment.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 69,72 **** --- 72,79 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: ConeSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/ConeSegment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConeSegment.java 5 Sep 2005 12:16:26 -0000 1.1 --- ConeSegment.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 70,73 **** --- 73,80 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: PolyGoneSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyGoneSegment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PolyGoneSegment.java 5 Sep 2005 12:16:26 -0000 1.1 --- PolyGoneSegment.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 67,70 **** --- 70,77 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: BooleanOperation.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/BooleanOperation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BooleanOperation.java 5 Sep 2005 12:16:26 -0000 1.1 --- BooleanOperation.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 6,9 **** --- 6,12 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 20,23 **** --- 23,30 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: OutlinedShape3DFactory.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/OutlinedShape3DFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OutlinedShape3DFactory.java 31 May 2006 14:27:49 -0000 1.2 --- OutlinedShape3DFactory.java 16 Jan 2007 14:56:25 -0000 1.3 *************** *** 15,18 **** --- 15,21 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.2 2006/05/31 14:27:49 hrivnac * existing Shape3D can be outlined without clonying *************** *** 42,45 **** --- 45,52 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Test.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Test.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Test.java 5 Sep 2005 12:16:26 -0000 1.1 --- Test.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 93,96 **** --- 96,103 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ *************** *** 202,206 **** rmaxs, zs, ! 0.3, // phimin 5.0, // phimax 10, // sides --- 209,213 ---- rmaxs, zs, ! 0.3, // phimin 5.0, // phimax 10, // sides *************** *** 230,233 **** --- 237,248 ---- transparentAppearance())); } + else if (name.equals("PolyGone")) { + Point3d[] points = {new Point3d(0.0, 0.0, 0.0), + new Point3d(0.5, 0.6, 0.1), + new Point3d(0.0, 0.4, 0.4), + new Point3d(0.0, 0.3, 0.2)}; + return(new PolyGone(points, // points + transparentAppearance())); + } else if (name.equals("BooleanTrapezoid")) { Trapezoid s1 = new Trapezoid(0.2, // xmu *************** *** 435,438 **** --- 450,454 ---- " TorusSegment |\n" + " PolyLine |\n" + + " PolyGone |\n" + " BooleanTrapezoid |\n" + " BooleanConeSegment |\n" + --- NEW FILE: PolyGone.java --- package org.freehep.j3d; // Java3D import javax.media.j3d.Appearance; import javax.media.j3d.Shape3D; import javax.media.j3d.LineStripArray; import javax.media.j3d.GeometryArray; import javax.vecmath.Point3d; import javax.vecmath.Vector3d; // Java import java.lang.IllegalArgumentException; /** <code>Polygone</code> defined from points. * <img src="doc-files/PolyGone.gif"> * <p><font color="#880088"> * <pre> * $Log: PolyGone.java,v $ * Revision 1.1 2007/01/16 14:56:25 hrivnac * PolyGone added * * </pre> * </font></p> * @opt attributes * @opt operations * @opt types * @opt visibility * @version $Id: PolyGone.java,v 1.1 2007/01/16 14:56:25 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ // TBD: documentation picture public class PolyGone extends Solid { // Constructors -------------------------------------------------------------- /** Initialise polyline to be constructed later. */ protected PolyGone() {} /** Create polygone. * @param points The array of {@link Point3d}s, points.length > 2. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public PolyGone(Point3d[] points, Appearance appearance) throws IllegalArgumentException { construct(points, appearance); } // --------------------------------------------------------------------------- /** Perform the construction. * @param points The array of {@link Point3d}s, points.length > 2. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ protected void construct(Point3d[] points, Appearance appearance) throws IllegalArgumentException { // Check preconditins if (! (points.length > 2)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + " it should be > 2."); } int[] counts = new int[1]; counts[0] = points.length; // Fill Polygone array addCoordinatesPolygone(points); // Add Appearance setAppearance(appearance); } } Index: PolyLine.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyLine.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PolyLine.java 5 Sep 2005 12:16:26 -0000 1.1 --- PolyLine.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 48,56 **** * </pre> * </font></p> * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class PolyLine extends Shape3D { ! // Constructors -------------------------------------------------------------- /** Initialise polyline to be constructed later. */ --- 51,63 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class PolyLine extends Shape3D { ! // Constructors -----------../src/org/freehep/j3d/Poly--------------------------------------------------- /** Initialise polyline to be constructed later. */ *************** *** 58,62 **** /** Create polyline. ! * @param points The array of {@link Point3d}s, points.length > 2. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ --- 65,69 ---- /** Create polyline. ! * @param points The array of {@link Point3d}s, points.length > 1. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ *************** *** 69,73 **** /** Perform the construction. ! * @param points The array of {@link Point3d}s, points.length > 2. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ --- 76,80 ---- /** Perform the construction. ! * @param points The array of {@link Point3d}s, points.length > 1. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ *************** *** 78,82 **** if (! (points.length > 1)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + ! " it should be > 2."); } --- 85,89 ---- if (! (points.length > 1)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + ! " it should be > 1."); } |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:56:28
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4 In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23676/src/hep/graphics/j3d/geant4 Modified Files: G4Box.java G4Cons.java G4EllipticalTube.java G4Hype.java G4Orb.java G4Para.java G4Polycone.java G4Polyhedra.java G4Sphere.java G4Torus.java G4Trap.java G4Trd.java G4Tubs.java Test.java Log Message: PolyGone added Index: G4Para.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Para.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Para.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Para.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 20,23 **** --- 20,26 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 39,42 **** --- 42,49 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Tubs.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Tubs.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Tubs.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Tubs.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4EllipticalTube.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4EllipticalTube.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4EllipticalTube.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4EllipticalTube.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 16,19 **** --- 16,22 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 27,30 **** --- 30,37 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Trd.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Trd.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Trd.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Trd.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Hype.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Hype.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Hype.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Hype.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 29,32 **** --- 32,39 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Cons.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Cons.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Cons.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Cons.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Polyhedra.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Polyhedra.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Polyhedra.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Polyhedra.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Torus.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Torus.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Torus.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Torus.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Orb.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Orb.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Orb.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Orb.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 24,27 **** --- 27,34 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Polycone.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Polycone.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Polycone.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Polycone.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Box.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Box.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Box.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Box.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 29,32 **** --- 32,39 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: G4Trap.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Trap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Trap.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Trap.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 41,44 **** --- 44,51 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> Index: Test.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/Test.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Test.java 5 Sep 2005 12:16:26 -0000 1.1 --- Test.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 54,57 **** --- 57,64 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: G4Sphere.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/G4Sphere.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** G4Sphere.java 5 Sep 2005 12:16:26 -0000 1.1 --- G4Sphere.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 32,35 **** --- 35,42 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:56:27
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23676/src/hep/graphics/j3d Modified Files: Helix.java Test.java Log Message: PolyGone added Index: Test.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/Test.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Test.java 5 Sep 2005 12:16:26 -0000 1.1 --- Test.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 51,54 **** --- 54,61 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Helix.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/Helix.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Helix.java 5 Sep 2005 12:16:26 -0000 1.1 --- Helix.java 16 Jan 2007 14:56:25 -0000 1.2 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:56:25 hrivnac + * PolyGone added + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 57,60 **** --- 60,67 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:56:27
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23676/src Modified Files: index.html Log Message: PolyGone added Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.html 7 Jun 2006 15:59:26 -0000 1.6 --- index.html 16 Jan 2007 14:56:25 -0000 1.7 *************** *** 24,29 **** PolyGoneSegment, SphereSegment, ! TorusSgment and ! PolyLine</li> <li>Outlined Shape3D with wireframe highlighting</li> <li>Boolean operations between Solids.</li> --- 24,30 ---- PolyGoneSegment, SphereSegment, ! TorusSgment, ! PolyLine and ! PolyGone</li> <li>Outlined Shape3D with wireframe highlighting</li> <li>Boolean operations between Solids.</li> *************** *** 143,146 **** --- 144,161 ---- </ul> </li> + <li><u>1.1.4:</u> + <ul> + <li>New features: + <ul> + <li>PolyGone added.</li> + </ul> + </li> + <li>Bug fixes: + <ul> + <li>...</li> + </ul> + </li> + </ul> + </li> </ul> <hr> |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:56:27
|
Update of /cvsroot/graxml/Graphics/HEP3D/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23676/ant Modified Files: build.xml Log Message: PolyGone added Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/ant/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 11 Jan 2007 14:02:36 -0000 1.5 --- build.xml 16 Jan 2007 14:56:25 -0000 1.6 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="1.1.3"/> <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-1.1.4"/> <path id="classpath.build"> *************** *** 61,65 **** </target> ! <!-- JAR ==================================================================--> <target name="jar" --- 61,66 ---- </target> ! <!-- JAR =========================================Shape3D can be outlined without clone creation.</li> ! <li>Shape3Ds are stripified for performance.=========================--> <target name="jar" *************** *** 82,86 **** <!-- Distribution =========================================================--> ! <target name="dist" depends="copy,doc,jar" description="Create complete distribution"> --- 83,87 ---- <!-- Distribution =========================================================--> ! <target name="dist" depends="copy,doc,jar" description="Create complete distribution"> |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:48:16
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20405/ant Modified Files: ToDo.txt Log Message: JiveGeometry added Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/ToDo.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ToDo.txt 11 Jan 2007 13:56:47 -0000 1.3 --- ToDo.txt 16 Jan 2007 14:48:12 -0000 1.4 *************** *** 9,10 **** --- 9,12 ---- describe work with SourceForge + update Guide wrt JiveGeometry + |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:48:16
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20405/src/net/hep/graphics/GraXML/FrontEnd Modified Files: builders.properties Log Message: JiveGeometry added Index: builders.properties =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/builders.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** builders.properties 14 Jan 2007 21:47:06 -0000 1.2 --- builders.properties 16 Jan 2007 14:48:12 -0000 1.3 *************** *** 3,5 **** gdml=net.hep.geant4.GDML.GeometricModel.GDMLBuilder Event=net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder ! Geometry=net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder --- 3,5 ---- gdml=net.hep.geant4.GDML.GeometricModel.GDMLBuilder Event=net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder ! AGeometry=net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:48:16
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20405/src/net/hep/graphics/GraXML Modified Files: MasterBuilder.java Log Message: JiveGeometry added Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MasterBuilder.java 14 Jan 2007 17:04:56 -0000 1.10 --- MasterBuilder.java 16 Jan 2007 14:48:12 -0000 1.11 *************** *** 61,64 **** --- 61,67 ---- * <pre> * $Log$ + * Revision 1.11 2007/01/16 14:48:12 hrivnac + * JiveGeometry added + * * Revision 1.10 2007/01/14 17:04:56 hrivnac * embedded demos included *************** *** 616,620 **** } ! private static BranchGroup _group = new BranchGroup();; // DBs ----------------------------------------------------------------------- --- 619,623 ---- } ! private static BranchGroup _group = new BranchGroup(); // DBs ----------------------------------------------------------------------- |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:46:40
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv19604/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: JiveRep.java Log Message: cosmetical changes due to JiveGeometry Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/JiveRep.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JiveRep.java 30 Mar 2005 13:10:21 -0000 1.1 --- JiveRep.java 16 Jan 2007 14:46:34 -0000 1.2 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:46:34 hrivnac + * cosmetical changes due to JiveGeometry + * * Revision 1.1 2005/03/30 13:10:21 hrivnac * JiveEvent introduced *************** *** 93,99 **** * @param name The name of the element. * @param info The detailed information about the element. */ ! protected void use(BranchGroup bg, ! String name, ! String info) { // Register proper BranchGroup into Connections database --- 96,102 ---- * @param name The name of the element. * @param info The detailed information about the element. */ ! protected void use(BranchGroup bg, ! String name, ! String info) { // Register proper BranchGroup into Connections database |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:46:37
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv19604/net/hep/atlas/graphics/JiveEvent/Test Modified Files: GeometricModel.java JAXB.java Log Message: cosmetical changes due to JiveGeometry Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test/JAXB.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JAXB.java 30 Mar 2005 13:10:57 -0000 1.1 --- JAXB.java 16 Jan 2007 14:46:34 -0000 1.2 *************** *** 15,22 **** /** <code>JAXB</code> tests JiveEvent JAXB Generic Model. ! * It opens a JiveEvent file and gets several entries from it. * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.1 2005/03/30 13:10:57 hrivnac * JiveEvent introduced --- 15,25 ---- /** <code>JAXB</code> tests JiveEvent JAXB Generic Model. ! * It opens a Jive Event file and gets several entries from it. * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:46:34 hrivnac + * cosmetical changes due to JiveGeometry + * * Revision 1.1 2005/03/30 13:10:57 hrivnac * JiveEvent introduced Index: GeometricModel.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test/GeometricModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GeometricModel.java 30 Mar 2005 13:10:57 -0000 1.1 --- GeometricModel.java 16 Jan 2007 14:46:34 -0000 1.2 *************** *** 15,22 **** /** <code>GeometricModel</code> tests JiveEvent JAXB Generic Model. ! * It opens a GDML file and ... * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.1 2005/03/30 13:10:57 hrivnac * JiveEvent introduced --- 15,25 ---- /** <code>GeometricModel</code> tests JiveEvent JAXB Generic Model. ! * It opens a Jive Event file and ... * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:46:34 hrivnac + * cosmetical changes due to JiveGeometry + * * Revision 1.1 2005/03/30 13:10:57 hrivnac * JiveEvent introduced |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:45:22
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/JAXB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/src/net/hep/atlas/graphics/JiveGeometry/JAXB Modified Files: JiveGeometry.xjs Log Message: better xsd, AGeneralPath visible Index: JiveGeometry.xjs =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/JAXB/JiveGeometry.xjs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JiveGeometry.xjs 14 Jan 2007 21:41:17 -0000 1.1 --- JiveGeometry.xjs 16 Jan 2007 14:44:35 -0000 1.2 *************** *** 7,10 **** --- 7,13 ---- <!-- $Log$ + Revision 1.2 2007/01/16 14:44:35 hrivnac + better xsd, AGeneralPath visible + Revision 1.1 2007/01/14 21:41:17 hrivnac works, but doesn't do anything usefull *************** *** 18,22 **** version="1.0"> ! <jaxb:bindings schemaLocation="../Schema/geometry.xsd" node="/xs:schema"> <jaxb:schemaBindings> <!-- --- 21,25 ---- version="1.0"> ! <jaxb:bindings schemaLocation="../Schema/AGeometry.xsd" node="/xs:schema"> <jaxb:schemaBindings> <!-- |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:45:20
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/ant Modified Files: ToDo.txt build.xml Log Message: better xsd, AGeneralPath visible Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/ToDo.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ToDo.txt 14 Jan 2007 21:41:16 -0000 1.1 --- ToDo.txt 16 Jan 2007 14:44:34 -0000 1.2 *************** *** 1 **** ! --- 1 ---- ! add Muons, constants Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 14 Jan 2007 21:41:16 -0000 1.1 --- build.xml 16 Jan 2007 14:44:34 -0000 1.2 *************** *** 97,101 **** 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"/> --- 97,101 ---- target="generate0"> <property name="dir" value="${build}"/> ! <property name="schema" value="${src}/net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd"/> <property name="package" value="net.hep.atlas.graphics.JiveGeometry.JAXB"/> <property name="binding" value="${src}/net/hep/atlas/graphics/JiveGeometry/JAXB/JiveGeometry.xjs"/> *************** *** 125,129 **** <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> --- 125,130 ---- <fileset dir="${build}" includes="**/bgm.ser"/> <fileset dir="${build}" includes="**/*.properties"/> ! <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd"/> ! <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml"/> </jar> |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:45:17
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/src/net/hep/atlas/graphics/JiveGeometry/Test Modified Files: GeometricModel.java JAXB.java Log Message: better xsd, AGeneralPath visible Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/JAXB.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JAXB.java 15 Jan 2007 14:41:53 -0000 1.2 --- JAXB.java 16 Jan 2007 14:44:36 -0000 1.3 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/16 14:44:36 hrivnac + * better xsd, AGeneralPath visible + * * Revision 1.2 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture *************** *** 43,52 **** 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 = ((AGeneralPathType)(aGeneralPaths.get(0))).getAPoint(); ! log.info("\tAPoint.x: " + ((APointType)(aPoints.get(0))).getX()); } --- 46,59 ---- log.info("Opening " + args[0]); // Get geometry ! AGeometryType aGeometry = (AGeometryType)u.unmarshal(new FileInputStream(args[0])); // Get APoint ! List aGeneralPaths = aGeometry.getAGeometryConstantOrAGeneralPathOrADisc(); ! for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { ! if (o instanceof AGeneralPathType) { ! AGeneralPathType aGeneralPath = (AGeneralPathType)o; ! List aPoints = aGeneralPath.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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeometricModel.java 15 Jan 2007 14:41:53 -0000 1.2 --- GeometricModel.java 16 Jan 2007 14:44:36 -0000 1.3 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/16 14:44:36 hrivnac + * better xsd, AGeneralPath visible + * * Revision 1.2 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture *************** *** 43,47 **** log.info("Opening " + args[0]); // Get geometry ! GeometryType geometry = (GeometryType)u.unmarshal(new FileInputStream(args[0])); } --- 46,50 ---- log.info("Opening " + args[0]); // Get geometry ! AGeometryType aGeometry = (AGeometryType)u.unmarshal(new FileInputStream(args[0])); } |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:45:16
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: AGeneralPath.java Added Files: AGeometry.java Removed Files: Geometry.java Log Message: better xsd, AGeneralPath visible --- Geometry.java DELETED --- Index: AGeneralPath.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGeneralPath.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGeneralPath.java 15 Jan 2007 14:41:53 -0000 1.1 --- AGeneralPath.java 16 Jan 2007 14:44:35 -0000 1.2 *************** *** 24,28 **** // FreeHEP ! import org.freehep.j3d.PolyLine; // Log4J --- 24,28 ---- // FreeHEP ! import org.freehep.j3d.PolyGone; // Log4J *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.2 2007/01/16 14:44:35 hrivnac + * better xsd, AGeneralPath visible + * * Revision 1.1 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture *************** *** 50,60 **** // 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); --- 53,63 ---- // Get element properties ! int num = aGeneralPath.getNumPoints(); String p = aGeneralPath.getP(); String c = aGeneralPath.getC(); String n = aGeneralPath.getN(); ! String name = c + "_" + n + "_" + k++; ! Appearance appearance = builder().appearance(name, name); setAppearance(appearance); *************** *** 65,75 **** 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"); } --- 68,86 ---- for (Object o : aGeneralPath.getAPoint()) { aPoint = (APointType)o; ! if (p.equals("YX")) { ! points[i++] = new Point3d(aPoint.getX() / 1000.0, ! aPoint.getY() / 1000.0, ! 0.0); ! } ! else if (p.equals("RZ")) { ! points[i++] = new Point3d(aPoint.getY() / 1000.0, ! 0.0, ! aPoint.getX() / 1000.0); ! } ! // TBD: else } ! PolyGone polygone = new PolyGone(points, appearance); ! use(polygone, name, name); } --- NEW FILE: AGeometry.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.AGeometryType; 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>AGeometry</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.AGeometryType} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: AGeometry.java,v $ * Revision 1.1 2007/01/16 14:44:35 hrivnac * better xsd, AGeneralPath visible * * Revision 1.1 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture * * </pre> * </font></p> * @version $Id: AGeometry.java,v 1.1 2007/01/16 14:44:35 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class AGeometry 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 AGeometryType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Get element properties AGeometryType aGeometry = (AGeometryType)element; // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup();; // - AGeneralPath AGeneralPathType aGeneralPath; for (Object o : aGeometry.getAGeometryConstantOrAGeneralPathOrADisc()) { if (o instanceof AGeneralPathType) { aGeneralPath = (AGeneralPathType)o; (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 = "AGeometry"; /** Logging . */ private static Logger log = Logger.getLogger(AGeometry.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:45:15
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/src Modified Files: index.html Log Message: better xsd, AGeneralPath visible Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.html 14 Jan 2007 21:41:16 -0000 1.1 --- index.html 16 Jan 2007 14:44:34 -0000 1.2 *************** *** 20,24 **** <li><a href="UML">UML</a> (<a href="UML/index.gif">top-level</a>)</li> <li><a href="xsd/geometry">XSDDoc</a></li> ! <li><a href="Examples/geometry.xsd">Schema</a></li> <li><a href="build.gif">Ant Build Dependencies</a></li> <li>GraXML <a href="https://sourceforge.net/projects/graxml">SourceForge</a> project containing JiveGeometry.</li> --- 20,24 ---- <li><a href="UML">UML</a> (<a href="UML/index.gif">top-level</a>)</li> <li><a href="xsd/geometry">XSDDoc</a></li> ! <li><a href="Examples/AGeometry.xsd">Schema</a></li> <li><a href="build.gif">Ant Build Dependencies</a></li> <li>GraXML <a href="https://sourceforge.net/projects/graxml">SourceForge</a> project containing JiveGeometry.</li> |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:45:14
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/src/net/hep/atlas/graphics/JiveGeometry/Test/data Modified Files: AGeometryTB.xml Added Files: AGeometry.xml AGeometryFast.xml Log Message: better xsd, AGeneralPath visible Index: AGeometryTB.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AGeometryTB.xml 15 Jan 2007 14:41:53 -0000 1.2 --- AGeometryTB.xml 16 Jan 2007 14:44:37 -0000 1.3 *************** *** 1,5 **** <?xml version="1.0"?> ! <Geometry> ! <AGeometryTB> <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > <APoint x="19.2628" y="-1.46904" /> --- 1,4 ---- <?xml version="1.0"?> ! <AGeometry> <AGeneralPath p="YX" c="PIX" n="Si" numPoints="4" > <APoint x="19.2628" y="-1.46904" /> *************** *** 409,412 **** <APoint x="-79.4436943946" y="445.483639597" /> </AGeneralPath> ! </AGeometryTB> ! </Geometry> --- 408,410 ---- <APoint x="-79.4436943946" y="445.483639597" /> </AGeneralPath> ! </AGeometry> --- NEW FILE: AGeometry.xml --- <?xml version="1.0"?> <AGeometry> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="0.306424" tilt="-19.9962" nz="13" nphi="22" r0="5.10491" phi0="7.78997" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="0.307646" tilt="-19.9962" nz="13" nphi="38" r0="8.88103" phi0="4.60732" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="0.30793" tilt="-19.9962" nz="13" nphi="52" r0="12.2722" phi0="3.3937" zMin="-40.5702" zMax="40.5702" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="48.7" zMax="49.7" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="57.2" zMax="58.2" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="64.2" zMax="65.2" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="0" length="12.609" width="6.144" thickness="0.844888" tilt="11.0351" nz="6" nphi="32" r0="30.134" phi0="3.2" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="1" length="12.609" width="6.144" thickness="0.760799" tilt="11.0283" nz="6" nphi="40" r0="37.2063" phi0="2.6" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="2" length="12.609" width="6.144" thickness="0.841372" tilt="11.2742" nz="6" nphi="48" r0="44.4326" phi0="2.1" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="3" length="12.609" width="6.144" thickness="0.780462" tilt="11.2709" nz="6" nphi="56" r0="51.4694" phi0="1.799" zMin="-74.8272" zMax="74.8272" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="83.0567" zMax="84.1532" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="86.0567" zMax="87.1532" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="91.0768" zMax="92.1732" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="91.6268" zMax="95.1732" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="106.827" zMax="107.923" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="107.377" zMax="110.923" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="127.667" zMax="128.763" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="128.217" zMax="131.763" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="137.647" zMax="138.743" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="138.197" zMax="141.743" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="174.817" zMax="175.913" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="175.367" zMax="178.913" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="209.197" zMax="210.293" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="212.197" zMax="213.293" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="248.177" zMax="249.273" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="5.2475" width="6.83547" thickness="11.0247" nz="1" nphi="40" rMin="40.2836" rMax="45.7959" phi0="4.31982" zMin="251.177" zMax="252.273" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="8" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="1.03842" zMin="273.247" zMax="274.343" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="56.7302" rMax="69.8248" phiIn="-6.17382" phiOut="-10.7369" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="70.1346" rMax="86.6458" phiIn="-10.7202" phiOut="-5.99874" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="113.525" zMax="126.225" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="3" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="128.075" zMax="140.775" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="4" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="142.625" zMax="155.325" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="5" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="157.175" zMax="169.875" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="6" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="173.875" zMax="184.275" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="7" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="186.225" zMax="196.625" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="8" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="198.575" zMax="208.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="9" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="210.925" zMax="221.325" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="10" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="223.275" zMax="233.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="11" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="235.625" zMax="246.025" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="12" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="247.975" zMax="258.375" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="13" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="260.325" zMax="270.725" /> <ADisc p="YX" c="Sol" n="Solenoid" rIn="122.9" rOut="127.4" /> <ARectangle p="RZ" c="Sol" n="Solenoid" xMin="-265" xMax="265" yMin="122.9" yMax="127.4" xR="NO" /> <ABarrelCalorimeter c="ECAL" n="LAr Presampler" sampling="0" region="0" rMin="142.173" rMax="143.858" zMin="0" zMax="325.0" eta0="3.1225e-17" deta="0.025" neta="61" meta="0" phi0="-0.175783" nphi="64" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="0" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="0.003125" deta="0.003125" neta="447" meta="1" phi0="-0.175783" nphi="64" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="1" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="1.4" deta="0.025" neta="3" meta="0" phi0="-0.175783" nphi="256" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="0" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="0.0" deta="0.025" neta="56" meta="0" phi0="-0.175783" nphi="256" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="1" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="1.4" deta="0.075" neta="1" meta="0" phi0="-0.175783" nphi="256" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="3" region="0" rMin="184" rMax="198.47" zMin="0" zMax="325.0" eta0="0.0" deta="0.05" neta="27" meta="0" phi0="-0.175783" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Endcap Presampler" sampling="0" region="0" rMin="29.0" rMax="203.4" zMin="368.075" zMax="371.425" eta0="1.50988" deta="0.025" neta="12" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.38444" deta="0.05" neta="1" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="1" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.43452" deta="0.025" neta="3" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="2" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.50965" deta="0.003125" neta="96" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="3" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.81009" deta="0.00416667" neta="48" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="4" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="2.01027" deta="0.00625" neta="64" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="5" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="2.41048" deta="0.025" neta="4" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="380.073" zMax="424.326" eta0="1.38381" deta="0.05" neta="7" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="2" region="1" rMin="29.0" rMax="203.4" zMin="380.073" zMax="415.624" eta0="1.43388" deta="0.025" neta="43" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="3" region="0" rMin="29.0" rMax="203.4" zMin="415.624" zMax="424.326" eta0="1.50867" deta="0.05" neta="20" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="420.125" eta0="2.51004" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="420.125" zMax="424.326" eta0="2.5094" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="0" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="1.50824" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="1" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="2.50892" deta="0.2" neta="4" meta="0" phi0="0" nphi="32" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="0" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="1.50755" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="1" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="2.50817" deta="0.2" neta="3" meta="0" phi0="0" nphi="32" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="0" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="1.6" deta="0.1" neta="9" meta="1" phi0="0" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="1" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="2.5" deta="0.2" neta="3" meta="0" phi0="-7.95139e-16" nphi="32" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> <ADisc p="YX" c="HCAL" n="FCAL HAD 1" rIn="7.90558" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 1" xMin="512.3" xMax="557.3" yMin="7.90558" yMax="47.5" /> <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="2" region="0" rMin="344" rMax="386" zMin="-36.5199" zMax="282" eta0="-0.1" deta="0.2" neta="4" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="0" region="0" rMin="229" rMax="260" zMin="355.95" zMax="615" eta0="1.1" deta="0.1" neta="5" meta="11" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> </AGeometry> --- NEW FILE: AGeometryFast.xml --- <?xml version="1.0"?> <!DOCTYPE AGeometry [ <!ENTITY layers "2"> <!ENTITY etaRange "5.0"> <!ENTITY barrelForwardTransitionEta "3.2"> <!ENTITY numEtaBinsBarrel "64"> <!ENTITY numPhiBinsBarrel "64"> <!ENTITY numEtaBinsForward "9"> <!ENTITY numPhiBinsForward "32"> <!ENTITY TILERadOut "156.35"> <!ENTITY TILERadIn "139.35"> <!ENTITY LArRadOut "136.0"> <!ENTITY LArRadIn "119.0"> <!ENTITY TILEZOut "460."> <!ENTITY TILEZIn "410."> <!ENTITY LArZOut "400.0"> <!ENTITY LArZIn "350.0"> <!ENTITY TRTRadOut "109.0"> <!ENTITY TRTRadIn " 2.0"> <!ENTITY TRTZMax "338.0"> ]> <AGeometry> <AGeometryConstant n="TILERadOut" value="&TILERadOut;" /> <AGeometryConstant n="TILERadIn" value="&TILERadIn;" /> <AGeometryConstant n="LArRadOut" value="&LArRadOut;" /> <AGeometryConstant n="LArRadIn" value="&LArRadIn;" /> <AGeometryConstant n="TILEZOut" value="&TILEZOut;" /> <AGeometryConstant n="TILEZIn" value="&TILEZIn;" /> <AGeometryConstant n="LArZOut" value="&LArZOut;" /> <AGeometryConstant n="LArZIn" value="&LArZIn;" /> <AGeometryConstant n="layers" value="&layers;" /> <AGeometryConstant n="etaRange" value="&etaRange;" /> <AGeometryConstant n="barrelForwardTransitionEta" value="&barrelForwardTransitionEta;" /> <AGeometryConstant n="numEtaBinsBarrel" value="&numEtaBinsBarrel;" /> <AGeometryConstant n="numPhiBinsBarrel" value="&numPhiBinsBarrel;" /> <AGeometryConstant n="numEtaBinsForward" value="&numEtaBinsForward;" /> <AGeometryConstant n="numPhiBinsForward" value="&numPhiBinsForward;" /> <ADisc p="YX" c="HCAL" n="TILE" rIn="&TILERadIn;" rOut="&TILERadOut;" nIn="64" nOut="64" /> <ADisc p="YX" c="ECAL" n="LAr" rIn="&LArRadIn;" rOut="&LArRadOut;" nIn="64" nOut="256" /> <ADisc p="YX" c="TRT" n="TRT" rIn="&TRTRadIn;" rOut="&TRTRadOut;" nIn="256" nOut="256" /> <ARectangle p="RZ" c="TRT" n="TRT" xMin="-&TRTZMax;" xMax=" &TRTZMax;" yMin="-&TRTRadOut;" yMax="&TRTRadOut;" yR="NO" /> <ARectangle p="FZ" c="TRT" n="SiliconStrip" xMin="-&TRTZMax;" xMax="&TRTZMax;" yMin="0." yMax="360.0" /> <ARectangle p="FZ" c="ECAL" n="LAr_Endcap" xMin="&LArZIn;" xMax="&LArZOut;" yMin="0." yMax="360.0" xR="YES" /> <ARectangle p="FZ" c="HCAL" n="TILE_Endcap" xMin="&TILEZIn;" xMax="&TILEZOut;" yMin="0." yMax="360.0" xR="YES" /> <ARectangle p="XZ" c="TRT" n="TRT" xMin="-&TRTZMax;" xMax=" &TRTZMax;" yMin=" -&TRTRadOut;" yMax=" &TRTRadOut;" /> <ARectangle p="YZ" c="TRT" n="TRT" xMin="-&TRTZMax;" xMax=" &TRTZMax;" yMin=" -&TRTRadOut;" yMax=" &TRTRadOut;" /> <AGeneralPath p="RZ" c="ECAL" n="LAr" numPoints="6" > <APoint x="0.0" y="&LArRadIn;" /> <APoint x="&LArZIn;" y="&LArRadIn;" /> <APoint x="&LArZIn;" y=" 4.717" /> <APoint x="&LArZOut;" y=" 5.391" /> <APoint x="&LArZOut;" y="&LArRadOut;" /> <APoint x="0." y="&LArRadOut;" /> </AGeneralPath> <AGeneralPath p="RZ" c="HCAL" n="TILE" numPoints="6" > <APoint x="0.0" y="&TILERadIn;" /> <APoint x="&TILEZIn;" y="&TILERadIn;" /> <APoint x="&TILEZIn;" y=" 5.525" /> <APoint x="&TILEZOut;" y=" 6.199" /> <APoint x="&TILEZOut;" y="&TILERadOut;" /> <APoint x="0." y="&TILERadOut;" /> </AGeneralPath> </AGeometry> |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:45:14
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java Log Message: better xsd, AGeneralPath visible Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JiveGeometryBuilder.java 15 Jan 2007 14:41:53 -0000 1.2 --- JiveGeometryBuilder.java 16 Jan 2007 14:44:34 -0000 1.3 *************** *** 21,24 **** --- 21,27 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/16 14:44:34 hrivnac + * better xsd, AGeneralPath visible + * * Revision 1.2 2007/01/15 14:41:53 hrivnac * makes hierarchy, not yet picture *************** *** 39,43 **** * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml"}; return demos; } --- 42,47 ---- * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml", ! "net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml"}; return demos; } *************** *** 67,71 **** } ! private static String _schema = "geometry.xsd"; private static String _schemaEmbedded = "net/hep/atlas/graphics/JiveGeometry/Schema/" + _schema; --- 71,75 ---- } ! private static String _schema = "AGeometry.xsd"; private static String _schemaEmbedded = "net/hep/atlas/graphics/JiveGeometry/Schema/" + _schema; |
|
From: Julius H. <hr...@us...> - 2007-01-16 14:44:42
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18722/src/net/hep/atlas/graphics/JiveGeometry/Schema Added Files: AGeometry.dtd AGeometry.xsd Removed Files: AGeometryTB.dtd geometry.xsd Log Message: better xsd, AGeneralPath visible --- AGeometryTB.dtd DELETED --- --- NEW FILE: AGeometry.xsd --- <?xml version="1.0"?> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:element name="AGeometry"> <xs:complexType> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element ref="AGeometryConstant"/> <xs:element ref="AGeneralPath"/> <xs:element ref="ADisc"/> <xs:element ref="ARectangle"/> <xs:element ref="ABarrelCalorimeter"/> <xs:element ref="AEndcapCalorimeter"/> <xs:element ref="AGapCalorimeter"/> <xs:element ref="ABarrelSiliconDetector"/> <xs:element ref="AEndcapSiliconDetector"/> <xs:element ref="ABarrelTRTDetector"/> <xs:element ref="AEndcapTRTDetector"/> </xs:choice> </xs:complexType> </xs:element> <xs:element name="AGeometryConstant"> <xs:complexType> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="value" type="xs:double" use="required"/> </xs:complexType> </xs:element> <xs:element name="APoint"> <xs:complexType> <xs:attribute name="x" type="xs:double" use="required"/> <xs:attribute name="y" type="xs:double" use="required"/> </xs:complexType> </xs:element> <xs:element name="AGeneralPath"> <xs:complexType> <xs:sequence> <xs:element ref="APoint" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="p" type="xs:string" use="required"/> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="numPoints" type="xs:int" use="required"/> <xs:attribute name="xR" default="YES"> <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="YES"> <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="ADisc"> <xs:complexType> <xs:attribute name="p" type="xs:string" use="required"/> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="rIn" type="xs:double" use="required"/> <xs:attribute name="rOut" type="xs:double" use="required"/> <xs:attribute name="nIn" type="xs:int" default="256"/> <xs:attribute name="nOut" type="xs:int" default="256"/> </xs:complexType> </xs:element> <xs:element name="ARectangle"> <xs:complexType> <xs:attribute name="p" type="xs:string" use="required"/> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="xMin" type="xs:double" use="required"/> <xs:attribute name="xMax" type="xs:double" use="required"/> <xs:attribute name="yMin" type="xs:double" use="required"/> <xs:attribute name="yMax" type="xs:double" use="required"/> <xs:attribute name="xR" default="YES"> <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="YES"> <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="ABarrelCalorimeter"> <xs:complexType> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="sampling" type="xs:string" use="required"/> <xs:attribute name="region" type="xs:string" use="required"/> <xs:attribute name="rMin" type="xs:string" use="required"/> <xs:attribute name="rMax" type="xs:string" use="required"/> <xs:attribute name="zMin" type="xs:string" use="required"/> <xs:attribute name="zMax" type="xs:string" use="required"/> <xs:attribute name="eta0" type="xs:string" use="required"/> <xs:attribute name="deta" type="xs:string" use="required"/> <xs:attribute name="neta" type="xs:string" use="required"/> <xs:attribute name="meta" type="xs:string" use="required"/> <xs:attribute name="phi0" type="xs:string" use="required"/> <xs:attribute name="nphi" type="xs:string" use="required"/> </xs:complexType> </xs:element> <xs:element name="AEndcapCalorimeter"> <xs:complexType> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="sampling" type="xs:int" use="required"/> <xs:attribute name="region" type="xs:int" use="required"/> <xs:attribute name="rMin" type="xs:double" use="required"/> <xs:attribute name="rMax" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> <xs:attribute name="eta0" type="xs:double" use="required"/> <xs:attribute name="deta" type="xs:double" use="required"/> <xs:attribute name="neta" type="xs:double" use="required"/> <xs:attribute name="meta" type="xs:double" use="required"/> <xs:attribute name="phi0" type="xs:double" use="required"/> <xs:attribute name="nphi" type="xs:int" use="required"/> </xs:complexType> </xs:element> <xs:element name="AGapCalorimeter"> <xs:complexType> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="sampling" type="xs:int" use="required"/> <xs:attribute name="region" type="xs:int" use="required"/> <xs:attribute name="rMin" type="xs:double" use="required"/> <xs:attribute name="rMax" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> <xs:attribute name="eta" type="xs:double" use="required"/> <xs:attribute name="phi0" type="xs:double" use="required"/> <xs:attribute name="nphi" type="xs:int" use="required"/> </xs:complexType> </xs:element> <xs:element name="ABarrelSiliconDetector"> <xs:complexType> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="layer" type="xs:int" use="required"/> <xs:attribute name="length" type="xs:double" use="required"/> <xs:attribute name="width" type="xs:double" use="required"/> <xs:attribute name="thickness" type="xs:double" use="required"/> <xs:attribute name="tilt" type="xs:double" use="required"/> <xs:attribute name="nz" type="xs:int" use="required"/> <xs:attribute name="nphi" type="xs:int" use="required"/> <xs:attribute name="r0" type="xs:double" use="required"/> <xs:attribute name="phi0" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> </xs:complexType> </xs:element> <xs:element name="AEndcapSiliconDetector"> <xs:complexType> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="layer" type="xs:int" use="required"/> <xs:attribute name="length" type="xs:double" use="required"/> <xs:attribute name="width" type="xs:double" use="required"/> <xs:attribute name="thickness" type="xs:double" use="required"/> <xs:attribute name="nz" type="xs:int" use="required"/> <xs:attribute name="nphi" type="xs:int" use="required"/> <xs:attribute name="rMin" type="xs:double" use="required"/> <xs:attribute name="rMax" type="xs:double" use="required"/> <xs:attribute name="phi0" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> </xs:complexType> </xs:element> <xs:element name="ABarrelTRTDetector"> <xs:complexType> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="layer" type="xs:int" use="required"/> <xs:attribute name="nphi" type="xs:int" use="required"/> <xs:attribute name="rMin" type="xs:double" use="required"/> <xs:attribute name="rMax" type="xs:double" use="required"/> <xs:attribute name="phiIn" type="xs:double" use="required"/> <xs:attribute name="phiOut" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> </xs:complexType> </xs:element> <xs:element name="AEndcapTRTDetector"> <xs:complexType> <xs:attribute name="c" type="xs:string" use="required"/> <xs:attribute name="n" type="xs:string" use="required"/> <xs:attribute name="layer" type="xs:int" use="required"/> <xs:attribute name="nphi" type="xs:int" use="required"/> <xs:attribute name="rMin" type="xs:double" use="required"/> <xs:attribute name="rMax" type="xs:double" use="required"/> <xs:attribute name="phiIn" type="xs:double" use="required"/> <xs:attribute name="phiOut" type="xs:double" use="required"/> <xs:attribute name="zMin" type="xs:double" use="required"/> <xs:attribute name="zMax" type="xs:double" use="required"/> </xs:complexType> </xs:element> </xs:schema> --- NEW FILE: AGeometry.dtd --- <?xml version="1.0"?> <!DOCTYPE AGeometry [ <!ELEMENT AGeometry (AGeometryConstant | AGeneralPath | ADisc | ARectangle | ABarrelCalorimeter | AEndcapCalorimeter | AGapCalorimeter | ABarrelSiliconDetector | AEndcapSiliconDetector | ABarrelTRTDetector | AEndcapTRTDetector)* > <!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) "YES" yR (YES|NO) "YES"> <!ELEMENT ADisc EMPTY > <!ATTLIST ADisc p CDATA #REQUIRED c CDATA #REQUIRED n CDATA #REQUIRED rIn CDATA #REQUIRED rOut CDATA #REQUIRED nIn CDATA "256" nOut CDATA "256"> <!ELEMENT ARectangle EMPTY > <!ATTLIST ARectangle p CDATA #REQUIRED c CDATA #REQUIRED n CDATA #REQUIRED xMin CDATA #REQUIRED xMax CDATA #REQUIRED yMin CDATA #REQUIRED yMax CDATA #REQUIRED xR (YES|NO) "YES" yR (YES|NO) "YES"> <!ELEMENT ABarrelCalorimeter EMPTY > <!ATTLIST ABarrelCalorimeter c CDATA #REQUIRED n CDATA #REQUIRED sampling CDATA #REQUIRED region CDATA #REQUIRED rMin CDATA #REQUIRED rMax CDATA #REQUIRED zMin CDATA #REQUIRED zMax CDATA #REQUIRED eta0 CDATA #REQUIRED deta CDATA #REQUIRED neta CDATA #REQUIRED meta CDATA #REQUIRED phi0 CDATA #REQUIRED nphi CDATA #REQUIRED> <!ELEMENT AEndcapCalorimeter EMPTY > <!ATTLIST AEndcapCalorimeter c CDATA #REQUIRED n CDATA #REQUIRED sampling CDATA #REQUIRED region CDATA #REQUIRED rMin CDATA #REQUIRED rMax CDATA #REQUIRED zMin CDATA #REQUIRED zMax CDATA #REQUIRED eta0 CDATA #REQUIRED deta CDATA #REQUIRED neta CDATA #REQUIRED meta CDATA #REQUIRED phi0 CDATA #REQUIRED nphi CDATA #REQUIRED> <!ELEMENT AGapCalorimeter EMPTY > <!ATTLIST AGapCalorimeter c CDATA #REQUIRED n CDATA #REQUIRED sampling CDATA #REQUIRED region CDATA #REQUIRED rMin CDATA #REQUIRED rMax CDATA #REQUIRED zMin CDATA #REQUIRED zMax CDATA #REQUIRED eta CDATA #REQUIRED phi0 CDATA #REQUIRED nphi CDATA #REQUIRED> <!ELEMENT ABarrelSiliconDetector EMPTY > <!ATTLIST ABarrelSiliconDetector c CDATA #REQUIRED n CDATA #REQUIRED layer CDATA #REQUIRED length CDATA #REQUIRED width CDATA #REQUIRED thickness CDATA #REQUIRED tilt CDATA #REQUIRED nz CDATA #REQUIRED nphi CDATA #REQUIRED r0 CDATA #REQUIRED phi0 CDATA #REQUIRED zMin CDATA #REQUIRED zMax CDATA #REQUIRED> <!ELEMENT AEndcapSiliconDetector EMPTY > <!ATTLIST AEndcapSiliconDetector c CDATA #REQUIRED n CDATA #REQUIRED layer CDATA #REQUIRED length CDATA #REQUIRED width CDATA #REQUIRED thickness CDATA #REQUIRED nz CDATA #REQUIRED nphi CDATA #REQUIRED rMin CDATA #REQUIRED rMax CDATA #REQUIRED phi0 CDATA #REQUIRED zMin CDATA #REQUIRED zMax CDATA #REQUIRED> <!ELEMENT ABarrelTRTDetector EMPTY > <!ATTLIST ABarrelTRTDetector c CDATA #REQUIRED n CDATA #REQUIRED layer CDATA #REQUIRED nphi CDATA #REQUIRED rMin CDATA #REQUIRED rMax CDATA #REQUIRED phiIn CDATA #REQUIRED phiOut CDATA #REQUIRED zMin CDATA #REQUIRED zMax CDATA #REQUIRED> <!ELEMENT AEndcapTRTDetector EMPTY > <!ATTLIST AEndcapTRTDetector c CDATA #REQUIRED n CDATA #REQUIRED layer CDATA #REQUIRED nphi CDATA #REQUIRED rMin CDATA #REQUIRED rMax CDATA #REQUIRED phiIn CDATA #REQUIRED phiOut CDATA #REQUIRED zMin CDATA #REQUIRED zMax CDATA #REQUIRED> ]> --- geometry.xsd DELETED --- |
|
From: Julius H. <hr...@us...> - 2007-01-15 22:03:08
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv696/src/net/hep/graphics/GraXML/FrontEnd Modified Files: GraXML.java Log Message: embedded demos included Index: GraXML.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/GraXML.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraXML.java 31 May 2006 14:26:13 -0000 1.2 --- GraXML.java 14 Jan 2007 17:04:57 -0000 1.3 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.3 2007/01/14 17:04:57 hrivnac + * embedded demos included + * * Revision 1.2 2006/05/31 14:26:13 hrivnac * optimisation = 8,9 creates pure wireframe scenegraph *************** *** 87,91 **** public GraXML(String script) { log.info("Starting GraXML " + GlobalOptions.report() + " ..."); ! init(); (new RootWindow(MasterBuilder.j3d())).open(script); return; --- 90,94 ---- public GraXML(String script) { log.info("Starting GraXML " + GlobalOptions.report() + " ..."); ! init(); (new RootWindow(MasterBuilder.j3d())).open(script); return; *************** *** 105,119 **** private static Logger log = Logger.getLogger(GraXML.class); - public void T() { - ClassLoader cl = getClass().getClassLoader().getSystemClassLoader(); - if (cl instanceof URLClassLoader) { - URLClassLoader urlcl = (URLClassLoader)cl; - URL[] urls = urlcl.getURLs(); - for (URL url : urls) { - log.info(url); - } - } - } - } --- 108,111 ---- |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:57:22
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel Added Files: JiveGeometryBuilder.java JiveRep.java Log Message: works, but doesn't do anything usefull --- NEW FILE: JiveRep.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel; // GraXML import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // FreeHEP import org.freehep.j3d.OutlinedShape3DFactory; // Java3D import javax.media.j3d.Node; import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.media.j3d.Link; import javax.media.j3d.Shape3D; import javax.media.j3d.Appearance; // JAXB import javax.xml.bind.Element; // Log4J import org.apache.log4j.Logger; /** Common part of GraXML representations of Jive Geometry * elements. * <p><font color="#880088"> * <pre> * $Log: JiveRep.java,v $ * Revision 1.1 2007/01/14 21:41:17 hrivnac * works, but doesn't do anything usefull * * </pre> * </font></p> * @version $Id: JiveRep.java,v 1.1 2007/01/14 21:41:17 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public abstract class JiveRep { /** Use Java3D {@link Node} as a GraXML building block: * <ul> * <li>Put it into {@link Interacter}.</li> * <li>Register it in the {@link ConnectionsDB} database.</li> * </ul> * @param node The Java3D {@link Node} to be used. * @param name The name of the element. * @param info The detailed information about the element. */ protected void use(Node node, String name, String info) { // Create interacting BranchGroup BranchGroup interacter = Interacter.createInteracter(node, MasterBuilder.window(), name, OutlinedShape3DFactory.outlineColor()); // Register proper BranchGroup into Connections database use(interacter, name, info); } /** Use Java3D {@link BranchGroup} as a GraXML building block: * <ul> * <li>Register it in the {@link ConnectionsDB} database.</li> * </ul> * @param bg The Java3D {@link BranchGroup} to be used. * @param name The name of the element. * @param info The detailed information about the element. */ protected void use(BranchGroup bg, String name, String info) { // Register proper BranchGroup into Connections database _builder.conDB().addConnection(new DetachableConnection(name, _parent, _tg, bg, appearance(), info)); } /** Extract an array of <code>int</code>s from a blank-delimited * <code>String</code>. * @param value The blank-delimited <code>int</code>s in a <code>String</code>. * @return The array of resulting <code>int</code>s. */ protected int[] ints(String value) { String[] intsString = value.replaceAll("\n", " ").trim().split(" +"); int[] ints = new int[intsString.length]; int i = 0; for (String f : intsString) { ints[i++] = new Integer(f.trim()); } return ints; } /** Extract an array of <code>float</code>s from a blank-delimited * <code>String</code>. * @param value The blank-delimited <code>float</code>s in a <code>String</code>. * @return The array of resulting <code>float</code>s. */ protected float[] floats(String value) { String[] floatsString = value.replaceAll("\n", " ").trim().split(" +"); float[] floats = new float[floatsString.length]; int i = 0; for (String f : floatsString) { floats[i++] = new Float(f.trim()); } return floats; } /** Set general references. * @param builder The managing {@link JiveGeometryBuilder}. * @param tg The {@link Group} to put this representation in. * @param parent The parent element (connection). */ protected void set(JiveGeometryBuilder builder, Group tg, String parent) { _builder = builder; _tg = tg; _parent = parent; } /** Give The managing {@link JiveGeometryBuilder}. * @return The managing {@link JiveGeometryBuilder}. */ protected JiveGeometryBuilder builder() { return _builder; } /** Set new {@link Group} to put this representation in. * @param tg The new {@link Group} to put this representation in. */ protected void setTg(Group tg) { _tg = tg; } /** Give the {@link Group} to put this representation in. * @return The {@link Group} to put this representation in. */ protected Group tg() { return _tg; } /** Set {@link Appearance} to use for this representation . * @param appearance The {@link Appearance} to use for this representation in. */ protected void setAppearance(Appearance appearance) { _appearance = appearance; } /** Give the {@link Appearance} to use for this representation. * @return The {@link Appearance} to use for this representation. */ protected Appearance appearance() { return _appearance; } private JiveGeometryBuilder _builder; private Group _tg; private Appearance _appearance; private String _parent; /** Logging . */ private static Logger log = Logger.getLogger(JiveRep.class); } --- NEW FILE: JiveGeometryBuilder.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel; // GraXML import net.hep.graphics.GraXML.MasterBuilder; // Java3D import javax.media.j3d.Group; import javax.media.j3d.Transform3D; import javax.vecmath.Vector3d; import javax.vecmath.Matrix3d; // JAXB import javax.xml.bind.Element; // Log4J import org.apache.log4j.Logger; /** <code>JiveGeometryBuilder</code> performs JiveGeometry specific part * of the {@link MasterBuilder} building proccess. * <p><font color="#880088"> * <pre> * $Log: JiveGeometryBuilder.java,v $ * Revision 1.1 2007/01/14 21:41:17 hrivnac * works, but doesn't do anything usefull * * </pre> * </font></p> * @version $Id: JiveGeometryBuilder.java,v 1.1 2007/01/14 21:41:17 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class JiveGeometryBuilder extends MasterBuilder { /** Perform configuration. */ public void configure() {} /** Get list of (embedded) demostration files. * @return The list of (embedded) demostration files. */ public String[] demos() { String[] demos = {"net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml"}; return demos; } /** Get builder version. * @return The version and build time of JiveGeometry. */ public final String version() { return Info.version(); } /** Get GDML JAXB Generic Model package name. * @return The package name of the JAXB Generic Model of JiveGeometry. */ protected String jaxb() { return _jaxb; } /** Get JiveEvent Schema file. * @return The JiveGeometry Schema file. */ protected String schema() { return _schema; } /** Get Embedded JiveGeometry Schema file. * @return The Embedded JiveGeometry Schema file. */ protected String schemaEmbedded() { return _schemaEmbedded; } private static String _schema = "geometry.xsd"; private static String _schemaEmbedded = "net/hep/atlas/graphics/JiveGeometry/Schema/" + _schema; private static String _jaxb = "net.hep.atlas.graphics.JiveGeometry.JAXB"; /** Logging . */ private static Logger log = Logger.getLogger(JiveGeometryBuilder.class); } |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:56:59
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13564/data Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:54:46
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12973/Reps Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:54:25
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11101/src Log Message: Directory /cvsroot/graxml/DetDescr/JiveGeometry/src added to the repository |
|
From: Julius H. <hr...@us...> - 2007-01-15 21:54:06
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14248/src Added Files: index.html log4j.properties Log Message: works, but doesn't do anything usefull --- NEW FILE: index.html --- <html> <head> <title>Jive Geometry Generic and Geometric Model (GraXML library)</title> <meta http-equiv="Content-Language" content="en"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Style-Type" content="text/css"> <style type="text/css"> a.big {font-size:1.4em;} </style> </head> <body> <h1><font color="#ff0000">Jive Geometry</font> Generic and Geometric Model (GraXML library)</h1> <h3>Toolkit for building Geometry Service based on Jive Geometry</h3> Version <a class="big">@VERSION@</a> <small>(build @BUILD@)</small> <h2>Documentations</h2> <ul> <li><a href="JavaDoc">JavaDoc</a></li> <li><a href="Src">Source</a></li> <li><a href="UML">UML</a> (<a href="UML/index.gif">top-level</a>)</li> <li><a href="xsd/geometry">XSDDoc</a></li> <li><a href="Examples/geometry.xsd">Schema</a></li> <li><a href="build.gif">Ant Build Dependencies</a></li> <li>GraXML <a href="https://sourceforge.net/projects/graxml">SourceForge</a> project containing JiveGeometry.</li> </ul> <h2>Release History</h2> <ul> <li><u>0.0.0:</u> <ul> <li>New features: <ul> <li>Initial (uncomplete) release.</li> </ul> </li> <li>Bug fixes: <ul> <li>...</li> </ul> </li> </ul> </li> <li><u>*.*.*:</u> <ul> <li>Requests: <ul> <li>Migrate to JAXB 2.0.</li> </ul> </li> <li>Bugs: <ul> <li>...</li> </ul> </li> </ul> </li> </ul> <h2>Related Develoment</h2> <ul> <li><a href="http://atlantis.web.cern.ch/atlantis/">Atlantis</a> manages Jive Geometry DTD and uses Jive Geometry XML files</li> <li><a href="http://www.hep.ucl.ac.uk/atlas/JiveXML/">JiveXML</a> writes Jive XML files from Athena Events</li> </ul> <h2>Related Presentations</h2> <ul> <li>...</li> </ul> <hr> <img width="0" height="0" src="http://home.cern.ch/hrivnac/cgi-bin/record.pl?page=JiveGeometry"> <address><a href="http://home.cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> </body> </html> --- NEW FILE: log4j.properties --- log4j.rootCategory=DEBUG, stdout, file #log4j.rootCategory=INFO, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.Threshold=INFO log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5r %-5p (%-30c{2}:%4L) : %m%n 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 log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%5r %-5p %l : %m%n #log4j.appender.lf5=org.apache.log4j.lf5.LF5Appender |
