graxml-commit Mailing List for GraXML (Page 7)
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...> - 2008-01-23 14:26:59
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26984 Modified Files: GraXML.jnlp Added Files: GraXMLComponent.jnlp Log Message: WebStart components for reuse by other packages added Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GraXML.jnlp 19 Oct 2007 14:09:12 -0000 1.11 --- GraXML.jnlp 23 Jan 2008 14:26:56 -0000 1.12 *************** *** 37,40 **** <extension href="http://cern.ch/hrivnac/Activities/Packages/WebStart/JAXB/jaxb.jnlp"/> </resources> ! <application-desc main-class="net.hep.graphics.GraXML.FrontEnd.GraXML"/> </jnlp> --- 37,40 ---- <extension href="http://cern.ch/hrivnac/Activities/Packages/WebStart/JAXB/jaxb.jnlp"/> </resources> ! <application-desc main-class="net.hep.graphics.GraXML.FrontEnd.GraXML"/> </jnlp> --- NEW FILE: GraXMLComponent.jnlp --- <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" codebase="http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML" href="GraXMLComponent.jnlp" version="@VERSION@ [@BUILD@]"> <information> <title>GraXML - @VERSION@ [@BUILD@]</title> <vendor>J.Hrivnac</vendor> <homepage href="http://cern.ch/hrivnac/Activities/Packages/GraXML"/> <description kind="tooltip">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="one-line">Framework for manipulation and visualisation of geometrical objects in space.</description> <description kind="short">Framework for manipulation and visualisation of geometrical objects in space.</description> <icon kind="default" href="http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.gif"/> <offline-allowed/> </information> <security> <all-permissions/> </security> <resources> <j2se max-heap-size="536870912" version="1.5+"/> <jar href="jars/AGDD.jar"/> <jar href="jars/bool.jar"/> <jar href="jars/bsh-2.0b1.jar"/> <jar href="jars/colt.jar"/> <jar href="jars/cx3djava100a.jar"/> <jar href="jars/freehep-hep3d.jar"/> <jar href="jars/freehep-j3d.jar"/> <jar href="jars/GDML.jar"/> <jar href="jars/GraXMLDisplay.exe.jar"/> <jar href="jars/GraXML.jar" main="true"/> <jar href="jars/JiveEvent.jar"/> <jar href="jars/JiveGeometry.jar"/> <jar href="jars/jlfgr.jar"/> <jar href="jars/log4j-1.2.8.jar"/> <jar href="jars/xercesImpl.jar"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.5.1.jnlp"/> </resources> <resources> <j2se version="1.5"/> <extension href="http://cern.ch/hrivnac/Activities/Packages/WebStart/JAXB/jaxb.jnlp"/> </resources> <component-desc/> </jnlp> |
|
From: Julius H. <hr...@us...> - 2008-01-14 16:44:35
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv461/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: Jet0.java Particle.java Log Message: Atlantis colors fixed Index: Particle.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Particle.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Particle.java 10 Jan 2008 23:05:39 -0000 1.7 --- Particle.java 14 Jan 2008 16:44:32 -0000 1.8 *************** *** 59,62 **** --- 59,65 ---- * <pre> * $Log$ + * Revision 1.8 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.7 2008/01/10 23:05:39 hrivnac * Atlantis bridge improved *************** *** 131,135 **** z = pts[i] / 2 * (exp(etas[i]) - exp(-etas[i])); // ColorList is set => get Appearance from Color ! if (color(i) == null) { color = new Color3f(); appearance = builder().appearance(name, name); --- 134,139 ---- z = pts[i] / 2 * (exp(etas[i]) - exp(-etas[i])); // ColorList is set => get Appearance from Color ! color = color(i); ! if (color == null) { color = new Color3f(); appearance = builder().appearance(name, name); *************** *** 139,143 **** // ColorList is not set => get Color from Appearance else { - color = color(i); appearance = new Appearance(); appearance.setMaterial(new Material(color, color, color, color, 1f)); --- 143,146 ---- *************** *** 191,200 **** Appearance appearance; Material material; ! Color3f color; double x = etxs[0] * _ptFactor; double y = etys[0] * _ptFactor; double z = 0; // ColorList is set => get Appearance from Color ! if (color(0) == null) { color = new Color3f(); appearance = builder().appearance(name, name); --- 194,203 ---- Appearance appearance; Material material; ! Color3f color = color(0); double x = etxs[0] * _ptFactor; double y = etys[0] * _ptFactor; double z = 0; // ColorList is set => get Appearance from Color ! if (color == null) { color = new Color3f(); appearance = builder().appearance(name, name); *************** *** 204,208 **** // ColorList is not set => get Color from Appearance else { - color = color(0); appearance = new Appearance(); appearance.setMaterial(new Material(color, color, color, color, 1f)); --- 207,210 ---- *************** *** 236,240 **** * @return The {@link Color3f} o be used for <em>i</em>s line segment, * <em>null</em> is colormap is not set. */ ! protected abstract Color3f color(int i); /** Give pattern of line segments, --- 238,242 ---- * @return The {@link Color3f} o be used for <em>i</em>s line segment, * <em>null</em> is colormap is not set. */ ! abstract protected Color3f color(int i); /** Give pattern of line segments, Index: Jet0.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Jet0.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Jet0.java 10 Jan 2008 23:05:39 -0000 1.5 --- Jet0.java 14 Jan 2008 16:44:32 -0000 1.6 *************** *** 13,16 **** --- 13,17 ---- // GraXML import net.hep.graphics.GraXML.BuildOptions; + import net.hep.graphics.GraXML.GlobalOptions; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Java3DExtensions.Interactivity.Interacter; *************** *** 27,38 **** --- 28,44 ---- import javax.media.j3d.Appearance; import javax.media.j3d.TransparencyAttributes; + import javax.media.j3d.Material; import javax.vecmath.Matrix3d; import javax.vecmath.Vector3d; import javax.vecmath.Vector3f; import javax.vecmath.Point3f; + import javax.vecmath.Color3f; // FreeHEP import org.freehep.j3d.ConeSegment; + // AWT + import java.awt.Color; + // Java import static java.lang.Math.sin; *************** *** 49,52 **** --- 55,61 ---- * <pre> * $Log$ + * Revision 1.6 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.5 2008/01/10 23:05:39 hrivnac * Atlantis bridge improved *************** *** 151,156 **** String name = type + "[" + i + "]"; String info = "eta = " + eta + ", phi = " + phi + ", pt = " + pt; - Appearance appearance = builder().appearance(name, type); - appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); float rho = _rho / (float) builder().norm(); --- 160,163 ---- *************** *** 165,172 **** // Draw and use Jet0 according to options - setAppearance(appearance); if (pt > _ptCut) { Shape3D shape = drawCone(name, x, y, z, r, phi, delX, delY, delZ, delR, pt) ; use(shape, name, info); } --- 172,200 ---- // Draw and use Jet0 according to options if (pt > _ptCut) { + boolean outlinedBckp = Interacter.outlined(); + Interacter.setOutlined(false); + Appearance appearance; + Material material; Shape3D shape = drawCone(name, x, y, z, r, phi, delX, delY, delZ, delR, pt) ; + Color3f color = color(); + // ColorList is set => get Appearance from Color + if (color == null) { + color = new Color3f(); + appearance = builder().appearance(name, name); + material = appearance.getMaterial(); + material.getSpecularColor(color); + } + // ColorList is not set => get Color from Appearance + else { + appearance = new Appearance(); + appearance.setMaterial(new Material(color, color, color, color, 1f)); + } + appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); + //appearance.setLineAttributes(new LineAttributes(lineWidth(), LineAttributes.PATTERN_SOLID, GlobalOptions.quality() > 5)); + shape.setAppearance(appearance); + setAppearance(appearance); use(shape, name, info); + Interacter.setOutlined(outlinedBckp); } *************** *** 224,227 **** --- 252,260 ---- } + /** Give {@link Color3f} to be used for <em>i</em>s line segments. + * @return The {@link Color3f} o be used for <em>i</em>s line segment, + * <em>null</em> is colormap is not set. */ + abstract protected Color3f color(); + /** Set factor for magnifying <code>pt</code> * to get {@link ConeSegment} length. *************** *** 248,253 **** private static float _cell = 0.01f; - private static BranchGroup _g; - private static final Matrix3d UMATRIX = new Matrix3d(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, --- 281,284 ---- |
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv461/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Modified Files: BJet.java Event.java Jet.java S3D.java STC.java TauJet.java Track.java Log Message: Atlantis colors fixed Index: Jet.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Jet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Jet.java 26 Oct 2007 18:52:00 -0000 1.4 --- Jet.java 14 Jan 2008 16:44:32 -0000 1.5 *************** *** 34,41 **** --- 34,45 ---- import javax.vecmath.Vector3f; import javax.vecmath.Point3f; + import javax.vecmath.Color3f; // FreeHEP import org.freehep.j3d.ConeSegment; + // AWT + import java.awt.Color; + // Java import static java.lang.Math.sin; *************** *** 54,57 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.5 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.4 2007/10/26 18:52:00 hrivnac * ETMis added *************** *** 117,121 **** // Create container ! if (_g == null) { _g = new BranchGroup(); use(_g, "Jets", "Jet Container"); --- 124,129 ---- // Create container ! if (_g == null || _ord != Event.ord()) { ! _ord = Event.ord(); _g = new BranchGroup(); use(_g, "Jets", "Jet Container"); *************** *** 134,139 **** --- 142,174 ---- } + /** Set {@link Color}s to be used for line segments. + * @param colorMap The array of {@link Color}s. + * @param colorList The array of {@link Color}s indexes. */ + public static void setColors(Color[] colorMap, int[] colorList) { + _colorMap = colorMap; + _colorList = colorList; + _colorI = 0; + } + + /** Give {@link Color3f} to be used for <em>i</em>s line segments. + * @return The {@link Color3f} o be used for <em>i</em>s line segment, + * <em>null</em> is colormap is not set. */ + protected Color3f color() { + if (_colorList == null) { + return null; + } + return new Color3f(_colorMap[_colorList[_colorI++]]); + } + + private static Color[] _colorMap; + + private static int[] _colorList; + + private static int _colorI; + private static BranchGroup _g; + private static short _ord = 0; + /** Logging . */ private static Logger log = Logger.getLogger(Jet.class); Index: STC.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/STC.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** STC.java 26 Oct 2007 23:12:34 -0000 1.8 --- STC.java 14 Jan 2008 16:44:32 -0000 1.9 *************** *** 60,63 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.9 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.8 2007/10/26 23:12:34 hrivnac * improved *************** *** 131,135 **** for (int i = 0; i < count; i++) { // ColorList is set => get Appearance from Color ! if (color(i) == null) { color = new Color3f(); appearance = builder().appearance(name, name); --- 134,139 ---- for (int i = 0; i < count; i++) { // ColorList is set => get Appearance from Color ! color = color(i); ! if (color == null) { color = new Color3f(); appearance = builder().appearance(name, name); *************** *** 139,143 **** // ColorList is not set => get Color from Appearance else { - color = color(i); appearance = new Appearance(); appearance.setMaterial(new Material(color, color, color, color, 1f)); --- 143,146 ---- *************** *** 145,149 **** appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.0f)); appearance.setLineAttributes(new LineAttributes(lineWidth(), LineAttributes.PATTERN_SOLID, GlobalOptions.quality() > 5)); ! shape.setAppearance(appearance); setAppearance(appearance); lineArray = new LineArray(2, --- 148,152 ---- appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.0f)); appearance.setLineAttributes(new LineAttributes(lineWidth(), LineAttributes.PATTERN_SOLID, GlobalOptions.quality() > 5)); ! //shape.setAppearance(appearance); setAppearance(appearance); lineArray = new LineArray(2, Index: TauJet.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/TauJet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TauJet.java 26 Oct 2007 16:28:31 -0000 1.1 --- TauJet.java 14 Jan 2008 16:44:32 -0000 1.2 *************** *** 34,41 **** --- 34,45 ---- import javax.vecmath.Vector3f; import javax.vecmath.Point3f; + import javax.vecmath.Color3f; // FreeHEP import org.freehep.j3d.ConeSegment; + // AWT + import java.awt.Color; + // Java import static java.lang.Math.sin; *************** *** 54,57 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.2 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.1 2007/10/26 16:28:31 hrivnac * Muon and Jets added *************** *** 75,79 **** // Create container ! if (_g == null) { _g = new BranchGroup(); use(_g, "TauJets", "TauJet Container"); --- 82,87 ---- // Create container ! if (_g == null || _ord != Event.ord()) { ! _ord = Event.ord(); _g = new BranchGroup(); use(_g, "TauJets", "TauJet Container"); *************** *** 92,97 **** --- 100,132 ---- } + /** Set {@link Color}s to be used for line segments. + * @param colorMap The array of {@link Color}s. + * @param colorList The array of {@link Color}s indexes. */ + public static void setColors(Color[] colorMap, int[] colorList) { + _colorMap = colorMap; + _colorList = colorList; + _colorI = 0; + } + + /** Give {@link Color3f} to be used for <em>i</em>s line segments. + * @return The {@link Color3f} o be used for <em>i</em>s line segment, + * <em>null</em> is colormap is not set. */ + protected Color3f color() { + if (_colorList == null) { + return null; + } + return new Color3f(_colorMap[_colorList[_colorI++]]); + } + + private static Color[] _colorMap; + + private static int[] _colorList; + + private static int _colorI; + private static BranchGroup _g; + private static short _ord = 0; + /** Logging . */ private static Logger log = Logger.getLogger(TauJet.class); Index: BJet.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/BJet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BJet.java 26 Oct 2007 16:28:31 -0000 1.1 --- BJet.java 14 Jan 2008 16:44:32 -0000 1.2 *************** *** 34,37 **** --- 34,38 ---- import javax.vecmath.Vector3f; import javax.vecmath.Point3f; + import javax.vecmath.Color3f; // FreeHEP *************** *** 45,48 **** --- 46,52 ---- import static java.lang.Math.PI; + // AWT + import java.awt.Color; + // Log4J import org.apache.log4j.Logger; *************** *** 54,57 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.2 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.1 2007/10/26 16:28:31 hrivnac * Muon and Jets added *************** *** 75,79 **** // Create container ! if (_g == null) { _g = new BranchGroup(); use(_g, "BJets", "BJet Container"); --- 82,87 ---- // Create container ! if (_g == null || _ord != Event.ord()) { ! _ord = Event.ord(); _g = new BranchGroup(); use(_g, "BJets", "BJet Container"); *************** *** 92,97 **** --- 100,132 ---- } + /** Set {@link Color}s to be used for line segments. + * @param colorMap The array of {@link Color}s. + * @param colorList The array of {@link Color}s indexes. */ + public static void setColors(Color[] colorMap, int[] colorList) { + _colorMap = colorMap; + _colorList = colorList; + _colorI = 0; + } + + /** Give {@link Color3f} to be used for <em>i</em>s line segments. + * @return The {@link Color3f} o be used for <em>i</em>s line segment, + * <em>null</em> is colormap is not set. */ + protected Color3f color() { + if (_colorList == null) { + return null; + } + return new Color3f(_colorMap[_colorList[_colorI++]]); + } + + private static Color[] _colorMap; + + private static int[] _colorList; + + private static int _colorI; + private static BranchGroup _g; + private static short _ord = 0; + /** Logging . */ private static Logger log = Logger.getLogger(BJet.class); Index: Track.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Track.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Track.java 26 Oct 2007 23:12:34 -0000 1.10 --- Track.java 14 Jan 2008 16:44:32 -0000 1.11 *************** *** 75,78 **** --- 75,81 ---- * <pre> * $Log$ + * Revision 1.11 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.10 2007/10/26 23:12:34 hrivnac * improved *************** *** 202,206 **** // Use Track use(shape, name, info); ! // Constructand Use Track label // TBD: check pt, use pt if (_text) { --- 205,209 ---- // Use Track use(shape, name, info); ! // Construct and Use Track label // TBD: check pt, use pt if (_text) { Index: Event.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Event.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Event.java 26 Oct 2007 16:28:31 -0000 1.4 --- Event.java 14 Jan 2008 16:44:32 -0000 1.5 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.5 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.4 2007/10/26 16:28:31 hrivnac * Muon and Jets added *************** *** 102,105 **** --- 105,113 ---- } + /** TBD */ + public static short ord() { + return _ord; + } + private static short _ord = 0; Index: S3D.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/S3D.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** S3D.java 26 Oct 2007 23:12:34 -0000 1.9 --- S3D.java 14 Jan 2008 16:44:32 -0000 1.10 *************** *** 58,61 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.10 2008/01/14 16:44:32 hrivnac + * Atlantis colors fixed + * * Revision 1.9 2007/10/26 23:12:34 hrivnac * improved *************** *** 126,131 **** Color3f color; for (int i = 0; i < count; i++) { // ColorList is set => get Appearance from Color ! if (color(i) == null) { color = new Color3f(); appearance = builder().appearance(name, name); --- 129,135 ---- Color3f color; for (int i = 0; i < count; i++) { + color = color(i); // ColorList is set => get Appearance from Color ! if (color == null) { color = new Color3f(); appearance = builder().appearance(name, name); *************** *** 135,139 **** // ColorList is not set => get Color from Appearance else { - color = color(i); appearance = new Appearance(); appearance.setMaterial(new Material(color, color, color, color, 1f)); --- 139,142 ---- |
|
From: Julius H. <hr...@us...> - 2008-01-11 15:48:47
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31323/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Added Files: STr.java Log Message: better interface with Atlantis --- NEW FILE: STr.java --- package net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder; import net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveEvent.JAXB.STrType; import net.hep.atlas.graphics.JiveEvent.JAXB.KineType; import net.hep.atlas.graphics.JiveEvent.JAXB.EtaType; import net.hep.atlas.graphics.JiveEvent.JAXB.PhiType; import net.hep.atlas.graphics.JiveEvent.JAXB.PtType; import net.hep.atlas.graphics.JiveEvent.JAXB.RhoVertexType; import net.hep.atlas.graphics.JiveEvent.JAXB.PhiVertexType; import net.hep.atlas.graphics.JiveEvent.JAXB.ZVertexType; // GraXML import net.hep.graphics.GraXML.BuildOptions; import net.hep.graphics.GraXML.GlobalOptions; 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.Java3DExtensions.BillboardGroup; // Java3D import javax.media.j3d.Shape3D; import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.media.j3d.TransformGroup; import javax.media.j3d.Transform3D; import javax.media.j3d.Appearance; import javax.media.j3d.Material; import javax.media.j3d.LineAttributes; import javax.media.j3d.TransparencyAttributes; import javax.media.j3d.LineArray; import javax.media.j3d.GeometryArray; import javax.vecmath.Point3d; import javax.vecmath.Vector3d; import javax.vecmath.Vector3f; import javax.vecmath.Point3f; import javax.vecmath.Color3f; // AWT import java.awt.Color; // Java import static java.lang.Math.toRadians; import static java.lang.Math.log; import static java.lang.Math.exp; import static java.lang.Math.abs; import static java.lang.Math.sqrt; import static java.lang.Math.sin; import static java.lang.Math.cos; import static java.lang.Math.signum; import static java.lang.Math.PI; // Log4J import org.apache.log4j.Logger; /** GraXML representation of <code>STrType</code> * JiveEvent Type connected via JAXB * {@link net.hep.atlas.graphics.JiveEvent.JAXB.STrType} generic JAXB interface. * <p><font color="#880088"> * <pre> * $Log: STr.java,v $ * Revision 1.9 2008/01/11 15:48:50 hrivnac * better interface with Atlantis * * </pre> * </font></p> * @version $Id: STr.java,v 1.9 2008/01/11 15:48:50 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ // TBD: use HEP3D public final class STr extends JiveRep { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); // Verify element type if (! (element instanceof STrType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Create container BranchGroup g = new BranchGroup(); use(g, "STrs", "STr Container"); set(builder, g, "STrs"); // Get Type properties STrType str = (STrType)element; int count = str.getCount(); String storeGateKey = str.getStoreGateKey(); EtaType eta = str.getEta(); PhiType phi = str.getPhi(); PtType pt = str.getPt(); RhoVertexType rhoVertex = str.getRhoVertex(); PhiVertexType phiVertex = str.getPhiVertex(); ZVertexType zVertex = str.getZVertex(); float[] etas = floats(eta.getValue()); float[] phis = floats(phi.getValue()); float[] pts = floats(pt.getValue()); float[] rhoVertexs = floats(rhoVertex.getValue()); float[] phiVertexs = floats(phiVertex.getValue()); float[] zVertexs = floats(zVertex.getValue()); // Draw all STrs String name; String info; boolean outlinedBckp = Interacter.outlined(); Interacter.setOutlined(false); Shape3D shape; LineArray lineArray; Appearance appearance; Material material; Color3f color; double x0; double y0; double z0; double x1; double y1; double z1; // Loop over STrs for (int i = 0; i < count; i++) { name = "STr(" + storeGateKey + "/" + i + ")"; info = name; shape = new Shape3D(); color = color(i); // ColorList is set => get Appearance from Color if (color == null) { color = new Color3f(); appearance = builder().appearance(name, name); material = appearance.getMaterial(); material.getSpecularColor(color); } // ColorList is not set => get Color from Appearance else { appearance = new Appearance(); appearance.setMaterial(new Material(color, color, color, color, 1f)); } appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.0f)); appearance.setLineAttributes(new LineAttributes(lineWidth(), LineAttributes.PATTERN_SOLID, GlobalOptions.quality() > 5)); shape.setAppearance(appearance); setAppearance(appearance); lineArray = new LineArray(2, GeometryArray.COORDINATES| GeometryArray.COLOR_3| GeometryArray.NORMALS); // Construct STr x0 = rhoVertexs[i] * cos(phis[i]); y0 = rhoVertexs[i] * sin(phis[i]); z0 = zVertexs[i]; x1 = x0 + _ptFactor * pts[i] * cos(phis[i]); y1 = y0 + _ptFactor * pts[i] * sin(phis[i]); z1 = z0 + _ptFactor * pts[i] / 2 * (exp(etas[i]) - exp(-etas[i])); lineArray.setCoordinate(0, new Point3d(x0 / builder().norm(), y0 / builder().norm(), z0 / builder().norm())); lineArray.setCoordinate(1, new Point3d(x1 / builder().norm(), y1 / builder().norm(), z1 / builder().norm())); lineArray.setColor(0, color); lineArray.setColor(1, color); lineArray.setNormal(0, new Vector3f(0, 0, 0)); lineArray.setNormal(1, new Vector3f(0, 0, 0)); shape.addGeometry(lineArray); // Use STr use(shape, name, info); } Interacter.setOutlined(outlinedBckp); } /** Set {@link Color}s to be used for line segments. * @param colorMap The array of {@link Color}s. * @param colorList The array of {@link Color}s indexes. */ public static void setColors(Color[] colorMap, int[] colorList) { _colorMap = colorMap; _colorList = colorList; } /** Give {@link Color3f} to be used for <em>i</em>s line segments. * @param i The line segment number. * @return The {@link Color3f} o be used for <em>i</em>s line segment, * <em>null</em> is colormap is not set. */ protected Color3f color(int i) { if (_colorList == null) { return null; } return new Color3f(_colorMap[_colorList[i]]); } private static Color[] _colorMap; private static int[] _colorList; /** Give width of line segments, * the default is <code>2</code>. * @return The width of line segments. */ public int lineWidth() { return _lineWidth; } /** Set width of line segments, * the default is <code>2</code>. * @param lineWidth The width of line segments. */ public static void setLineWidth(int lineWidth) { _lineWidth = lineWidth; } private static int _lineWidth = 2; /** Set factor for magnifying <code>pt</code> * to get segment length. * @param ptFactor The factor for magnifying <code>pt</code> * to get segment length, * the default is <code>1</code>. */ public static final void setPtFactor(float ptFactor) { _ptFactor = ptFactor; } private static float _ptFactor = 1f; /** Logging . */ private static Logger log = Logger.getLogger(STr.class); } |
|
From: Julius H. <hr...@us...> - 2008-01-10 23:05:40
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23770/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: Jet0.java JiveEventBuilder.java Particle.java Log Message: Atlantis bridge improved Index: JiveEventBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/JiveEventBuilder.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JiveEventBuilder.java 5 Nov 2007 15:00:49 -0000 1.12 --- JiveEventBuilder.java 10 Jan 2008 23:05:39 -0000 1.13 *************** *** 23,26 **** --- 23,29 ---- * <pre> * $Log$ + * Revision 1.13 2008/01/10 23:05:39 hrivnac + * Atlantis bridge improved + * * Revision 1.12 2007/11/05 15:00:49 hrivnac * Jets from 0,0,0; Etmis-z = 0 *************** *** 126,129 **** --- 129,147 ---- } + /** Get vertex. + * @return The x,y,z of the vertex. */ + public float[] vertex() { + return _vertex; + } + + /** Set <code>vertex</code>. + * @param vertex The x,y,z of the vertex, + * the default is <code>[0, 0, 0]</code>. */ + public static final void setVertex(double[] vertex) { + _vertex[0] = (float)vertex[0]; + _vertex[1] = (float)vertex[1]; + _vertex[2] = (float)vertex[2]; + } + private static String _schema = "event.xsd"; *************** *** 136,139 **** --- 154,159 ---- private static double _norm = 100.0; + private static float[] _vertex = {0f, 0f, 0f}; + /** Logging . */ private static Logger log = Logger.getLogger(JiveEventBuilder.class); Index: Particle.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Particle.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Particle.java 5 Nov 2007 15:00:49 -0000 1.6 --- Particle.java 10 Jan 2008 23:05:39 -0000 1.7 *************** *** 59,62 **** --- 59,65 ---- * <pre> * $Log$ + * Revision 1.7 2008/01/10 23:05:39 hrivnac + * Atlantis bridge improved + * * Revision 1.6 2007/11/05 15:00:49 hrivnac * Jets from 0,0,0; Etmis-z = 0 *************** *** 147,156 **** GeometryArray.COLOR_3| GeometryArray.NORMALS); ! lineArray.setCoordinate(0, new Point3d(0, ! 0, ! 0)); ! lineArray.setCoordinate(1, new Point3d(x, ! y, ! z)); lineArray.setColor(0, color); lineArray.setColor(1, color); --- 150,159 ---- GeometryArray.COLOR_3| GeometryArray.NORMALS); ! lineArray.setCoordinate(0, new Point3d(builder().vertex()[0] / builder().norm(), ! builder().vertex()[1] / builder().norm(), ! builder().vertex()[2] / builder().norm())); ! lineArray.setCoordinate(1, new Point3d(x + builder().vertex()[0] / builder().norm(), ! y + builder().vertex()[0] / builder().norm(), ! z + builder().vertex()[0] / builder().norm())); lineArray.setColor(0, color); lineArray.setColor(1, color); *************** *** 213,222 **** GeometryArray.COLOR_3| GeometryArray.NORMALS); ! lineArray.setCoordinate(0, new Point3d(0, ! 0, ! 0)); ! lineArray.setCoordinate(1, new Point3d(x, ! y, ! z)); lineArray.setColor(0, color); lineArray.setColor(1, color); --- 216,225 ---- GeometryArray.COLOR_3| GeometryArray.NORMALS); ! lineArray.setCoordinate(0, new Point3d(builder().vertex()[0] / builder().norm(), ! builder().vertex()[1] / builder().norm(), ! builder().vertex()[2] / builder().norm())); ! lineArray.setCoordinate(1, new Point3d(x + builder().vertex()[0] / builder().norm(), ! y + builder().vertex()[1] / builder().norm(), ! z + builder().vertex()[2] / builder().norm())); lineArray.setColor(0, color); lineArray.setColor(1, color); Index: Jet0.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Jet0.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Jet0.java 5 Nov 2007 15:00:49 -0000 1.4 --- Jet0.java 10 Jan 2008 23:05:39 -0000 1.5 *************** *** 49,52 **** --- 49,55 ---- * <pre> * $Log$ + * Revision 1.5 2008/01/10 23:05:39 hrivnac + * Atlantis bridge improved + * * Revision 1.4 2007/11/05 15:00:49 hrivnac * Jets from 0,0,0; Etmis-z = 0 *************** *** 212,218 **** m.mul(m0); TransformGroup it = new TransformGroup(new Transform3D(m, ! new Vector3d(delX / 2, ! delY / 2, ! delZ / 2), 1)); tg().addChild(it); --- 215,221 ---- m.mul(m0); TransformGroup it = new TransformGroup(new Transform3D(m, ! new Vector3d(delX / 2 + builder().vertex()[0] / builder().norm(), ! delY / 2 + builder().vertex()[1] / builder().norm(), ! delZ / 2 + builder().vertex()[2] / builder().norm()), 1)); tg().addChild(it); |
|
From: Julius H. <hr...@us...> - 2008-01-10 23:05:40
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23770/net/hep/atlas/graphics/JiveEvent/Schema Modified Files: event.xsd Log Message: Atlantis bridge improved Index: event.xsd =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Schema/event.xsd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** event.xsd 26 Oct 2007 16:28:31 -0000 1.7 --- event.xsd 10 Jan 2008 23:05:40 -0000 1.8 *************** *** 4,7 **** --- 4,10 ---- <!-- $Log$ + Revision 1.8 2008/01/10 23:05:40 hrivnac + Atlantis bridge improved + Revision 1.7 2007/10/26 16:28:31 hrivnac Muon and Jets added *************** *** 235,239 **** <xs:element ref="ety" /> </xs:sequence> ! <xs:attribute name="count" type="xs:string" default="" /> <xs:attribute name="storeGateKey" type="xs:string" default="" /> </xs:complexType> --- 238,242 ---- <xs:element ref="ety" /> </xs:sequence> ! <xs:attribute name="count" type="xs:int" default="1" /> <xs:attribute name="storeGateKey" type="xs:string" default="" /> </xs:complexType> |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:30:16
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30290 Modified Files: index.html Log Message: Google Analytics added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.html 15 Oct 2007 15:46:54 -0000 1.4 --- index.html 22 Dec 2007 15:30:18 -0000 1.5 *************** *** 70,73 **** --- 70,74 ---- <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> + <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:29:44
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29890 Modified Files: index.html Log Message: Google Analytics added Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/index.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** index.html 24 Jan 2007 22:08:16 -0000 1.7 --- index.html 22 Dec 2007 15:29:47 -0000 1.8 *************** *** 115,118 **** --- 115,119 ---- <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=JiveEvent"> <address><a href="http://hrivnac.home.cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> + <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:27:01
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29395 Modified Files: index.html Log Message: Google Analytics added Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** index.html 2 Oct 2007 17:22:45 -0000 1.10 --- index.html 22 Dec 2007 15:27:04 -0000 1.11 *************** *** 166,169 **** --- 166,170 ---- <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=HEP3D"> <address><a href="http://home.cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> + <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:26:13
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29316 Modified Files: GraXML.sh index.html Log Message: Google Analytics added Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/index.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** index.html 6 Nov 2007 14:55:17 -0000 1.9 --- index.html 22 Dec 2007 15:26:15 -0000 1.10 *************** *** 52,55 **** --- 52,56 ---- <img width="0" height="0" src="http://home.cern.ch/hrivnac/cgi-bin/record.pl?page=GraXML"> <address><a href="http://home.cern.ch/hrivnac">J.Hrivnac</a>, @BUILD@</address> + <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> </html> Index: GraXML.sh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GraXML.sh 9 Oct 2007 17:17:50 -0000 1.3 --- GraXML.sh 22 Dec 2007 15:26:15 -0000 1.4 *************** *** 10,14 **** fi ! export LD_LIBRARY_PATH=${GRAXML_HOME}/lib/${ARCH}:${JAVA_HOME}/jre/lib/${ARCH}/xawt:${LD_LIBRARY_PATH} java -Xmx512M -jar ${GRAXML_HOME}/lib/GraXMLDisplay.exe.jar $* --- 10,14 ---- fi ! export LD_LIBRARY_PATH=${GRAXML_HOME}/lib/${ARCH}:${JAVA_HOME}/jre/lib/${ARCH}/xawt:${LD_LIBRARY_PATH} java -Xmx512M -jar ${GRAXML_HOME}/lib/GraXMLDisplay.exe.jar $* |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:26:12
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29316/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: Google Analytics added Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Guide.html 6 Nov 2007 14:55:19 -0000 1.25 --- Guide.html 22 Dec 2007 15:26:15 -0000 1.26 *************** *** 589,592 **** --- 589,596 ---- <li><b><a href="http://cern.ch/hrivnac/Activities/2006/February/GraXML">Using XML for Detector Geometry Description in the Virtual Monte Carlo Framework</a></b> (V.Fine, J.Lauret, M.Potekhin, J.Hrivnac) during CHEP in Feb'06, Mumbai</li> </ul> + <li>2007:</li> + <ul> + <li><b><a href="http://cern.ch/hrivnac/Activities/2007/November/GraXML">GraXML</a></b> (J.Hrivnac during Second meeting on Event Displays for ATLAS in Nov'07, CERN</li> + </ul> </ul> </ul> *************** *** 627,630 **** --- 631,638 ---- <li><b><a href="http://agenda.cern.ch/askArchive.php?base=agenda&categ=a055638&id=a055638s3t13/transparencies">Root4Star: a ROOT based framework for user analysis and data mining</a></b> (J.Laurent) during Root WS in Sep'05, CERN</li> </ul> + <li>2007:</li> + <ul> + <li><b><a href="http://indico.cern.ch/materialDisplay.py?contribId=11&materialId=slides&confId=20605">Event Displays for ATLAS</a></b> (C.Guyot) during Atlas Technical Management Board in Nov'07, CERN</li> + </ul> </ul> </ul> *************** *** 954,957 **** --- 962,966 ---- <img width="0" height="0" src="http://cern.ch/hrivnac/cgi-bin/record.pl?page=GraXML_Guide"> <address><a href="http://cern.ch/hrivnac">J.Hrivnac</a>, @BUILD@</address> + <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:26:12
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29316/net/hep/graphics/GraXML/FrontEnd Modified Files: GraXMLThread.java Log Message: Google Analytics added Index: GraXMLThread.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/GraXMLThread.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GraXMLThread.java 16 Oct 2007 10:11:51 -0000 1.7 --- GraXMLThread.java 22 Dec 2007 15:26:15 -0000 1.8 *************** *** 20,23 **** --- 20,26 ---- * <pre> * $Log$ + * Revision 1.8 2007/12/22 15:26:15 hrivnac + * Google Analytics added + * * Revision 1.7 2007/10/16 10:11:51 hrivnac * SplashWindow added; usable with java 1.5 *************** *** 60,63 **** --- 63,67 ---- /** Open {@link RootWindow}. */ + @Override public void run() { _root.openThread(this); |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:26:12
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29316/net/hep/graphics/GraXML/Disconnecter Modified Files: ConnectionsDB.java Log Message: Google Analytics added Index: ConnectionsDB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ConnectionsDB.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ConnectionsDB.java 24 Jan 2007 16:59:25 -0000 1.5 --- ConnectionsDB.java 22 Dec 2007 15:26:15 -0000 1.6 *************** *** 21,24 **** --- 21,27 ---- * <pre> * $Log$ + * Revision 1.6 2007/12/22 15:26:15 hrivnac + * Google Analytics added + * * Revision 1.5 2007/01/24 16:59:25 hrivnac * migrated to JAXB 2.0 *************** *** 140,144 **** * default is <code>2</code> */ public static final void setLevelLimit(int levelLimit) { ! _levelLimit = _levelLimit; } --- 143,147 ---- * default is <code>2</code> */ public static final void setLevelLimit(int levelLimit) { ! levelLimit = _levelLimit; } |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:25:11
|
Update of /cvsroot/graxml/DetDescr/GDML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28925 Modified Files: index.html Log Message: Google Analytics added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.html 25 Jan 2007 17:09:54 -0000 1.8 --- index.html 22 Dec 2007 15:25:14 -0000 1.9 *************** *** 171,174 **** --- 171,175 ---- <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=GDML"> <address><a href="http://hrivnac.home.cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> + <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:22:52
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28426 Modified Files: index.html Log Message: Google Analytics added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** index.html 15 Feb 2007 10:48:56 -0000 1.26 --- index.html 22 Dec 2007 15:22:52 -0000 1.27 *************** *** 182,185 **** --- 182,186 ---- <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=AGDD"> <address><a href="http://hrivnac.home.cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> + <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2007-12-22 15:22:50
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28426/net/hep/AGDD/GeometricModel Modified Files: Evaluator.java Log Message: Google Analytics added Index: Evaluator.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Evaluator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Evaluator.java 7 Oct 2005 17:24:20 -0000 1.3 --- Evaluator.java 22 Dec 2007 15:22:52 -0000 1.4 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.4 2007/12/22 15:22:52 hrivnac + * Google Analytics added + * * Revision 1.3 2005/10/07 17:24:20 hrivnac * standard Colors included *************** *** 148,151 **** --- 151,155 ---- * @param formula The mathematical formula to be evaluated. * @return The resulting number, 0 if evaluation can't be performed. */ + // BUG: Boolean hides java.lang.Boolean => rename Boolean private String evaluate(String formula) { String value = "0"; *************** *** 155,160 **** value = ((Number)result).toString(); } ! else if (result instanceof Boolean) { ! value = (Boolean)result ? "1" : "0"; } else { --- 159,164 ---- value = ((Number)result).toString(); } ! else if (result instanceof java.lang.Boolean) { ! value = (java.lang.Boolean)result ? "1" : "0"; } else { |
|
From: Julius H. <hr...@us...> - 2007-11-06 23:15:56
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3964/net/hep/graphics/GraXML/GUI/Components Modified Files: EnvelopePanel.java Log Message: builders version reported Index: EnvelopePanel.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/EnvelopePanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EnvelopePanel.java 5 Nov 2007 14:58:13 -0000 1.2 --- EnvelopePanel.java 6 Nov 2007 23:15:52 -0000 1.3 *************** *** 1,4 **** --- 1,6 ---- package net.hep.graphics.GraXML.GUI.Components; + import net.hep.graphics.GraXML.Java3DExtensions.Envelope; + // AWT import java.awt.Color; *************** *** 10,14 **** import javax.swing.BoxLayout; import javax.swing.ButtonGroup; ! import javax.swing.JRadioButton; /** Panel for switching {@link net.hep.graphics.GraXML.Java3DExtensions.Envelope} --- 12,16 ---- import javax.swing.BoxLayout; import javax.swing.ButtonGroup; ! import javax.swing.JCheckBox; /** Panel for switching {@link net.hep.graphics.GraXML.Java3DExtensions.Envelope} *************** *** 18,21 **** --- 20,26 ---- * <pre> * $Log$ + * Revision 1.3 2007/11/06 23:15:52 hrivnac + * builders version reported + * * Revision 1.2 2007/11/05 14:58:13 hrivnac * Envelope richer *************** *** 47,76 **** + "<small>Envelope shows/hides 3D Envelope components (Axis/Legend/Cylinder)</small></html>"); // Axis ! JRadioButton axisButton = new JRadioButton("Axis"); ! axisButton.setName("Envelope"); ! axisButton.addActionListener(listener); ! axisButton.setSelected(true); ! axisButton.setFont(Fonts.PLAIN); ! axisButton.setToolTipText("Show/Hide Axis"); // Legend ! JRadioButton legendButton = new JRadioButton("Legend"); ! legendButton.setName("Envelope"); ! legendButton.addActionListener(listener); ! legendButton.setSelected(false); ! legendButton.setFont(Fonts.PLAIN); ! legendButton.setToolTipText("Show/Hide Legend"); // Cylinder ! JRadioButton cylinderButton = new JRadioButton("Cylinder"); ! cylinderButton.setName("Envelope"); ! cylinderButton.addActionListener(listener); ! cylinderButton.setSelected(false); ! cylinderButton.setFont(Fonts.PLAIN); ! cylinderButton.setToolTipText("Show/Hide Cylinder"); // Panel setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); add(envLabel); ! add(axisButton); ! add(legendButton); ! add(cylinderButton); add(new JLabel(" ")); add(new JLabel(" ")); --- 52,78 ---- + "<small>Envelope shows/hides 3D Envelope components (Axis/Legend/Cylinder)</small></html>"); // Axis ! JCheckBox axisCheckBox = new JCheckBox("Axis", Envelope.axis()); ! axisCheckBox.setName("Envelope"); ! axisCheckBox.addActionListener(listener); ! axisCheckBox.setFont(Fonts.PLAIN); ! axisCheckBox.setToolTipText("Show/Hide Axis"); // Legend ! JCheckBox legendCheckBox = new JCheckBox("Legend", Envelope.legend()); ! legendCheckBox.setName("Envelope"); ! legendCheckBox.addActionListener(listener); ! legendCheckBox.setFont(Fonts.PLAIN); ! legendCheckBox.setToolTipText("Show/Hide Legend"); // Cylinder ! JCheckBox cylinderCheckBox = new JCheckBox("Cylinder", Envelope.cylinder()); ! cylinderCheckBox.setName("Envelope"); ! cylinderCheckBox.addActionListener(listener); ! cylinderCheckBox.setFont(Fonts.PLAIN); ! cylinderCheckBox.setToolTipText("Show/Hide Cylinder"); // Panel setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); add(envLabel); ! add(axisCheckBox); ! add(legendCheckBox); ! add(cylinderCheckBox); add(new JLabel(" ")); add(new JLabel(" ")); |
|
From: Julius H. <hr...@us...> - 2007-11-06 23:15:55
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3964/net/hep/graphics/GraXML Modified Files: MasterBuilder.java Log Message: builders version reported Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MasterBuilder.java 5 Nov 2007 14:58:12 -0000 1.18 --- MasterBuilder.java 6 Nov 2007 23:15:51 -0000 1.19 *************** *** 62,65 **** --- 62,68 ---- * <pre> * $Log$ + * Revision 1.19 2007/11/06 23:15:51 hrivnac + * builders version reported + * * Revision 1.18 2007/11/05 14:58:12 hrivnac * Envelope richer *************** *** 627,636 **** public static void setBuilder(String topElement, String builder) throws GraXMLException { - log.info("Setting builder " + builder + " for top Element " + topElement + " ..."); if (! _builders.containsKey(topElement)) { _builders.put(topElement, builder); try { Class cl = Class.forName(builder); ! _builderObjects.add((MasterBuilder)cl.newInstance()); } catch (ClassNotFoundException e) { --- 630,640 ---- public static void setBuilder(String topElement, String builder) throws GraXMLException { if (! _builders.containsKey(topElement)) { _builders.put(topElement, builder); try { Class cl = Class.forName(builder); ! MasterBuilder mb = (MasterBuilder)cl.newInstance(); ! _builderObjects.add(mb); ! log.info("Setting builder " + builder + " " + mb.version() + " for top Element " + topElement + " ..."); } catch (ClassNotFoundException e) { |
|
From: Julius H. <hr...@us...> - 2007-11-06 23:15:55
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3964/net/hep/graphics/GraXML/Java3DExtensions Modified Files: Envelope.java Log Message: builders version reported Index: Envelope.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Envelope.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Envelope.java 6 Nov 2007 15:56:25 -0000 1.4 --- Envelope.java 6 Nov 2007 23:15:52 -0000 1.5 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.5 2007/11/06 23:15:52 hrivnac + * builders version reported + * * Revision 1.4 2007/11/06 15:56:25 hrivnac * Envelope Cylinder nicer *************** *** 224,232 **** } ! private boolean _axis = true; ! private boolean _legend = false; ! private boolean _cylinder = false; private BranchGroup _axisGroup; --- 227,250 ---- } ! // TBD ! public static boolean axis() { ! return _axis; ! } ! // TBD ! public static boolean legend() { ! return _legend; ! } ! // TBD ! public static boolean cylinder() { ! return _cylinder; ! } ! ! private static boolean _axis = true; ! ! private static boolean _legend = false; ! ! private static boolean _cylinder = false; private BranchGroup _axisGroup; |
|
From: Julius H. <hr...@us...> - 2007-11-06 15:56:24
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29165/net/hep/graphics/GraXML/Java3DExtensions Modified Files: Envelope.java Log Message: Envelope Cylinder nicer Index: Envelope.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Envelope.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Envelope.java 5 Nov 2007 14:58:15 -0000 1.3 --- Envelope.java 6 Nov 2007 15:56:25 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- import net.hep.graphics.GraXML.BuildOptions; + // HEP3D + import org.freehep.j3d.ConeSegment; + // Java3D import javax.media.j3d.Group; *************** *** 21,25 **** import javax.vecmath.Vector3d; import javax.vecmath.Color3f; - import com.sun.j3d.utils.geometry.Cylinder; /** Envelope is a basic Graphical environment (Axis, ights, Coordinates,...) --- 24,27 ---- *************** *** 28,31 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.4 2007/11/06 15:56:25 hrivnac + * Envelope Cylinder nicer + * * Revision 1.3 2007/11/05 14:58:15 hrivnac * Envelope richer *************** *** 135,141 **** addChild(_cylinderGroup); } ! Cylinder cylinder = new Cylinder((float)_radius, (float)_length, 0, BuildOptions.granularity(), BuildOptions.granularity(), transparent); Transform3D t3d = new Transform3D(); ! t3d.rotX(Math.PI / 2); TransformGroup t = new TransformGroup(t3d); t.setTransform(t3d); --- 140,146 ---- addChild(_cylinderGroup); } ! ConeSegment cylinder = new ConeSegment(_radius, _length, BuildOptions.granularity(), transparent); Transform3D t3d = new Transform3D(); ! t3d.rotZ(Math.PI / 2); TransformGroup t = new TransformGroup(t3d); t.setTransform(t3d); *************** *** 222,226 **** private boolean _legend = false; ! private boolean _cylinder = false; --- 227,231 ---- private boolean _legend = false; ! private boolean _cylinder = false; |
|
From: Julius H. <hr...@us...> - 2007-11-06 14:55:20
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2220 Modified Files: index.html Log Message: documentation updated Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.html 5 Nov 2007 14:58:10 -0000 1.8 --- index.html 6 Nov 2007 14:55:17 -0000 1.9 *************** *** 18,24 **** <ul> <li><a href="JavaDoc/net/hep/graphics/GraXML/doc-files/Guide.html">Users Guide</a></li> ! <li>Web Start: <a href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.jnlp"><img src="http://javadesktop.org/javanet_images/webstart.small.gif" border="0" alt="Launch Web Start"></a> (run using <code>javaws</code> command).</li> ! <li>The latest <a href="http://home.cern.ch/hrivnac/Activities/Packages/GraXML-dist.tar.gz">full distribution</a> (ready to run).</li> ! <li>The latest <a href="http://home.cern.ch/hrivnac/Activities/Packages/GraXML2Atlantis.tar.gz">usable with <a href="http://cern.ch/atlantis">Atlantis</a></a>.</li> <li><a href="Gallery">Gallery</a></li> <li>Documentation: --- 18,24 ---- <ul> <li><a href="JavaDoc/net/hep/graphics/GraXML/doc-files/Guide.html">Users Guide</a></li> ! <li>Web Start: <a href="http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.jnlp"><img src="http://javadesktop.org/javanet_images/webstart.small.gif" border="0" alt="Launch Web Start"></a> (run using <code>javaws</code> command).</li> ! <li>The latest <a href="http://cern.ch/hrivnac/Activities/Packages/GraXML-dist.tar.gz">full distribution</a> (ready to run).</li> ! <li>The latest <a href="http://cern.ch/hrivnac/Activities/Packages/GraXML2Atlantis.tar.gz">distribution</a> usable with <a href="http://cern.ch/atlantis">Atlantis</a>.</li> <li><a href="Gallery">Gallery</a></li> <li>Documentation: *************** *** 32,44 **** <li>Geometric Model libraries: <ul> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/AGDD/">AGDD</a></li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/GDML/">GDML</a></li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/JiveEvent/">JiveEvent</a></li> </ul> </li> <li><a href="https://sourceforge.net/projects/graxml">SourceForge</a> page for <ul> ! <li>all distributions,</li> ! <li><a href="http://cvs.sourceforge.net/viewcvs.py/graxml">CVS Repository</a></li> <li><a href="https://sourceforge.net/mail/?group_id=135207">Mailing List</a></li> </ul> --- 32,45 ---- <li>Geometric Model libraries: <ul> ! <li><a href="http://cern.ch/hrivnac/Activities/Packages/AGDD/">AGDD</a></li> ! <li><a href="http://cern.ch/hrivnac/Activities/Packages/GDML/">GDML</a></li> ! <li><a href="http://cern.ch/hrivnac/Activities/Packages/JiveEvent/">JiveEvent</a></li> ! <li><a href="http://cern.ch/hrivnac/Activities/Packages/JiveGeometry/">JiveGeometry</a></li> </ul> </li> <li><a href="https://sourceforge.net/projects/graxml">SourceForge</a> page for <ul> ! <li>stable distributions,</li> ! <li><a href="http://graxml.cvs.sourceforge.net/graxml">CVS Repository</a></li> <li><a href="https://sourceforge.net/mail/?group_id=135207">Mailing List</a></li> </ul> |
|
From: Julius H. <hr...@us...> - 2007-11-06 14:55:19
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2220/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Help.gif Log Message: documentation updated Index: Help.gif =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Help.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsKbdjU1 and /tmp/cvs8TTtWu differ Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Guide.html 19 Oct 2007 14:09:13 -0000 1.24 --- Guide.html 6 Nov 2007 14:55:19 -0000 1.25 *************** *** 103,128 **** <p> The most recent version of GraXML is installed on the CERN afs directory ! <tt>/afs/cern.ch/atlas/project/graphics/GraXML</tt>. This instalation is easy to use: <pre><tt><font color="#a20f0f"> # Setup Java ! . /afs/cern.ch/sw/java/share/bin/setjdk sun 1.5.0_01 # Run GraXML ! /afs/cern.ch/atlas/project/graphics/GraXML/bin/GraXML.sh [<script>] ! # or ! /afs/cern.ch/atlas/project/graphics/GraXML/bin/GraXMLConverter.sh <script> </font></tt></pre> </p> <p> - If you want to make a symbolic link to <tt>GraXML[Converter].sh</tt> or if you - want to put it in your PATH, you have to set up environment variable - <code>GRAXML_HOME</code> pointing to <code>/afs/cern.ch/atlas/project/graphics/GraXML</code>. - </p> - <p> Full documentation is available from the <tt>GraXML/doc</tt> subdirectory, testing examples are in the <tt>GraXML/misc/Test</tt>. </p> ! <hr> <h2><a name="Local Instalation"></a>Local Instalation</h2> <p> --- 103,121 ---- <p> The most recent version of GraXML is installed on the CERN afs directory ! <tt>/afs/cern.ch/sw/lcg/external/Java/GraXML</tt>. This instalation is easy to use: <pre><tt><font color="#a20f0f"> # Setup Java ! . /afs/cern.ch/sw/lcg/external/Java/bin/setup.[c]sh # Run GraXML ! graxml [<script>] </font></tt></pre> </p> <p> Full documentation is available from the <tt>GraXML/doc</tt> subdirectory, testing examples are in the <tt>GraXML/misc/Test</tt>. </p> ! <hr> <h2><a name="Local Instalation"></a>Local Instalation</h2> <p> *************** *** 141,145 **** </p> <p> ! If you want to make a symbolic link to <tt>GraXML[Converter][4].sh</tt> or if you want to put it in your PATH, you have to set up environment variable <code>GRAXML_HOME</code> pointing to your GraXML directory. --- 134,138 ---- </p> <p> ! If you want to make a symbolic link to <tt>GraXML[Converter].sh</tt> or if you want to put it in your PATH, you have to set up environment variable <code>GRAXML_HOME</code> pointing to your GraXML directory. *************** *** 159,165 **** <h2>Using <a name="WebStart"></a>WebStart</h2> <p> ! To run GraXML directly from the Web (on Linux machine using Java 1.5), one has to click on the ! <a href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.jnlp">GraXML WebStart</a> ! link. Correctly configured Web Browsers will start GraXML automaticaly, otherwise following command should be used on the downloaded file: <pre><tt><font color="#990000"> --- 152,159 ---- <h2>Using <a name="WebStart"></a>WebStart</h2> <p> ! To run GraXML directly from the Web (on Linux, MacOSX or MS machine using at least Java 1.5), one can use ! GraXML WebStart distribution: ! <a href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.jnlp"><img src="http://javadesktop.org/javanet_images/webstart.small.gif" border="0" alt="Launch Web Start"></a>. ! Correctly configured Web Browsers will start GraXML automaticaly, otherwise following command should be used on the downloaded file: <pre><tt><font color="#990000"> *************** *** 258,264 **** Detailed description is available from the <a href="../../../../..">GraXML JavaDoc documentation</a> and JavaDoc documentation of used Geometric Model Builders ! (<a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/AGDD/JavaDoc">AGDD</a>, ! <a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/GDML/JavaDoc">GDML</a> and ! <a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/JiveEvent/JavaDoc">JiveEvent</a>). <ul> <!-- BUG: Config defaults wrong --> --- 252,259 ---- Detailed description is available from the <a href="../../../../..">GraXML JavaDoc documentation</a> and JavaDoc documentation of used Geometric Model Builders ! (<a href="http://cern.ch/hrivnac/Activities/Packages/AGDD/JavaDoc">AGDD</a>, ! <a href="http://cern.ch/hrivnac/Activities/Packages/GDML/JavaDoc">GDML</a>, ! <a href="http://cern.ch/hrivnac/Activities/Packages/JiveEvent/JavaDoc">JiveEvent</a> and ! <a href="http://cern.ch/hrivnac/Activities/Packages/JiveGeometry/JavaDoc">JiveGeometry</a>). <ul> <!-- BUG: Config defaults wrong --> *************** *** 296,302 **** <li><tt><font color="#990000">SelectedColor.setPaletteOffset(int offset); // default = 0</font></tt></li> <li><tt><font color="#990000">org.freehep.j3d.OutlinedShape3DFactory.setOutlineColor(Color3f oc); // default = OutlinedShape3DFactory.DARK, others = WHITE, BLACK, BRIGHT, null</font></tt></li> ! <li><tt><font color="#990000">Envelope.setAxis(boolean axis); // default = true</font></tt></li> ! <li><tt><font color="#990000">Envelope.setCylinder(boolean cylinder); // default = false</font></tt></li> ! <li><tt><font color="#990000">Envelope.setLogo(String logo); // default = "GraXML", Config default = "z"</font></tt></li> <li><tt><font color="#990000">DetachableConnection.setDisconnected(boolean disconnected); // default = true</font></tt></li> </ul> --- 291,297 ---- <li><tt><font color="#990000">SelectedColor.setPaletteOffset(int offset); // default = 0</font></tt></li> <li><tt><font color="#990000">org.freehep.j3d.OutlinedShape3DFactory.setOutlineColor(Color3f oc); // default = OutlinedShape3DFactory.DARK, others = WHITE, BLACK, BRIGHT, null</font></tt></li> ! <li><tt><font color="#990000">Envelope.change(String part); // default: Axis-true, Legend-false, Cylinder-false</font></tt></li> ! <li><tt><font color="#990000">Envelope.setRadius(double radius); // default = 1</font></tt></li> ! <li><tt><font color="#990000">Envelope.setLength(double length); // default = 2</font></tt></li> <li><tt><font color="#990000">DetachableConnection.setDisconnected(boolean disconnected); // default = true</font></tt></li> </ul> *************** *** 314,325 **** <li>JiveEvent Options:</li> <ul> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.STr.setPtCut(float ptCut); // default = 0.5</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.STr.setTextPtCut(float textPtCut); // default = 1.0</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.STr.setText(boolean text); // default = true</font></tt></li> ! <li><tt><font color="#990000">hep.graphics.j3d.Helix.cutAt(double length, double radius); // default = 5, 1</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Jet.asCone(); // default</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Jet.Jet.asLine();</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Jet.Jet.setPtFactor(float ptFactor); // default = 0.01</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Jet.Jet.setPtCut(float ptCut); // default = 0.1</font></tt></li> </ul> </ul> --- 309,325 ---- <li>JiveEvent Options:</li> <ul> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Particle.setPtFactor(float ptFactor); // default = 0.01</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Jet0.setPtFactor(float ptFactor); // default = 0.01</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Jet0.setPtCut(float ptCut); // default = 0.0</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Track.setLineWidth(int lineWidth); // default = 2</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.STC.setLineWidth(int lineWidth); // default = 2</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Electron.setLineWidth(int lineWidth); // default = 4</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Photon.setLineWidth(int lineWidth); // default = 4</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Muon.setLineWidth(int lineWidth); // default = 4</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.ETMiss.setLineWidth(int lineWidth); // default = 8</font></tt></li> ! <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.S3D.setPointSize(int pointSize); // default = 3</font></tt></li> ! </ul> ! <li>JiveGeometry Options:</li> ! <ul> </ul> </ul> *************** *** 386,389 **** --- 386,393 ---- </p> + <p> + Some examples are available from the <em>Examples</em> panel on the GraXML GUI. + </p> + <hr> <h2><a name="Builders"></a>Builders</h2> *************** *** 391,398 **** Mapping between XML Schema and corresponding Generic Builders is done via <code>builders.properties</code>. On default, following Generic Builders are defined:<br> ! <tt><font color="#a20f0f"><pre> AGDD=net.hep.AGDD.GeometricModel.AGDDBuilder gdml=net.hep.geant4.GDML.GeometricModel.GDMLBuilder Event=net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder </pre></font></tt> </p> --- 395,403 ---- Mapping between XML Schema and corresponding Generic Builders is done via <code>builders.properties</code>. On default, following Generic Builders are defined:<br> ! <tt><font color="#a20f0f"><pre> AGDD=net.hep.AGDD.GeometricModel.AGDDBuilder gdml=net.hep.geant4.GDML.GeometricModel.GDMLBuilder Event=net.hep.atlas.graphics.JiveEvent.GeometricModel.JiveEventBuilder + AGeometry=net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder </pre></font></tt> </p> *************** *** 406,423 **** <li> Mouse Operations</li> <ol> ! <li>Shows About information as ToolTip.</li> ! <li>Exits. Writes also Transformations selected in 21.</li> <li>Goes Home. Resets the view into the standard one.</li> ! <li>Saves Jpg picture.</li> <li>Selects Perspective or Parallel Projection. Zooming doesn't have any ! effect in Parallel Projection, Scaling (14) doesn't have any effect in Perspective Projection.</li> <li>Selects color of Background.</li> ! <li>Selects Global or Local Operations (8). Global Operations are applied to the whole pictures, Local Operations are applied only to selected (Picked) objects. Some Global Operations don't have sense (Picking, GoTo). Local Operations are only partialy available for Optimised SceneGraph.</li> <li>Selects Operations connected with Picking. Operations connected with ! mouse buttons are described in the context sensitive help (17).</li> <ul> <li>Picking: Just picks objects and report their information in 18.</li> --- 411,430 ---- <li> Mouse Operations</li> <ol> ! <li>Shows <em>About</em> information as ToolTip.</li> ! <li>Exits. Writes also Transformations selected in 26.</li> <li>Goes Home. Resets the view into the standard one.</li> ! <li>Saves Jpg picture <code>GraXML.jpg</code>.</li> ! <li>Reloads current scene.</li> ! <li>Cleans current scene.</li> <li>Selects Perspective or Parallel Projection. Zooming doesn't have any ! effect in Parallel Projection, Scaling (16) doesn't have any effect in Perspective Projection.</li> <li>Selects color of Background.</li> ! <li>Selects Global or Local Operations (10). Global Operations are applied to the whole pictures, Local Operations are applied only to selected (Picked) objects. Some Global Operations don't have sense (Picking, GoTo). Local Operations are only partialy available for Optimised SceneGraph.</li> <li>Selects Operations connected with Picking. Operations connected with ! mouse buttons are described in the context sensitive help (21).</li> <ul> <li>Picking: Just picks objects and report their information in 18.</li> *************** *** 431,435 **** <li>Scales along any axes or zooms in/out (magnifying glass buttons). Scaling deforms objects.</li> ! <li>Defines value of one step performed by operations in 9-10-11.</li> <li>Changes color or transparency status of selected objects.</li> <li>Scales whole scene. It is much faster then zooming, but it doesn't --- 438,442 ---- <li>Scales along any axes or zooms in/out (magnifying glass buttons). Scaling deforms objects.</li> ! <li>Defines value of one step performed by operations in 11-12-13.</li> <li>Changes color or transparency status of selected objects.</li> <li>Scales whole scene. It is much faster then zooming, but it doesn't *************** *** 437,447 **** <li>Cuts the scene from front.</li> <li>Cuts the scene from back.</li> ! <!-- TBD li>Changes the high limit of the Cutting interval</li> <ul> <li>Makes it larger.</li> <li>Resets it to it original value.</li> <li>Makes it smaller.</li> ! </ul--> <li>Gives context sensitive help for actual actions defined for all buttons.</li> <li>Exposes Java scripting interface and gives feedback (for example about picked objects). While full access to running Java environment is available, --- 444,456 ---- <li>Cuts the scene from front.</li> <li>Cuts the scene from back.</li> ! <li>Changes the high limit of the Cutting interval</li> <ul> <li>Makes it larger.</li> <li>Resets it to it original value.</li> <li>Makes it smaller.</li> ! </ul> <li>Gives context sensitive help for actual actions defined for all buttons.</li> + <li>Informs about frames-per-second (fps) performance and memory occupied by SceneGraph.</li> + <li>Gives access to several examples included in distribution.</li> <li>Exposes Java scripting interface and gives feedback (for example about picked objects). While full access to running Java environment is available, *************** *** 450,455 **** See chapter about <a href="#Scripting%20Interface">Scripting Interface</a> for more information.</li> ! <li>Switches Envelope (Axis) on/off.</li> ! <li>Swiches interactive Clipper on/off.</li> <li>Allows for selecting three predefined Transformations (views). Left button selects current Transformation, right button applies the selected --- 459,465 ---- See chapter about <a href="#Scripting%20Interface">Scripting Interface</a> for more information.</li> ! <li>Switches Envelope components (28) on/off. The size of cylinder can be set by ! <code>Envelope.setLength(double)</code> and <code>Envelope.setRadius(double)</code>.</li> ! <li>Swiches interactive Clipper (29) on/off.</li> <li>Allows for selecting three predefined Transformations (views). Left button selects current Transformation, right button applies the selected *************** *** 459,463 **** <li>Allows for interactive Showing/Hiding of elements or elements groups. Clicking on the middle mouse button limits Showing to several level (defined ! by ConnectionsDB.setLevelLimit(int). In the case of an Optimised SceneGraph, the effect may be sometimes surprising for a user as elements are linked together (some are just reference to others) --- 469,473 ---- <li>Allows for interactive Showing/Hiding of elements or elements groups. Clicking on the middle mouse button limits Showing to several level (defined ! by <code>ConnectionsDB.setLevelLimit(int)</code>. In the case of an Optimised SceneGraph, the effect may be sometimes surprising for a user as elements are linked together (some are just reference to others) *************** *** 469,472 **** --- 479,484 ---- <li>Italic description - object is not visible.</li> </ul> + <li>Envelope components.</li> + <li>Clipper.</li> </ol> <li>KeyBord Operations</li> *************** *** 521,530 **** <li><a href="http://gdml.web.cern.ch/gdml/">GDML</a> Geometry Description Markup Language for Geant4 is supported.</li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/AGDD">AGDD</a> library is used to build AGDD Geometric Model.</li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/GDML">GDML</a> library is used to build GDML Geometric Model.</li> ! <li><a href="http://home.cern.ch/hrivnac/Activities/Packages/JiveEvent">JiveEvent</a> library is used to build JiveEvent Geometric Model.</li> <li>GraXML AGDD Model is used in <a href="http://www.star.bnl.gov/STAR/comp/simu/newsite/new_sim_framework.html">Star Detector Description</a> --- 533,544 ---- <li><a href="http://gdml.web.cern.ch/gdml/">GDML</a> Geometry Description Markup Language for Geant4 is supported.</li> ! <li><a href="http://cern.ch/hrivnac/Activities/Packages/AGDD">AGDD</a> library is used to build AGDD Geometric Model.</li> ! <li><a href="http://cern.ch/hrivnac/Activities/Packages/GDML">GDML</a> library is used to build GDML Geometric Model.</li> ! <li><a href="http://cern.ch/hrivnac/Activities/Packages/JiveEvent">JiveEvent</a> library is used to build JiveEvent Geometric Model.</li> + <li><a href="http://cern.ch/hrivnac/Activities/Packages/JiveGeometry">JiveGeometry</a> library is used to build + JiveGeometry Geometric Model.</li> <li>GraXML AGDD Model is used in <a href="http://www.star.bnl.gov/STAR/comp/simu/newsite/new_sim_framework.html">Star Detector Description</a> *************** *** 538,542 **** <li><a href="http://xml.apache.org/xerces2-j/">Xerces</a> - XML parser</li> <li><a href="http://java.sun.com/xml/jaxb">JAXB</a> - XML binder</li> - <li><a href="http://java.freehep.org">FreeHEP</a> - 3D objects</li> <li><a href="http://www-itg.lbl.gov/~hoschek/colt/">Colt</a> - mathematics</li> <li><a href="http://www.beanshell.org">Bean Shell</a> - command line and scripting</li> --- 552,555 ---- *************** *** 551,578 **** <li>1999:</li> <ul> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/1999/October/GraXML/">GraXML</a></b> (J.Hrivnac) during Atlas Database Workshop in Oct'99, CERN</li> </ul> <li>2000:</li> <ul> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2000/November/GraXML/">GraXML</a></b> (J.Hrivnac) during Atlas SW Workshop in Nov'00, CERN</li> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2000/September/GraphicsStatus/"> Graphics Status (& GraXML)</a></b> (J.Hrivnac) during Atlas SW Workshop in Aug'00, CERN</li> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2000/May/GraXML/">GraXML</a></b> (J.Hrivnac) during Atlas SW Workshop in May'00, LBNL</li> </ul> <li>2001:</li> <ul> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2001/September/GraXML">GraXML 3.xx - What's New</a></b> (J.Hrivnac) during Atlas SW Workshop in Sep'01, CERN</li> </ul> <li>2003:</li> <ul> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2003/December/GraXML">GraXML Update</a></b> (J.Hrivnac) during Atlas SW Workshop in Dec'03, CERN</li> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2003/March/GraXML">GraXML Modular Geometric Modeller</a></b> (J.Hrivnac) during CHEP in Mar'03, La Jolla</li> </ul> <li>2004:</li> <ul> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2004/September/GraXML">GraXML</a></b> (J.Hrivnac) during CHEP in Sep'04, Interlaken</li> </ul> <li>2006:</li> <ul> ! <li><b><a href="http://home.cern.ch/hrivnac/Activities/2006/February/GraXML">Using XML for Detector Geometry Description in the Virtual Monte Carlo Framework</a></b> (V.Fine, J.Lauret, M.Potekhin, J.Hrivnac) during CHEP in Feb'06, Mumbai</li> </ul> </ul> --- 564,591 ---- <li>1999:</li> <ul> ! <li><b><a href="http://cern.ch/hrivnac/Activities/1999/October/GraXML/">GraXML</a></b> (J.Hrivnac) during Atlas Database Workshop in Oct'99, CERN</li> </ul> <li>2000:</li> <ul> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2000/November/GraXML/">GraXML</a></b> (J.Hrivnac) during Atlas SW Workshop in Nov'00, CERN</li> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2000/September/GraphicsStatus/"> Graphics Status (& GraXML)</a></b> (J.Hrivnac) during Atlas SW Workshop in Aug'00, CERN</li> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2000/May/GraXML/">GraXML</a></b> (J.Hrivnac) during Atlas SW Workshop in May'00, LBNL</li> </ul> <li>2001:</li> <ul> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2001/September/GraXML">GraXML 3.xx - What's New</a></b> (J.Hrivnac) during Atlas SW Workshop in Sep'01, CERN</li> </ul> <li>2003:</li> <ul> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2003/December/GraXML">GraXML Update</a></b> (J.Hrivnac) during Atlas SW Workshop in Dec'03, CERN</li> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2003/March/GraXML">GraXML Modular Geometric Modeller</a></b> (J.Hrivnac) during CHEP in Mar'03, La Jolla</li> </ul> <li>2004:</li> <ul> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2004/September/GraXML">GraXML</a></b> (J.Hrivnac) during CHEP in Sep'04, Interlaken</li> </ul> <li>2006:</li> <ul> ! <li><b><a href="http://cern.ch/hrivnac/Activities/2006/February/GraXML">Using XML for Detector Geometry Description in the Virtual Monte Carlo Framework</a></b> (V.Fine, J.Lauret, M.Potekhin, J.Hrivnac) during CHEP in Feb'06, Mumbai</li> </ul> </ul> *************** *** 627,636 **** <i>Generaly tricky, as SceneGraph of a visible picture is compiled and often also optimised.</i></li> ! <li>*** Global stripifier to optimise geometry.<br> <i>Not simple as interferes with switchable connections. Can dramaticaly improve performance.</i></li> <li>Geometry Picking more precise.</li> <li>Transformation of ViewPlatform for speed.</li> ! <li>Configuration and View saving.</li> <li>VRML reading.<br> <i>Easy, but not high priority. GraXML is not VRML browser.</i></li> --- 640,649 ---- <i>Generaly tricky, as SceneGraph of a visible picture is compiled and often also optimised.</i></li> ! <li>Global stripifier to optimise geometry.<br> <i>Not simple as interferes with switchable connections. Can dramaticaly improve performance.</i></li> <li>Geometry Picking more precise.</li> <li>Transformation of ViewPlatform for speed.</li> ! <li>Configuration saving.</li> <li>VRML reading.<br> <i>Easy, but not high priority. GraXML is not VRML browser.</i></li> *************** *** 642,646 **** <li>Support for user-defined GUI plugins.</li> <li>Support for HepRep.</li> - <li>Integration with FreeHEP.</li> <li>Possibility to change coloring strategy at run-time (e.g. show which RecoPoints are associated with a track after picking).</li> --- 655,658 ---- *************** *** 649,653 **** <li>Interface between Java3D and OpenInventor.</li> <li>Overlap detection.</li> - <li>Tracking.</li> <li>Embedded editing of XML files.</li> <li>User color setting.</li> --- 661,664 ---- *************** *** 659,663 **** <li>Possibility to save binary internal format (so that long Geometric Model optimisation can be skipped).</li> ! <li>Building subset of Trees (using "contex" attribute).</li> <li>Command-line based positioning.</li> --- 670,674 ---- <li>Possibility to save binary internal format (so that long Geometric Model optimisation can be skipped).</li> ! <li>Building subset of Trees (using "context" attribute).</li> <li>Command-line based positioning.</li> *************** *** 667,671 **** <li>org.freehep.j3d.OutlinedShape3DFactory.setOutlineColor(null) doesn't work.</li> <li>Picking picks often several objects, which are close.</li> - <li>Only one XML file can be read simultaniously.</li> <li>Wireframe outline should disappear for transparent objects.</li> <li>Appearance optimisation resets Transparency.</li> --- 678,681 ---- *************** *** 932,935 **** --- 942,946 ---- <li>Support for both i386 and amd64 architectures on Linux.</li> <li>Performance monitoring (fps, mb) included.</li> + <li>Envelope improved.</li> </ul> <li>Bug fixes:</li> |
|
From: Julius H. <hr...@us...> - 2007-11-05 15:01:20
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29260/org/freehep/j3d Modified Files: ConeSegment.java Log Message: Cone more liberal Index: ConeSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/ConeSegment.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConeSegment.java 16 Jan 2007 14:56:25 -0000 1.2 --- ConeSegment.java 5 Nov 2007 15:01:21 -0000 1.3 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.3 2007/11/05 15:01:21 hrivnac + * Cone more liberal + * * Revision 1.2 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 91,98 **** * @param xminp The x inner radius at +z/2. * @param yminp The y inner radius at +z/2. ! * @param xmaxm The x outer radius at -z/2, xmaxm > xminm. ! * @param ymaxm The y outer radius at -z/2, ymaxm > yminm. ! * @param xmaxp The x outer radius at +z/2, xmaxp > xminp. ! * @param ymaxp The y outer radius at +z/2, ymaxp > yminp. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. --- 94,101 ---- * @param xminp The x inner radius at +z/2. * @param yminp The y inner radius at +z/2. ! * @param xmaxm The x outer radius at -z/2, xmaxm >= xminm. ! * @param ymaxm The y outer radius at -z/2, ymaxm >= yminm. ! * @param xmaxp The x outer radius at +z/2, xmaxp >= xminp. ! * @param ymaxp The y outer radius at +z/2, ymaxp >= yminp. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. *************** *** 132,137 **** * @param rminm The inner radius at -z/2. * @param rminp The inner radius at +z/2. ! * @param rmaxm The outer radius at -z/2, rmaxm > rminm. ! * @param rmaxp The outer radius at +z/2, rmaxp > rminp. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. --- 135,140 ---- * @param rminm The inner radius at -z/2. * @param rminp The inner radius at +z/2. ! * @param rmaxm The outer radius at -z/2, rmaxm >= rminm. ! * @param rmaxp The outer radius at +z/2, rmaxp >= rminp. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. *************** *** 166,170 **** /** Create tube segment. * @param rmin The inner radius. ! * @param rmax The outer radius at -z/2, rmax > rmin. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. --- 169,173 ---- /** Create tube segment. * @param rmin The inner radius. ! * @param rmax The outer radius at -z/2, rmax >= rmin. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. *************** *** 197,201 **** /** Create tube. * @param rmin The inner radius. ! * @param rmax The outer radius at -z/2, rmax > rmin. * @param l The length. * @param granularity The number of segments of curves approximations, granulariy > 2. --- 200,204 ---- /** Create tube. * @param rmin The inner radius. ! * @param rmax The outer radius at -z/2, rmax >= rmin. * @param l The length. * @param granularity The number of segments of curves approximations, granulariy > 2. *************** *** 254,261 **** * @param xminp The x inner radius at +z/2. * @param yminp The y inner radius at +z/2. ! * @param xmaxm The x outer radius at -z/2, xmaxm > xminm. ! * @param ymaxm The y outer radius at -z/2, ymaxm > yminm. ! * @param xmaxp The x outer radius at +z/2, xmaxp > xminp. ! * @param ymaxp The y outer radius at +z/2, ymaxp > yminp. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. --- 257,264 ---- * @param xminp The x inner radius at +z/2. * @param yminp The y inner radius at +z/2. ! * @param xmaxm The x outer radius at -z/2, xmaxm >= xminm. ! * @param ymaxm The y outer radius at -z/2, ymaxm >= yminm. ! * @param xmaxp The x outer radius at +z/2, xmaxp >= xminp. ! * @param ymaxp The y outer radius at +z/2, ymaxp >= yminp. * @param l The length. * @param phimin The starting azimutal angle [rad], 0-2*pi. *************** *** 282,289 **** phimax = Equalator.correct(phimax, 2*PI); // Check preconditins ! if (! (xmaxm > xminm && ! ymaxm > yminm && ! xmaxp > xminp && ! ymaxp > yminp && phimin <= 2*PI && phimin >= 0 && phimax <= 2*PI && phimax >= 0 && --- 285,292 ---- phimax = Equalator.correct(phimax, 2*PI); // Check preconditins ! if (! (xmaxm >= xminm && ! ymaxm >= yminm && ! xmaxp >= xminp && ! ymaxp >= yminp && phimin <= 2*PI && phimin >= 0 && phimax <= 2*PI && phimax >= 0 && *************** *** 292,296 **** xminm + ", " + yminm + ", " + xmaxm + ", " + ymaxm + ", " + xminp + ", " + yminp + ", " + xmaxp + ", " + ymaxp + ", " + phimin + ", " + phimax + ")" + " are illegal, they should satisfy following conditions:" + ! " xminm < xmaxm, yminm < ymaxm, xminp < xmaxp, yminp < ymaxp, 0 <= phimin < phimax <= 2*pi"); } if (! (granularity > 2)) { --- 295,299 ---- xminm + ", " + yminm + ", " + xmaxm + ", " + ymaxm + ", " + xminp + ", " + yminp + ", " + xmaxp + ", " + ymaxp + ", " + phimin + ", " + phimax + ")" + " are illegal, they should satisfy following conditions:" + ! " xminm <= xmaxm, yminm <= ymaxm, xminp <= xmaxp, yminp <= ymaxp, 0 <= phimin < phimax <= 2*pi"); } if (! (granularity > 2)) { |
|
From: Julius H. <hr...@us...> - 2007-11-05 15:00:49
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29038/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: Jet0.java JiveEventBuilder.java Particle.java Log Message: Jets from 0,0,0; Etmis-z = 0 Index: JiveEventBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/JiveEventBuilder.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JiveEventBuilder.java 26 Oct 2007 16:28:30 -0000 1.11 --- JiveEventBuilder.java 5 Nov 2007 15:00:49 -0000 1.12 *************** *** 23,26 **** --- 23,29 ---- * <pre> * $Log$ + * Revision 1.12 2007/11/05 15:00:49 hrivnac + * Jets from 0,0,0; Etmis-z = 0 + * * Revision 1.11 2007/10/26 16:28:30 hrivnac * Muon and Jets added *************** *** 83,88 **** * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveEvent/Test/data/JiveXML_5200_01388.xml", ! "net/hep/atlas/graphics/JiveEvent/Test/data/JiveXML_5200_01391_forJulius.xml"}; return demos; } --- 86,90 ---- * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveEvent/Test/data/JiveXML_5200_01391_forJulius.xml"}; return demos; } Index: Particle.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Particle.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Particle.java 26 Oct 2007 23:12:33 -0000 1.5 --- Particle.java 5 Nov 2007 15:00:49 -0000 1.6 *************** *** 59,62 **** --- 59,65 ---- * <pre> * $Log$ + * Revision 1.6 2007/11/05 15:00:49 hrivnac + * Jets from 0,0,0; Etmis-z = 0 + * * Revision 1.5 2007/10/26 23:12:33 hrivnac * improved *************** *** 120,123 **** --- 123,127 ---- phis[i] = 2 * (float)PI + phis[i]; } + pts[i] *= _ptFactor; x = pts[i] * cos(phis[i]); y = pts[i] * sin(phis[i]); *************** *** 146,152 **** 0, 0)); ! lineArray.setCoordinate(1, new Point3d(x / builder().norm(), ! y / builder().norm(), ! z / builder().norm())); lineArray.setColor(0, color); lineArray.setColor(1, color); --- 150,156 ---- 0, 0)); ! lineArray.setCoordinate(1, new Point3d(x, ! y, ! z)); lineArray.setColor(0, color); lineArray.setColor(1, color); *************** *** 163,167 **** * @param type The particle' type (name). * @param storeGateKey The corresponding <em>StoreGate</em> key. - * @param et The particle' <em>et</em>s. * @param etx The particle' <em>etx</em>s. * @param ety The particle' <em>ety</em>s. */ --- 167,170 ---- *************** *** 169,178 **** protected void construct(String type, String storeGateKey, - EtType et, EtxType etx, EtyType ety) { // Get Particle properties - float[] ets = floats(et.getValue()); float[] etxs = floats(etx.getValue()); float[] etys = floats(ety.getValue()); --- 172,179 ---- *************** *** 188,194 **** Material material; Color3f color; ! double x = etxs[0]; ! double y = etys[0]; ! double z = sqrt(ets[0] * ets[0] - x * x - y * y);; // ColorList is set => get Appearance from Color if (color(0) == null) { --- 189,195 ---- Material material; Color3f color; ! double x = etxs[0] * _ptFactor; ! double y = etys[0] * _ptFactor; ! double z = 0; // ColorList is set => get Appearance from Color if (color(0) == null) { *************** *** 215,221 **** 0, 0)); ! lineArray.setCoordinate(1, new Point3d(x / builder().norm(), ! y / builder().norm(), ! z / builder().norm())); lineArray.setColor(0, color); lineArray.setColor(1, color); --- 216,222 ---- 0, 0)); ! lineArray.setCoordinate(1, new Point3d(x, ! y, ! z)); lineArray.setColor(0, color); lineArray.setColor(1, color); *************** *** 252,255 **** --- 253,267 ---- private static int _lineWidth = 2; + /** Set factor for magnifying <code>pt</code> + * to get segment length. + * @param ptFactor The factor for magnifying <code>pt</code> + * to get segment length, + * the default is <code>0.01</code>. */ + public static final void setPtFactor(float ptFactor) { + _ptFactor = ptFactor; + } + + private static float _ptFactor = 0.01f; + /** Logging . */ private static Logger log = Logger.getLogger(Particle.class); Index: Jet0.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Jet0.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jet0.java 26 Oct 2007 23:12:33 -0000 1.3 --- Jet0.java 5 Nov 2007 15:00:49 -0000 1.4 *************** *** 49,52 **** --- 49,55 ---- * <pre> * $Log$ + * Revision 1.4 2007/11/05 15:00:49 hrivnac + * Jets from 0,0,0; Etmis-z = 0 + * * Revision 1.3 2007/10/26 23:12:33 hrivnac * improved *************** *** 148,152 **** appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); ! float rho = _rho / (float) builder().norm(); float x = _rho * (float)cos(phi); float y = _rho * (float)sin(phi); --- 151,155 ---- appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); ! float rho = _rho / (float) builder().norm(); float x = _rho * (float)cos(phi); float y = _rho * (float)sin(phi); *************** *** 180,183 **** --- 183,187 ---- * @param pt The pt of the Jet0. * @return The {@link ConeSegment} representing the Jet0. */ + // TBD: simplify private Shape3D drawCone(String name, float x, *************** *** 193,197 **** ConeSegment cone = new ConeSegment(0, 0, ! _cell, _cell * (1f + delR / r), delR, --- 197,201 ---- ConeSegment cone = new ConeSegment(0, 0, ! 0, _cell * (1f + delR / r), delR, *************** *** 208,214 **** m.mul(m0); TransformGroup it = new TransformGroup(new Transform3D(m, ! new Vector3d(x + delX / 2, ! y + delY / 2, ! z + delZ / 2), 1)); tg().addChild(it); --- 212,218 ---- m.mul(m0); TransformGroup it = new TransformGroup(new Transform3D(m, ! new Vector3d(delX / 2, ! delY / 2, ! delZ / 2), 1)); tg().addChild(it); *************** *** 221,225 **** * @param ptFactor The factor for magnifying <code>pt</code> * to get {@link ConeSegment} length, ! * the default is <code>0.01</code>. */ public static final void setPtFactor(float ptFactor) { _ptFactor = ptFactor; --- 225,229 ---- * @param ptFactor The factor for magnifying <code>pt</code> * to get {@link ConeSegment} length, ! * the default is <code>0.02</code>. */ public static final void setPtFactor(float ptFactor) { _ptFactor = ptFactor; *************** *** 228,239 **** /** Set <code>pt</code> cut. Jet0s with smaller pt are not drawn. * @param ptCut The minimal pt of the Jet0 to be drawn, ! * the default is <code>0.1</code>. */ public static final void setPtCut(float ptCut) { _ptCut = ptCut; } ! private static float _ptFactor = 0.05f; ! private static float _ptCut = 0.1f; private static float _rho = 0.2f; --- 232,243 ---- /** Set <code>pt</code> cut. Jet0s with smaller pt are not drawn. * @param ptCut The minimal pt of the Jet0 to be drawn, ! * the default is <code>0.0</code>. */ public static final void setPtCut(float ptCut) { _ptCut = ptCut; } ! private static float _ptFactor = 0.02f; ! private static float _ptCut = 0.0f; private static float _rho = 0.2f; |
|
From: Julius H. <hr...@us...> - 2007-11-05 15:00:49
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29038/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Modified Files: ETMis.java Log Message: Jets from 0,0,0; Etmis-z = 0 Index: ETMis.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/ETMis.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ETMis.java 26 Oct 2007 18:52:00 -0000 1.1 --- ETMis.java 5 Nov 2007 15:00:49 -0000 1.2 *************** *** 58,61 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.2 2007/11/05 15:00:49 hrivnac + * Jets from 0,0,0; Etmis-z = 0 + * * Revision 1.1 2007/10/26 18:52:00 hrivnac * ETMis added *************** *** 83,87 **** construct("ETMiss", eTMis.getStoreGateKey(), - eTMis.getEt(), eTMis.getEtx(), eTMis.getEty()); --- 86,89 ---- |
![http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.gif"/>](http://cern.ch/hrivnac/Activities/Packages/WebStart/GraXML/GraXML.gif"/>){kind=link}
![http://javadesktop.org/javanet_images/webstart.small.gif"](http://javadesktop.org/javanet_images/webstart.small.gif"){kind=link}