graxml-commit Mailing List for GraXML (Page 24)
Brought to you by:
hrivnac
Menu
▾
▴
graxml-commit — CVS commit notifications of GraXML
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(6) |
Jun
(2) |
Jul
|
Aug
(12) |
Sep
(32) |
Oct
(41) |
Nov
(16) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(10) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(12) |
Jul
|
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(169) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(100) |
Nov
(14) |
Dec
(10) |
| 2008 |
Jan
(37) |
Feb
(4) |
Mar
(10) |
Apr
(73) |
May
(22) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julius H. <hr...@us...> - 2005-10-07 18:59:11
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10145/net/hep/graphics/GraXML/Test Modified Files: Elements-convert.bsh Elements-display.bsh Options-convert.bsh Options-display.bsh Log Message: tests updated Index: Elements-convert.bsh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test/Elements-convert.bsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Elements-convert.bsh 30 Mar 2005 12:44:32 -0000 1.1 --- Elements-convert.bsh 7 Oct 2005 18:59:03 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 18:59:03 hrivnac + * tests updated + * * Revision 1.1 2005/03/30 12:44:32 hrivnac * GraXML introduced *************** *** 51,56 **** --- 54,61 ---- "AliSolids.agdd", "BinaryOperators.agdd", + "Colors.agdd", "Copies.agdd", "Envelopes.agdd", + "Identifiers.agdd", "Including.agdd", "MultiplePositioners.agdd", Index: Options-display.bsh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test/Options-display.bsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Options-display.bsh 30 Mar 2005 12:44:32 -0000 1.1 --- Options-display.bsh 7 Oct 2005 18:59:03 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 18:59:03 hrivnac + * tests updated + * * Revision 1.1 2005/03/30 12:44:32 hrivnac * GraXML introduced *************** *** 52,57 **** --- 55,62 ---- "BooleansWithTransformation.gdml", "BinaryOperators.agdd", + "Colors.agdd", "Copies.agdd", "Envelopes.agdd", + "Identifiers.agdd", "Including.agdd", "MultiplePositioners.agdd", Index: Options-convert.bsh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test/Options-convert.bsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Options-convert.bsh 30 Mar 2005 12:44:32 -0000 1.1 --- Options-convert.bsh 7 Oct 2005 18:59:03 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 18:59:03 hrivnac + * tests updated + * * Revision 1.1 2005/03/30 12:44:32 hrivnac * GraXML introduced *************** *** 52,57 **** --- 55,62 ---- "BooleansWithTransformation.gdml", "BinaryOperators.agdd", + "Colors.agdd", "Copies.agdd", "Envelopes.agdd", + "Identifiers.agdd", "Including.agdd", "MultiplePositioners.agdd", Index: Elements-display.bsh =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Test/Elements-display.bsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Elements-display.bsh 30 Mar 2005 12:44:32 -0000 1.1 --- Elements-display.bsh 7 Oct 2005 18:59:03 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 18:59:03 hrivnac + * tests updated + * * Revision 1.1 2005/03/30 12:44:32 hrivnac * GraXML introduced *************** *** 57,62 **** --- 60,67 ---- "AliSolids.agdd", "BinaryOperators.agdd", + "Colors.agdd", "Copies.agdd", "Envelopes.agdd", + "Identifiers.agdd", "Including.agdd", "MultiplePositioners.agdd", |
|
From: Julius H. <hr...@us...> - 2005-10-07 17:24:30
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13067/ant Modified Files: build.xml Log Message: standard Colors included Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 6 Oct 2005 20:48:11 -0000 1.5 --- build.xml 7 Oct 2005 17:24:20 -0000 1.6 *************** *** 210,214 **** net.hep.AGDD.TGeoModel*, net.hep.AGDD.TGeoModel.Reps*, ! net.hep.AGDD.Test*" sourcepath="${src}:${build}" destdir="${doc}/JavaDoc" --- 210,215 ---- net.hep.AGDD.TGeoModel*, net.hep.AGDD.TGeoModel.Reps*, ! net.hep.AGDD.Test*, ! net.hep.AGDD.Utils*" sourcepath="${src}:${build}" destdir="${doc}/JavaDoc" *************** *** 229,232 **** --- 230,234 ---- <group title="TGeo Model" packages="net.hep.AGDD.TGeoModel*"/> <group title="Test" packages="net.hep.AGDD.Test*"/> + <group title="Utilities" packages="net.hep.AGDD.Utils*"/> <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> <link href="http://java.sun.com/products/java-media/3D/forDevelopers/J3D_1_3_API/j3dapi/"/> |
|
From: Julius H. <hr...@us...> - 2005-10-07 17:24:28
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13067/src/net/hep/AGDD/GeometricModel Modified Files: Evaluator.java Log Message: standard Colors included Index: Evaluator.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Evaluator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Evaluator.java 13 May 2005 14:57:52 -0000 1.2 --- Evaluator.java 7 Oct 2005 17:24:20 -0000 1.3 *************** *** 1,6 **** package net.hep.AGDD.GeometricModel; - // Generic Model - // GraXML import net.hep.graphics.GraXML.MasterBuilder; --- 1,4 ---- *************** *** 38,41 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 17:24:20 hrivnac + * standard Colors included + * * Revision 1.2 2005/05/13 14:57:52 hrivnac * Evaluator scales to 1m |
|
From: Julius H. <hr...@us...> - 2005-10-07 17:24:28
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13067/src/net/hep/AGDD/Data Modified Files: StandardColors.agdd Log Message: standard Colors included Index: StandardColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardColors.agdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StandardColors.agdd 7 Oct 2005 15:53:46 -0000 1.1 --- StandardColors.agdd 7 Oct 2005 17:24:20 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.2 2005/10/07 17:24:20 hrivnac + standard Colors included + Revision 1.1 2005/10/07 15:53:46 hrivnac Colors introduced *************** *** 17,26 **** <!-- Standards ================================================================ --> ! ! <color name="white" rgb="255; 255; 255"/> ! <color name="black" rgb=" 0; 0; 0"/> ! <color name="red" rgb="255; 0; 0"/> ! <color name="green" rgb=" 0; 255; 0"/> <color name="blue" rgb=" 0; 0; 255"/> <!-- Atlantis ================================================================= --> --- 20,36 ---- <!-- Standards ================================================================ --> ! <color name="blue" rgb=" 0; 0; 255"/> + <color name="cyan" rgb=" 0; 255; 255"/> + <color name="darkGray" rgb=" 64; 64; 64"/> + <color name="gray" rgb="128; 128; 128"/> + <color name="green" rgb=" 0; 255; 0"/> + <color name="lightGray" rgb="192; 192; 192"/> + <color name="magenta" rgb="255; 0; 255"/> + <color name="orange" rgb="255; 200; 0"/> + <color name="pink" rgb="255; 175; 175"/> + <color name="red" rgb="255; 0; 0"/> + <color name="white" rgb="255; 255; 255"/> + <color name="yellow" rgb="255; 255; 0"/> <!-- Atlantis ================================================================= --> |
|
From: Julius H. <hr...@us...> - 2005-10-07 17:24:28
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13067/src/net/hep/AGDD/Utils Added Files: ColorsDumper.java package.html Log Message: standard Colors included --- NEW FILE: package.html --- <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> <head> <title>AGDD - Atlas Generic Detector Description (GraXML library) - Utilities</title> </head> <body> AGDD - Atlas Generic Detector Description (GraXML library) - Utilities. </body> </html> --- NEW FILE: ColorsDumper.java --- package net.hep.AGDD.Utils; // Java import java.awt.Color; import static java.awt.Color.*; /** <code>ColorsDumper</code> dumps standard Java {@link Color}s * into AGDD colormap file. * <p><font color="#880088"> * <pre> * $Log: ColorsDumper.java,v $ * Revision 1.1 2005/10/07 17:24:20 hrivnac * standard Colors included * * </pre> * </font></p> * @version $Id: ColorsDumper.java,v 1.1 2005/10/07 17:24:20 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class ColorsDumper { /** Dump all standard {@link Color}s into stdout. */ public static void main(String[] args) { dump("black" , black ); dump("blue" , blue ); dump("cyan" , cyan ); dump("darkGray" , darkGray ); dump("gray" , gray ); dump("green" , green ); dump("lightGray", lightGray); dump("magenta" , magenta ); dump("orange" , orange ); dump("pink" , pink ); dump("red" , red ); dump("white" , white ); dump("yellow" , yellow ); } /** Dump one standard {@link Color} into stdout. * @param name The color's name. * @param color The {@link Color}. */ public static void dump(String name, Color color) { System.out.println("<color name=\"" + name + "\"\t\trgb=\"" + color.getRed() + "; " + color.getGreen() + "; " + color.getBlue() + "\"/>"); } } |
|
From: Julius H. <hr...@us...> - 2005-10-07 17:22:42
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12792/Utils Log Message: Directory /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Utils added to the repository |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:54:55
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22602/src/net/hep/graphics/GraXML Modified Files: MasterBuilder.java Log Message: Colors introduced Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MasterBuilder.java 30 Mar 2005 12:44:29 -0000 1.1 --- MasterBuilder.java 7 Oct 2005 15:54:15 -0000 1.2 *************** *** 51,54 **** --- 51,57 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 15:54:15 hrivnac + * Colors introduced + * * Revision 1.1 2005/03/30 12:44:29 hrivnac * GraXML introduced *************** *** 291,300 **** /** Get {@link Appearance} according to defined * strategy. */ ! public final Appearance appearance(String name) { return appearance(name, ""); } /** Get {@link Appearance} according to defined strategy. ! * @param name The name of the element t get {@link Appearance} for. * @param material The required material name. * @return The {@link Appearance} chosen according to the defined --- 294,303 ---- /** Get {@link Appearance} according to defined * strategy. */ ! public Appearance appearance(String name) { return appearance(name, ""); } /** Get {@link Appearance} according to defined strategy. ! * @param name The name of the element to get {@link Appearance} for. * @param material The required material name. * @return The {@link Appearance} chosen according to the defined *************** *** 322,326 **** // create it and register if (a == null) { ! a = new SelectedColor(material); a.setCapability(Appearance.ALLOW_MATERIAL_READ); // In case of ineractive SceneGraph, Appearance should be changeable --- 325,375 ---- // create it and register if (a == null) { ! a = new SelectedColor(); ! a.setCapability(Appearance.ALLOW_MATERIAL_READ); ! // In case of ineractive SceneGraph, Appearance should be changeable ! if (Interacter.interactivity()) { ! a.setCapability(Appearance.ALLOW_TRANSPARENCY_ATTRIBUTES_READ); ! a.setCapability(Appearance.ALLOW_TRANSPARENCY_ATTRIBUTES_WRITE); ! a.setCapability(Appearance.ALLOW_POLYGON_ATTRIBUTES_READ); ! a.setCapability(Appearance.ALLOW_POLYGON_ATTRIBUTES_WRITE); ! a.setCapability(Appearance.ALLOW_RENDERING_ATTRIBUTES_READ); ! a.setCapability(Appearance.ALLOW_RENDERING_ATTRIBUTES_WRITE); ! } ! optDB().addAppearance(key, a); ! } ! // Return ! return a; ! } ! ! /** Get {@link Appearance} according to specified color. ! * @param name The name of the element to get {@link Appearance} for. ! * @param red The red component <0; 255>. ! * @param green The green component <0; 255>. ! * @param blue The blue component <0; 255>. ! * @param transparency The level of transparency <0.0; 1.0>. ! * @return The {@link Appearance} chosen according to the defined ! * strategy and supplied patrameters. */ ! // TBD: refactor ! public final Appearance appearance(String name, ! short red, ! short green, ! short blue, ! float transparency) { ! // No Appearance in non-graphical mode ! if (!GlobalOptions.graphical()) { ! return null; ! } ! // Appearance are stored with keys ! String key = name; ! // Replicas of he same object have the same color ! if (key.contains(";")) { ! key = key.substring(0, key.indexOf(";")); ! } ! // Try to get Appearance from the optimisation database ! Appearance a = optDB().getAppearance(key); ! // If Appearance is not yet in the optimisation database, ! // create it and register ! if (a == null) { ! a = new SelectedColor(red, green, blue, transparency); a.setCapability(Appearance.ALLOW_MATERIAL_READ); // In case of ineractive SceneGraph, Appearance should be changeable |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:54:53
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22602/src/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: Colors introduced Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Guide.html 29 Sep 2005 15:23:28 -0000 1.7 --- Guide.html 7 Oct 2005 15:54:16 -0000 1.8 *************** *** 882,886 **** <li>New features:</li> <ul> ! <li>...</li> </ul> <li>Bug fixes:</li> --- 882,886 ---- <li>New features:</li> <ul> ! <li>Color can be explicitely set from a specific builder.</li> </ul> <li>Bug fixes:</li> |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:54:52
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22602/src/net/hep/graphics/GraXML/Java3DExtensions Modified Files: SelectedColor.java Log Message: Colors introduced Index: SelectedColor.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/SelectedColor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SelectedColor.java 25 Aug 2005 15:26:23 -0000 1.2 --- SelectedColor.java 7 Oct 2005 15:54:15 -0000 1.3 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 15:54:15 hrivnac + * Colors introduced + * * Revision 1.2 2005/08/25 15:26:23 hrivnac * customised palette is reused after reload *************** *** 56,61 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: make attributes choosable - // TBD: use Enum public final class SelectedColor extends Appearance { --- 59,62 ---- *************** *** 64,93 **** /** Generate using random colors. */ public SelectedColor() { - new SelectedColor("any"); - } - - /** Generate special features for some materials. - * Currently supported are: - * <ul> - * <li><b>*Air*</b>: transparent</li> - * <li><b>*Vacuum*</b>: transparent</li> - * <li><b>*Line*</b>: bright</li> - * </ul> - * @param substance The name of material to be used to select colors. */ - public SelectedColor(String substance) { setColor(); ! if (substance.indexOf("Vacuum") > -1) { // TBD: Java 1.5.0 ! setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, ! 0.6f)); ! } ! if (substance.indexOf("Air") > -1) { // TBD: Java 1.5.0 ! setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, ! 0.3f)); ! } ! if (substance.indexOf("Line") > -1) { // TBD: Java 1.5.0 ! _color.scale(4); ! _material.setDiffuseColor(_color); ! _material.setEmissiveColor(_color); ! } if (_lineAntiAliasing) { setLineAttributes(new LineAttributes(1, --- 65,90 ---- /** Generate using random colors. */ public SelectedColor() { setColor(); ! init(); ! } ! ! /** Generate using specified colors. ! * @param red The red component <0; 255>. ! * @param green The green component <0; 255>. ! * @param blue The blue component <0; 255>. ! * @param transparency The level of transparency <0.0; 1.0>. */ ! public SelectedColor(short red, ! short green, ! short blue, ! float transparency) { ! setColor(red, green, blue); ! setTransparencyAttributes(new TransparencyAttributes(transparency == 0 ? TransparencyAttributes.NONE ! : TransparencyAttributes.NICEST, ! transparency)); ! init(); ! } ! ! /** Initialise common properties. */ ! private void init() { if (_lineAntiAliasing) { setLineAttributes(new LineAttributes(1, *************** *** 97,100 **** --- 94,98 ---- } + // Color Setting ------------------------------------------------------------- *************** *** 108,113 **** final float total = red + green + blue; _color = new Color3f(red / total, ! green / total, ! blue / total); } // Not random --- 106,111 ---- final float total = red + green + blue; _color = new Color3f(red / total, ! green / total, ! blue / total); } // Not random *************** *** 116,119 **** --- 114,143 ---- } // Setup + color2material(); + } + + /** Set colors explicitely. + * @param red The red component <0; 255>. + * @param green The green component <0; 255>. + * @param blue The blue component <0; 255>. */ + private final void setColor(short red, + short green, + short blue) { + // Specified + float total = red + green + blue; + if (total == 0f) { + _color = new Color3f(0f, 0f, 0f); + } + else { + _color = new Color3f(red / total, + green / total, + blue / total); + } + // Setup + color2material(); + } + + /** Map {@link Color3f} to {@link Material}. */ + private void color2material() { _material = new Material(); _material.setAmbientColor(_color); *************** *** 122,126 **** _material.setShininess(20); setMaterial(_material); ! } private Color3f _color; --- 146,150 ---- _material.setShininess(20); setMaterial(_material); ! } private Color3f _color; |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:54:04
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/Data Modified Files: StandardMaterials.agdd Added Files: StandardColors.agdd Log Message: Colors introduced --- NEW FILE: StandardColors.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- AGDD Standard Colors (to use with XInclude) --> <!-- $Log: StandardColors.agdd,v $ Revision 1.1 2005/10/07 15:53:46 hrivnac Colors introduced --> <!-- @version $Id: StandardColors.agdd,v 1.1 2005/10/07 15:53:46 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <colormap name="default_colormap" version="$Id: StandardColors.agdd,v 1.1 2005/10/07 15:53:46 hrivnac Exp $" date="2005-10-07" author="Julius Hrivnac" DTD_version="v7"> <!-- Standards ================================================================ --> <color name="white" rgb="255; 255; 255"/> <color name="black" rgb=" 0; 0; 0"/> <color name="red" rgb="255; 0; 0"/> <color name="green" rgb=" 0; 255; 0"/> <color name="blue" rgb=" 0; 0; 255"/> <!-- Atlantis ================================================================= --> <color name="atlantis_0" rgb=" 0; 204; 255"/> <color name="atlantis_1" rgb=" 0; 0; 0"/> <color name="atlantis_2" rgb="255; 0; 0"/> <color name="atlantis_3" rgb="255; 210; 0"/> <color name="atlantis_4" rgb=" 0; 0; 0"/> <color name="atlantis_5" rgb=" 0; 255; 0"/> <color name="atlantis_6" rgb=" 0; 0; 255"/> <color name="atlantis_7" rgb="153; 153; 153"/> <color name="atlantis_8" rgb="255; 255; 255"/> <color name="atlantis_9" rgb=" 0; 255; 0"/> <color name="atlantis_10" rgb="255; 255; 0"/> <color name="atlantis_11" rgb="255; 115; 0"/> <color name="atlantis_12" rgb="255; 0; 0"/> <color name="atlantis_13" rgb="255; 0; 255"/> <color name="atlantis_14" rgb=" 0; 255; 255"/> <color name="atlantis_15" rgb="102; 128; 255"/> <color name="atlantis_16" rgb="102; 128; 255"/> <!-- Atlantis - Solid ========================================================= --> <color name="solidatlantis_0" rgb=" 0; 255; 255"/> <color name="solidatlantis_1" rgb=" 0; 0; 0"/> <color name="solidatlantis_2" rgb="255; 102; 0"/> <color name="solidatlantis_3" rgb="255; 210; 0"/> <color name="solidatlantis_4" rgb="153; 153; 153"/> <color name="solidatlantis_5" rgb="130; 200; 130"/> <color name="solidatlantis_6" rgb=" 0; 0; 20"/> <color name="solidatlantis_7" rgb="153; 153; 153"/> <color name="solidatlantis_8" rgb="255; 255; 255"/> <color name="solidatlantis_9" rgb=" 0; 255; 0"/> <color name="solidatlantis_10" rgb="255; 255; 0"/> <color name="solidatlantis_11" rgb="255; 115; 0"/> <color name="solidatlantis_12" rgb="255; 0; 0"/> <color name="solidatlantis_13" rgb="255; 0; 255"/> <color name="solidatlantis_14" rgb=" 0; 204; 255"/> <color name="solidatlantis_15" rgb="102; 128; 255"/> <color name="solidatlantis_16" rgb="102; 128; 255"/> </colormap> Index: StandardMaterials.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardMaterials.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StandardMaterials.agdd 6 Oct 2005 20:48:11 -0000 1.2 --- StandardMaterials.agdd 7 Oct 2005 15:53:46 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:46 hrivnac + Colors introduced + Revision 1.2 2005/10/06 20:48:11 hrivnac Identifiers example added *************** *** 18,27 **** DTD_version="v7"> ! <!-- Isotops ================================================================== --> ! <isotope name="Bor_10" z="5" n="10" a="10" /> ! <isotope name="Bor_11" z="5" n="11" a="11" /> ! <!-- Elements ================================================================= --> <element symbol="H" ><atom zeff=" 1.0" aweight="1.00797" /></element> --- 21,30 ---- DTD_version="v7"> ! <!-- isotops ================================================================== --> ! <isotope name="Bor_10" z="5" n="10" a="10"/> ! <isotope name="Bor_11" z="5" n="11" a="11"/> ! <!-- elements ================================================================= --> <element symbol="H" ><atom zeff=" 1.0" aweight="1.00797" /></element> *************** *** 95,99 **** <element symbol="Tm"><atom zeff="69.0" aweight="168.934" /></element> <element symbol="Yb"><atom zeff="70.0" aweight="173.04" /></element> ! <element symbol="Lu"><atom zeff="71.0" aweight="174.97" /></element> <element symbol="Hf"><atom zeff="72.0" aweight="178.49" /></element> <element symbol="Ta"><atom zeff="73.0" aweight="180.948" /></element> --- 98,102 ---- <element symbol="Tm"><atom zeff="69.0" aweight="168.934" /></element> <element symbol="Yb"><atom zeff="70.0" aweight="173.04" /></element> ! <element symbol="Lu"><atom zeff="71.0" aweight="174.97" /></element> <element symbol="Hf"><atom zeff="72.0" aweight="178.49" /></element> <element symbol="Ta"><atom zeff="73.0" aweight="180.948" /></element> *************** *** 120,326 **** <element symbol="B"> ! <addisotope name="Bor_10" natoms="2" /> ! <addisotope name="Bor_11" natoms="8" /> </element> ! <!-- Materials ================================================================ --> ! <material name="Hydrogen" density="0.0708" state="gas" > <addelement name="H" natoms="1"/> </material> ! <material name="Deuterium" density="0.162" > <addelement name="D" natoms="1"/> </material> ! <material name="Helium" density="0.125" > ! <addelement name="He" natoms="1" /> </material> ! <material name="Lithium" density="0.534" > ! <addelement name="Li" natoms="1" /> </material> ! <material name="Beryllium" density="1.8480" > ! <addelement name="Be" natoms="1" /> </material> ! <material name="Boron" density="2.34" > ! <addelement name="B" natoms="1" /> </material> ! <material name="Carbon" density="2.2650" > ! <addelement name="C" natoms="1" /> </material> ! <material name="Nitrogen" density="0.808" > ! <addelement name="N" natoms="1" /> </material> <material name="Oxygen" density="0.00143"> ! <addelement name="O" natoms="1" /> </material> ! <material name="Fluorine" density="1.1080" > ! <addelement name="F" natoms="1" /> </material> ! <material name="Neon" density="1.2070" > ! <addelement name="Ne" natoms="1" /> </material> ! <material name="Sodium" density="0.969" > ! <addelement name="Na" natoms="1" /> </material> ! <material name="Magnesium" density="1.735" > ! <addelement name="Mg" natoms="1" /> </material> ! <material name="Aluminum" density="2.700" > ! <addelement name="Al" natoms="1" /> </material> ! <material name="Silicon" density="2.33" > ! <addelement name="Si" natoms="1" /> </material> ! <material name="Phosphorus" density="1.82" > ! <addelement name="P" natoms="1" /> </material> ! <material name="Sulfur" density="2.07" > ! <addelement name="S" natoms="1" /> </material> ! <material name="Chlorine" density="1.56" > ! <addelement name="Cl" natoms="1" /> </material> <material name="Argon" density="0.001639"> ! <addelement name="Ar" natoms="1" /> </material> ! <material name="Potassium" density="0.860" > ! <addelement name="K" natoms="1" /> </material> ! <material name="Calcium" density="1.55" > ! <addelement name="Ca" natoms="1" /> </material> ! <material name="Scandium" density="2.98" > ! <addelement name="Sc" natoms="1" /> </material> ! <material name="Titanium" density="4.53" > ! <addelement name="Ti" natoms="1" /> </material> ! <material name="Vanadium" density="6.10" > ! <addelement name="V" natoms="1" /> </material> ! <material name="Chromium" density="7.18" > ! <addelement name="Cr" natoms="1" /> </material> ! <material name="Manganese" density="7.43" > ! <addelement name="Mn" natoms="1" /> </material> ! <material name="Iron" density="7.87" > ! <addelement name="Fe" natoms="1" /> </material> ! <material name="Cobalt" density="8.90" > ! <addelement name="Co" natoms="1" /> </material> ! <material name="Nickel" density="8.876" > ! <addelement name="Ni" natoms="1" /> </material> ! <material name="Copper" density="8.96" > ! <addelement name="Cu" natoms="1" /> </material> ! <material name="Zinc" density="7.112" > ! <addelement name="Zn" natoms="1" /> </material> ! <material name="Gallium" density="5.877" > ! <addelement name="Ga" natoms="1" /> </material> ! <material name="Germanium" density="5.3230" > ! <addelement name="Ge" natoms="1" /> </material> ! <material name="Arsenic" density="5.72" > ! <addelement name="As" natoms="1" /> </material> ! <material name="Selenium" density="4.78" > ! <addelement name="Se" natoms="1" /> </material> ! <material name="Bromine" density="3.11" > ! <addelement name="Br" natoms="1" /> </material> ! <material name="Krypton" density="2.60" > ! <addelement name="Kr" natoms="1" /> </material> ! <material name="Rubidium" density="1.529" > ! <addelement name="Rb" natoms="1" /> </material> ! <material name="Strontium" density="2.54" > ! <addelement name="Sr" natoms="1" /> </material> ! <material name="Yttrium" density="4.456" > ! <addelement name="Y" natoms="1" /> </material> ! <material name="Zirconium" density="6.494" > ! <addelement name="Zr" natoms="1" /> </material> ! <material name="Niobium" density="8.55" > ! <addelement name="Nb" natoms="1" /> </material> ! <material name="Molybdenum" density="10.20" > ! <addelement name="Mo" natoms="1" /> </material> ! <material name="Technetium" density="11.48" > ! <addelement name="Tc" natoms="1" /> </material> ! <material name="Ruthenium" density="12.39" > ! <addelement name="Ru" natoms="1" /> </material> ! <material name="Rhodium" density="12.39" > ! <addelement name="Rh" natoms="1" /> </material> ! <material name="Palladium" density="12.00" > ! <addelement name="Pd" natoms="1" /> </material> ! <material name="Silver" density="10.48" > ! <addelement name="Ag" natoms="1" /> </material> ! <material name="Cadmium" density="8.63" > ! <addelement name="Cd" natoms="1" /> </material> ! <material name="Indium" density="7.30" > ! <addelement name="In" natoms="1" /> </material> ! <material name="Tin" density="7.31" > ! <addelement name="Sn" natoms="1" /> </material> ! <material name="Antimony" density="6.679" > ! <addelement name="Sb" natoms="1" /> </material> ! <material name="Tellurium" density="6.23" > ! <addelement name="Te" natoms="1" /> </material> ! <material name="Iodine" density="7.30" > ! <addelement name="I" natoms="1" /> </material> ! <material name="Xenon" density="3.057" > ! <addelement name="Xe" natoms="1" /> </material> ! <material name="Cesium" density="1.870" > ! <addelement name="Cs" natoms="1" /> </material> ! <material name="Barium" density="3.50" > ! <addelement name="Ba" natoms="1" /> </material> ! <material name="Larthanum" density="6.127" > ! <addelement name="La" natoms="1" /> </material> ! <material name="Cerium" density="6.637" > ! <addelement name="Ce" natoms="1" /> </material> ! <material name="Tungsten" density="19.3" > ! <addelement name="W" natoms="1" /> </material> ! <material name="Gold" density="18.85" > ! <addelement name="Au" natoms="1" /> </material> ! <material name="Lead" density="11.35" > ! <addelement name="Pb" natoms="1" /> </material> ! <material name="Bismuth" density="9.37" > ! <addelement name="Bi" natoms="1" /> </material> ! <material name="Uranium" density="18.950" > ! <addelement name="U" natoms="1" /> </material> <material name="Air" density="0.001214"> ! <addelement name="N" natoms="0.7494" /> ! <addelement name="O" natoms="0.2369" /> ! <addelement name="Ar" natoms="0.0129" /> ! <addelement name="H" natoms="0.0008" /> </material> <material name="Vacuum" --- 123,329 ---- <element symbol="B"> ! <addisotope name="Bor_10" natoms="2"/> ! <addisotope name="Bor_11" natoms="8"/> </element> ! <!-- materials ================================================================ --> ! <material name="Hydrogen" density="0.0708" state="gas"> <addelement name="H" natoms="1"/> </material> ! <material name="Deuterium" density="0.162"> <addelement name="D" natoms="1"/> </material> ! <material name="Helium" density="0.125"> ! <addelement name="He" natoms="1"/> </material> ! <material name="Lithium" density="0.534"> ! <addelement name="Li" natoms="1"/> </material> ! <material name="Beryllium" density="1.8480"> ! <addelement name="Be" natoms="1"/> </material> ! <material name="Boron" density="2.34"> ! <addelement name="B" natoms="1"/> </material> ! <material name="Carbon" density="2.2650"> ! <addelement name="C" natoms="1"/> </material> ! <material name="Nitrogen" density="0.808"> ! <addelement name="N" natoms="1"/> </material> <material name="Oxygen" density="0.00143"> ! <addelement name="O" natoms="1"/> </material> ! <material name="Fluorine" density="1.1080"> ! <addelement name="F" natoms="1"/> </material> ! <material name="Neon" density="1.2070"> ! <addelement name="Ne" natoms="1"/> </material> ! <material name="Sodium" density="0.969"> ! <addelement name="Na" natoms="1"/> </material> ! <material name="Magnesium" density="1.735"> ! <addelement name="Mg" natoms="1"/> </material> ! <material name="Aluminum" density="2.700"> ! <addelement name="Al" natoms="1"/> </material> ! <material name="Silicon" density="2.33"> ! <addelement name="Si" natoms="1"/> </material> ! <material name="Phosphorus" density="1.82"> ! <addelement name="P" natoms="1"/> </material> ! <material name="Sulfur" density="2.07"> ! <addelement name="S" natoms="1"/> </material> ! <material name="Chlorine" density="1.56"> ! <addelement name="Cl" natoms="1"/> </material> <material name="Argon" density="0.001639"> ! <addelement name="Ar" natoms="1"/> </material> ! <material name="Potassium" density="0.860"> ! <addelement name="K" natoms="1"/> </material> ! <material name="Calcium" density="1.55"> ! <addelement name="Ca" natoms="1"/> </material> ! <material name="Scandium" density="2.98"> ! <addelement name="Sc" natoms="1"/> </material> ! <material name="Titanium" density="4.53"> ! <addelement name="Ti" natoms="1"/> </material> ! <material name="Vanadium" density="6.10"> ! <addelement name="V" natoms="1"/> </material> ! <material name="Chromium" density="7.18"> ! <addelement name="Cr" natoms="1"/> </material> ! <material name="Manganese" density="7.43"> ! <addelement name="Mn" natoms="1"/> </material> ! <material name="Iron" density="7.87"> ! <addelement name="Fe" natoms="1"/> </material> ! <material name="Cobalt" density="8.90"> ! <addelement name="Co" natoms="1"/> </material> ! <material name="Nickel" density="8.876"> ! <addelement name="Ni" natoms="1"/> </material> ! <material name="Copper" density="8.96"> ! <addelement name="Cu" natoms="1"/> </material> ! <material name="Zinc" density="7.112"> ! <addelement name="Zn" natoms="1"/> </material> ! <material name="Gallium" density="5.877"> ! <addelement name="Ga" natoms="1"/> </material> ! <material name="Germanium" density="5.3230"> ! <addelement name="Ge" natoms="1"/> </material> ! <material name="Arsenic" density="5.72"> ! <addelement name="As" natoms="1"/> </material> ! <material name="Selenium" density="4.78"> ! <addelement name="Se" natoms="1"/> </material> ! <material name="Bromine" density="3.11"> ! <addelement name="Br" natoms="1"/> </material> ! <material name="Krypton" density="2.60"> ! <addelement name="Kr" natoms="1"/> </material> ! <material name="Rubidium" density="1.529"> ! <addelement name="Rb" natoms="1"/> </material> ! <material name="Strontium" density="2.54"> ! <addelement name="Sr" natoms="1"/> </material> ! <material name="Yttrium" density="4.456"> ! <addelement name="Y" natoms="1"/> </material> ! <material name="Zirconium" density="6.494"> ! <addelement name="Zr" natoms="1"/> </material> ! <material name="Niobium" density="8.55"> ! <addelement name="Nb" natoms="1"/> </material> ! <material name="Molybdenum" density="10.20"> ! <addelement name="Mo" natoms="1"/> </material> ! <material name="Technetium" density="11.48"> ! <addelement name="Tc" natoms="1"/> </material> ! <material name="Ruthenium" density="12.39"> ! <addelement name="Ru" natoms="1"/> </material> ! <material name="Rhodium" density="12.39"> ! <addelement name="Rh" natoms="1"/> </material> ! <material name="Palladium" density="12.00"> ! <addelement name="Pd" natoms="1"/> </material> ! <material name="Silver" density="10.48"> ! <addelement name="Ag" natoms="1"/> </material> ! <material name="Cadmium" density="8.63"> ! <addelement name="Cd" natoms="1"/> </material> ! <material name="Indium" density="7.30"> ! <addelement name="In" natoms="1"/> </material> ! <material name="Tin" density="7.31"> ! <addelement name="Sn" natoms="1"/> </material> ! <material name="Antimony" density="6.679"> ! <addelement name="Sb" natoms="1"/> </material> ! <material name="Tellurium" density="6.23"> ! <addelement name="Te" natoms="1"/> </material> ! <material name="Iodine" density="7.30"> ! <addelement name="I" natoms="1"/> </material> ! <material name="Xenon" density="3.057"> ! <addelement name="Xe" natoms="1"/> </material> ! <material name="Cesium" density="1.870"> ! <addelement name="Cs" natoms="1"/> </material> ! <material name="Barium" density="3.50"> ! <addelement name="Ba" natoms="1"/> </material> ! <material name="Larthanum" density="6.127"> ! <addelement name="La" natoms="1"/> </material> ! <material name="Cerium" density="6.637"> ! <addelement name="Ce" natoms="1"/> </material> ! <material name="Tungsten" density="19.3"> ! <addelement name="W" natoms="1"/> </material> ! <material name="Gold" density="18.85"> ! <addelement name="Au" natoms="1"/> </material> ! <material name="Lead" density="11.35"> ! <addelement name="Pb" natoms="1"/> </material> ! <material name="Bismuth" density="9.37"> ! <addelement name="Bi" natoms="1"/> </material> ! <material name="Uranium" density="18.950"> ! <addelement name="U" natoms="1"/> </material> <material name="Air" density="0.001214"> ! <addelement name="N" natoms="0.7494"/> ! <addelement name="O" natoms="0.2369"/> ! <addelement name="Ar" natoms="0.0129"/> ! <addelement name="H" natoms="0.0008"/> </material> <material name="Vacuum" *************** *** 329,333 **** density="1.0e-15" x0="1.0e+17" ! lambda="1.0e+17" > </material> --- 332,336 ---- density="1.0e-15" x0="1.0e+17" ! lambda="1.0e+17"> </material> |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:53:59
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/external In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/Test/data/external Modified Files: compact_emulation.agdd muons.agdd Log Message: Colors introduced Index: muons.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/external/muons.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** muons.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- muons.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: compact_emulation.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/external/compact_emulation.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** compact_emulation.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- compact_emulation.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 32,35 **** --- 35,39 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:53:58
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/GeometricModel Modified Files: AGDDBuilder.java Solid.java Log Message: Colors introduced Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Solid.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Solid.java 12 Aug 2005 09:27:43 -0000 1.2 --- Solid.java 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 1,4 **** --- 1,7 ---- package net.hep.AGDD.GeometricModel; + // Generic Model + import net.hep.AGDD.JAXB.ColorType; + // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; *************** *** 29,32 **** --- 32,38 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.2 2005/08/12 09:27:43 hrivnac * new version started, pcon and phedra placed at z-center *************** *** 68,73 **** // Get element properties ! String material = _builder.material(); ! String info = name + "[" + material + "]"; String nameCore = name; // TBD: Java 1.5 contains(...) --- 74,78 ---- // Get element properties ! String info = name; // TBD: use material String nameCore = name; // TBD: Java 1.5 contains(...) *************** *** 80,84 **** if (node instanceof Shape3D) { _shape = (Shape3D)node; ! _shape.setAppearance(builder().appearance(name, material)); } else { --- 85,89 ---- if (node instanceof Shape3D) { _shape = (Shape3D)node; ! _shape.setAppearance(builder().appearance(name)); } else { *************** *** 111,115 **** branch, _builder. ! appearance(nameCore, material), info)); } --- 116,120 ---- branch, _builder. ! appearance(nameCore), info)); } *************** *** 118,123 **** } ! // Register Appearance so that it can be used by higher level conainer (Volume) ! _builder.setAppearance(builder().appearance(nameCore, material)); } --- 123,128 ---- } ! // Register Appearance so that it can be used by higher level container (Volume) ! _builder.setAppearance(builder().appearance(nameCore)); } *************** *** 196,199 **** --- 201,236 ---- private static Shape3D _shape; + + /** Extract and remember color attributes from {@link net.hep.AGDD.JAXB.Solid}. + * @param s The colorfull {@link net.hep.AGDD.JAXB.Solid}. */ + public void setColor(net.hep.AGDD.JAXB.Solid s) { + ColorType color = (ColorType)(s.getColor()); + if (color != null) { + float[] rgb = builder().evaluator().valueOf(color.getRgb(), "1"); + _rgb = new short[3]; + for (int i = 0; i < 3; i++) { + _rgb[i] = (short)rgb[i]; + } + float[] transparency = builder().evaluator().valueOf(color.getTransparency(), "1"); + _transparency = transparency[0]; + } + } + + /** Give red-green-blue color components. + * @return The threevector of componets 3 * <0; 255>. */ + public short[] rgb() { + return _rgb; + } + + /** Give transparency color component. + * @return The level of transparency <0.0; 1.0>. */ + public float transparency() { + return _transparency; + } + + private short[] _rgb = null; + + private float _transparency = 0.0f; + /** Logging . */ Index: AGDDBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/AGDDBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDDBuilder.java 30 Mar 2005 13:42:56 -0000 1.1 --- AGDDBuilder.java 7 Oct 2005 15:53:47 -0000 1.2 *************** *** 4,11 **** --- 4,16 ---- import net.hep.graphics.GraXML.MasterBuilder; + // Generic Model + import net.hep.AGDD.JAXB.ColorType; + import net.hep.AGDD.JAXB.Solid; + // Java3D import javax.media.j3d.Group; import javax.media.j3d.TransformGroup; import javax.media.j3d.Transform3D; + import javax.media.j3d.Appearance; import javax.vecmath.Vector3d; import javax.vecmath.Matrix3d; *************** *** 25,28 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 102,120 **** return tr; } ! ! /** Register material name so it can be looked up by later. ! * @param material The name of the current material. */ ! public void setMaterial(String material) { ! _material = material; ! } ! ! /** Get current (latest) registered material name. ! * @return The current material ame. */ ! public String material() { ! return _material; } - private String _material = ""; - /** Get attached {@link Evaluator}. * @return The attached {@link Evaluator}. */ --- 110,128 ---- return tr; } ! ! /** Use specified color description to ! * create new {@link Appearance}. ! * @param name The name of the colored object. ! * @param rgb The red, green and blue components within <0; 255>. ! * if null, {@link mMasterBuilder} uses standard strategy.} ! * @param transparency The level of transparency <0.0; 1.0>. ! * @return The created {@link Appearance}. */ ! public Appearance appearance(String name, short[] rgb, float transparency) { ! if (rgb == null) { ! return super.appearance(name); ! } ! return super.appearance(name, rgb[0], rgb[1], rgb[2], transparency); } /** Get attached {@link Evaluator}. * @return The attached {@link Evaluator}. */ |
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/Test/data Modified Files: AliPolys.agdd AliSolids.agdd BinaryOperators.agdd Copies.agdd Envelopes.agdd Identifiers.agdd Including.agdd MultiplePositioners.agdd Polys.agdd Reflections.agdd Rotations.agdd Shifts.agdd Solids.agdd arrays.agdd foreach.agdd math.agdd positioners.agdd solids.agdd stacks.agdd vars.agdd Added Files: Colors.agdd Log Message: Colors introduced Index: AliPolys.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/AliPolys.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AliPolys.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- AliPolys.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: arrays.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/arrays.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arrays.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- arrays.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 29,32 **** --- 32,36 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: MultiplePositioners.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/MultiplePositioners.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MultiplePositioners.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- MultiplePositioners.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 29,32 **** --- 32,36 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Including.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Including.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Including.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Including.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 20,23 **** --- 23,27 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Reflections.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Reflections.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Reflections.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Reflections.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: solids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/solids.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** solids.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- solids.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: AliSolids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/AliSolids.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AliSolids.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- AliSolids.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: positioners.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/positioners.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** positioners.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- positioners.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 29,32 **** --- 32,36 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: BinaryOperators.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/BinaryOperators.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BinaryOperators.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- BinaryOperators.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: vars.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/vars.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vars.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- vars.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 29,32 **** --- 32,36 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: foreach.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/foreach.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** foreach.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- foreach.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 20,23 **** --- 23,27 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Polys.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Polys.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Polys.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Polys.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Copies.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Copies.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Copies.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Copies.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: math.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/math.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** math.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- math.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Identifiers.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Identifiers.agdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Identifiers.agdd 6 Oct 2005 20:48:12 -0000 1.1 --- Identifiers.agdd 7 Oct 2005 15:53:47 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.2 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.1 2005/10/06 20:48:12 hrivnac Identifiers example added *************** *** 14,17 **** --- 17,21 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Solids.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Solids.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Solids.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Solids.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 29,32 **** --- 32,36 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: stacks.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/stacks.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stacks.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- stacks.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" --- NEW FILE: Colors.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: Colors --> <!-- $Log: Colors.agdd,v $ Revision 1.1 2005/10/07 15:53:47 hrivnac Colors introduced --> <!-- @version $Id: Colors.agdd,v 1.1 2005/10/07 15:53:47 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" name = "Colors" version = "$Id: Colors.agdd,v 1.1 2005/10/07 15:53:47 hrivnac Exp $" date = "7 September 2005" author = "Julius Hrivnac" top_volume = "TEST"> <box name="whiteBox" material="Lead" X_Y_Z="1000; 2000; 4000" color="white"/> <box name="blackBox" material="Lead" X_Y_Z="1000; 2000; 4000" color="black"/> <box name="redBox" material="Lead" X_Y_Z="1000; 2000; 4000" color="red"/> <box name="greenBox" material="Lead" X_Y_Z="1000; 2000; 4000" color="green"/> <box name="blueBox" material="Lead" X_Y_Z="1000; 2000; 4000" color="blue"/> <composition name="TEST"> <posXYZ X_Y_Z=" 0; 0; 0"> <volume name="whiteBox"/> </posXYZ> <posXYZ X_Y_Z=" 2000; 2000; 0"> <volume name="blackBox"/> </posXYZ> <posXYZ X_Y_Z=" 2000; -2000; 0"> <volume name="redBox" /> </posXYZ> <posXYZ X_Y_Z="-2000; -2000; 0"> <volume name="greenBox"/> </posXYZ> <posXYZ X_Y_Z="-2000; 2000; 0"> <volume name="blueBox" /> </posXYZ> </composition> </section> </AGDD> Index: Shifts.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Shifts.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Shifts.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Shifts.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Envelopes.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Envelopes.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Envelopes.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Envelopes.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" Index: Rotations.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Rotations.agdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Rotations.agdd 6 Oct 2005 15:36:20 -0000 1.2 --- Rotations.agdd 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.3 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.2 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 26,29 **** --- 29,33 ---- <xi:include href="StandardMaterials.agdd"/> + <xi:include href="StandardColors.agdd"/> <section DTD_version = "v7" |
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/GeometricModel/Reps Modified Files: AGDD.java Box.java Cons.java Para.java Pcon.java Phedra.java Trap.java Trd.java Tubs.java Log Message: Colors introduced Index: AGDD.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/AGDD.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGDD.java 30 Mar 2005 13:42:56 -0000 1.1 --- AGDD.java 7 Oct 2005 15:53:47 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- // Generic Model import net.hep.AGDD.JAXB.AGDDType; + import net.hep.AGDD.JAXB.SectionType; // GraXML *************** *** 29,32 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 62,69 **** // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup(); ! // - Section ! List sections = agdd.getSection(); for (Object o : sections) { ! if (o instanceof Element) { builder.traverse((Element)o, branch, _name); } --- 66,74 ---- // Traverse all children and add their representations into branch BranchGroup branch = new BranchGroup(); ! // - Section (others are used via their references) ! List sections = agdd.getMaterialsOrColormapOrSection(); for (Object o : sections) { ! if (o instanceof Element && ! o instanceof SectionType) { builder.traverse((Element)o, branch, _name); } Index: Trd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Trd.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Trd.java 6 Oct 2005 20:48:11 -0000 1.2 --- Trd.java 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.2 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 71,74 **** --- 74,78 ---- String name0 = trd.getName(); String name = builder().name(name0); + setColor(trd); // Verify reuse *************** *** 78,82 **** // Create Trapezod and use it - builder().setMaterial(trd.getMaterial().toString()); use(new Trapezoid(xmpympz[0], xmpympz[1], --- 82,85 ---- *************** *** 86,90 **** inclination[0], inclination[1], ! builder.appearance(name0, builder().material())), name, parent, --- 89,93 ---- inclination[0], inclination[1], ! builder().appearance(name0, rgb(), transparency())), name, parent, Index: Phedra.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Phedra.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Phedra.java 6 Oct 2005 20:48:11 -0000 1.3 --- Phedra.java 7 Oct 2005 15:53:47 -0000 1.4 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.4 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.3 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 97,100 **** --- 100,104 ---- zsD[j] -= delz; } + setColor(phedra); // Verify reuse *************** *** 104,108 **** // Create Trapezod and use it - builder().setMaterial(phedra.getMaterial().toString()); use(new PolyGoneSegment(risD, rosD, --- 108,111 ---- *************** *** 111,115 **** profile[0] + profile[1], (int)sides[0], ! builder.appearance(name0, builder().material())), name, parent, --- 114,118 ---- profile[0] + profile[1], (int)sides[0], ! builder().appearance(name0, rgb(), transparency())), name, parent, Index: Pcon.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Pcon.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pcon.java 6 Oct 2005 20:48:11 -0000 1.3 --- Pcon.java 7 Oct 2005 15:53:47 -0000 1.4 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.4 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.3 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 96,99 **** --- 99,103 ---- z[j] -= delz; } + setColor(pcon); // Verify reuse *************** *** 103,107 **** // Create Trapezod and use it - builder().setMaterial(pcon.getMaterial().toString()); use(new PolyConeSegment(ri, ro, --- 107,110 ---- *************** *** 110,114 **** profile[0] + profile[1], BuildOptions.granularity(), ! builder.appearance(name0, builder().material())), name, parent, --- 113,117 ---- profile[0] + profile[1], BuildOptions.granularity(), ! builder().appearance(name0, rgb(), transparency())), name, parent, Index: Tubs.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Tubs.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Tubs.java 6 Oct 2005 20:48:11 -0000 1.2 --- Tubs.java 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.2 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 71,74 **** --- 74,78 ---- String name0 = tubs.getName(); String name = builder().name(name0); + setColor(tubs); // Verify reuse *************** *** 78,82 **** // Create Trapezod and use it - builder().setMaterial(tubs.getMaterial().toString()); use(new ConeSegment(rioz[0], rioz[1], --- 82,85 ---- *************** *** 85,89 **** profile[0] + profile[1], BuildOptions.granularity(), ! builder.appearance(name0, builder().material())), name, parent, --- 88,92 ---- profile[0] + profile[1], BuildOptions.granularity(), ! builder().appearance(name0, rgb(), transparency())), name, parent, Index: Para.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Para.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Para.java 6 Oct 2005 20:48:11 -0000 1.2 --- Para.java 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.2 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 79,82 **** --- 82,86 ---- String name0 = para.getName(); String name = builder().name(name0); + setColor(para); // Verify reuse *************** *** 86,90 **** // Create Trapezod and use it - builder().setMaterial(para.getMaterial().toString()); use(new Trapezoid(xyz[0], xyz[0], --- 90,93 ---- *************** *** 98,102 **** alpha[0], alpha[0], ! builder.appearance(name0, builder().material())), name, parent, --- 101,105 ---- alpha[0], alpha[0], ! builder().appearance(name0, rgb(), transparency())), name, parent, Index: Trap.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Trap.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Trap.java 6 Oct 2005 20:48:11 -0000 1.3 --- Trap.java 7 Oct 2005 15:53:47 -0000 1.4 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.4 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.3 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 75,78 **** --- 78,82 ---- String name0 = trap.getName(); String name = builder().name(name0); + setColor(trap); // Verify reuse *************** *** 82,86 **** // Create Trapezod and use it - builder().setMaterial(trap.getMaterial().toString()); use(new Trapezoid(xmumdpupdympz[0], xmumdpupdympz[1], --- 86,89 ---- *************** *** 94,98 **** declination[0], declination[1], ! builder.appearance(name0, builder().material())), name, parent, --- 97,101 ---- declination[0], declination[1], ! builder().appearance(name0, rgb(), transparency())), name, parent, Index: Cons.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Cons.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Cons.java 6 Oct 2005 20:48:11 -0000 1.2 --- Cons.java 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.2 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 71,74 **** --- 74,78 ---- String name0 = cons.getName(); String name = builder().name(name0); + setColor(cons); // Verify reuse *************** *** 78,82 **** // Create Trapezod and use it - builder().setMaterial(cons.getMaterial().toString()); use(new ConeSegment(rio1rio2z[0], rio1rio2z[1], --- 82,85 ---- *************** *** 87,91 **** profile[0] + profile[1], BuildOptions.granularity(), ! builder.appearance(name0, builder().material())), name, parent, --- 90,94 ---- profile[0] + profile[1], BuildOptions.granularity(), ! builder().appearance(name0, rgb(), transparency())), name, parent, Index: Box.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Box.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Box.java 6 Oct 2005 20:48:11 -0000 1.2 --- Box.java 7 Oct 2005 15:53:47 -0000 1.3 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.2 2005/10/06 20:48:11 hrivnac * Identifiers example added *************** *** 78,81 **** --- 81,85 ---- String name0 = box.getName(); String name = builder().name(name0); + setColor(box); // Verify reuse *************** *** 85,93 **** // Create Trapezod and use it - builder().setMaterial(box.getMaterial().toString()); use(new Trapezoid(xyz[0], xyz[1], xyz[2], ! builder.appearance(name0, builder().material())), name, parent, --- 89,96 ---- // Create Trapezod and use it use(new Trapezoid(xyz[0], xyz[1], xyz[2], ! builder().appearance(name0, rgb(), transparency())), name, parent, |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:53:55
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/Schema Modified Files: AGDD.xsd Log Message: Colors introduced Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AGDD.xsd 6 Oct 2005 20:48:11 -0000 1.4 --- AGDD.xsd 7 Oct 2005 15:53:47 -0000 1.5 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.5 2005/10/07 15:53:47 hrivnac + Colors introduced + Revision 1.4 2005/10/06 20:48:11 hrivnac Identifiers example added *************** *** 94,99 **** </p> <p> ! "Composition", "Section", "solid", "data" and "materials" elements can be linked ! from another file using XInclude mechanism. </p> </xs:documentation></xs:annotation> --- 97,102 ---- </p> <p> ! "composition", "section", "solid", "data" "colormap" and "materials" elements ! can be linked from another file using XInclude mechanism. </p> </xs:documentation></xs:annotation> *************** *** 106,112 **** information is maintained and managed. <br></br> ! Currently one may find within the AGDD element ! section, which is a definition of the main division of the detector ! and materials, which define all used materials. <br></br> The DTD provides a main version id. This corresponds to a --- 109,118 ---- information is maintained and managed. <br></br> ! Currently one may find within the AGDD element: ! <ul> ! <li><b>section</b>, which is a definition of the main division of the detector</li> ! <li><b>materials</b>, which define all used materials</li> ! <li><b>colormap</b>, which define all used colors</li> ! </ul> <br></br> The DTD provides a main version id. This corresponds to a *************** *** 117,124 **** </xs:annotation> <xs:complexType> ! <xs:sequence> ! <xs:element minOccurs="0" maxOccurs="unbounded" ref="materials"/> ! <xs:element minOccurs="0" maxOccurs="unbounded" ref="section"/> ! </xs:sequence> <xs:attribute name="DTD_version" use="required"> <xs:simpleType> --- 123,131 ---- </xs:annotation> <xs:complexType> ! <xs:choice minOccurs="0" maxOccurs="unbounded"> ! <xs:element ref="materials"/> ! <xs:element ref="colormap"/> ! <xs:element ref="section"/> ! </xs:choice> <xs:attribute name="DTD_version" use="required"> <xs:simpleType> *************** *** 207,211 **** <li>volume: the volume they are positioning.</li> <li>identifiers: a set of identifier specifications.</li> ! <li>values : var, array, table to be used for positioning.</li> </ul></li> </ul> --- 214,218 ---- <li>volume: the volume they are positioning.</li> <li>identifiers: a set of identifier specifications.</li> ! <li>values: var, array, table to be used for positioning.</li> </ul></li> </ul> *************** *** 658,661 **** --- 665,669 ---- <xs:attribute name="unit_length" type="unit_length" default="mm"/> <xs:attribute name="unit_angle" type="unit_angle" default="deg"/> + <xs:attribute name="color" type="xs:IDREF"/> <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> </xs:extension> *************** *** 1443,1450 **** </xs:sequence> <xs:attribute name="version" type="xs:string" use="required" /> - <xs:attribute name="DTD_version" type="xs:string" use="required" /> <xs:attribute name="author" type="xs:string" use="required" /> <xs:attribute name="date" type="xs:date" use="required" /> ! <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> </xs:complexType> </xs:element> --- 1451,1464 ---- </xs:sequence> <xs:attribute name="version" type="xs:string" use="required" /> <xs:attribute name="author" type="xs:string" use="required" /> <xs:attribute name="date" type="xs:date" use="required" /> ! <xs:attribute name="DTD_version" use="required"> ! <xs:simpleType> ! <xs:restriction base="xs:string"> ! <xs:enumeration value="v7"/> ! </xs:restriction> ! </xs:simpleType> ! </xs:attribute> ! <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> </xs:complexType> </xs:element> *************** *** 1536,1539 **** --- 1550,1596 ---- </xs:complexType> </xs:element> + + <!-- Colors =================================================================== --> + + <!-- colormap ................................................................. --> + <xs:element name="colormap"> + <xs:annotation> + <xs:documentation> + Colormap contains a set of colors. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="color" /> + </xs:sequence> + <xs:attribute name="version" type="xs:string" use="required" /> + <xs:attribute name="author" type="xs:string" use="required" /> + <xs:attribute name="date" type="xs:date" use="required" /> + <xs:attribute name="DTD_version" use="required"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="v7"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute ref="xml:base" xmlns:xml="http://www.w3.org/XML/1998/namespace"/> + </xs:complexType> + </xs:element> + + <!-- color .................................................................... --> + <xs:element name="color"> + <xs:annotation> + <xs:documentation> + Color can be referenced from an abstractSolid. + If no color is specified, standard GraXML algorithm (i.e. random colors) is + used. + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="name" type="xs:ID" use="required" /> + <xs:attribute name="rgb" type="vector3" use="required" /> + <xs:attribute name="transparency" type="scalar" default="0.0" /> + </xs:complexType> + </xs:element> </xs:schema> |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:53:55
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/doc-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/Test/doc-files Added Files: Colors.wrl.gz Log Message: Colors introduced --- NEW FILE: Colors.wrl.gz --- (This appears to be a binary file; contents omitted.) |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:53:55
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src/net/hep/AGDD/Test Modified Files: JAXB.java Log Message: Colors introduced Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/JAXB.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JAXB.java 30 Mar 2005 13:42:56 -0000 1.1 --- JAXB.java 7 Oct 2005 15:53:47 -0000 1.2 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/07 15:53:47 hrivnac + * Colors introduced + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 46,50 **** // Get definitions and loop over them log.info("DTD Version: " + agdd.getDTDVersion()); ! List sections = agdd.getSection(); for (Object s : sections) { if (s instanceof SectionType) { --- 49,53 ---- // Get definitions and loop over them log.info("DTD Version: " + agdd.getDTDVersion()); ! List sections = agdd.getMaterialsOrColormapOrSection(); for (Object s : sections) { if (s instanceof SectionType) { |
|
From: Julius H. <hr...@us...> - 2005-10-07 15:53:54
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22390/src Modified Files: index.html Log Message: Colors introduced Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** index.html 6 Oct 2005 20:48:11 -0000 1.11 --- index.html 7 Oct 2005 15:53:46 -0000 1.12 *************** *** 31,34 **** --- 31,35 ---- <li><a href="Examples/AliSolids.agdd">AliSolids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/AliSolids.wrl.gz">AliSolids.wrl</a></li> <li><a href="Examples/BinaryOperators.agdd">BinaryOperators.agdd</a></li> + <li><a href="Examples/Copies.agdd">Colors.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Colors.wrl.gz">Colors.wrl</a></li> <li><a href="Examples/Copies.agdd">Copies.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Copies.wrl.gz">Copies.wrl</a></li> <li><a href="Examples/Envelopes.agdd">Envelopes.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Envelopes.wrl.gz">Envelopes.wrl</a></li> *************** *** 41,44 **** --- 42,46 ---- <li><a href="Examples/Rotations.agdd">Rotations.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Rotations.wrl.gz">Rotations.wrl</a></li> <li><a href="Examples/Shifts.agdd">Shifts.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Shifts.wrl.gz">Shifts.wrl</a></li> + <li><a href="Examples/StandardColors.agdd">StandardColors.agdd</a></li> <li><a href="Examples/StandardMaterials.agdd">StandardMaterials.agdd</a></li> <li><a href="Examples/Solids.agdd">Solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Solids.wrl.gz">Solids.wrl</a></li> *************** *** 127,131 **** <li>mposPhi fixed (thanks to M.Potekhin).</li> <li>pcon, phedra centered in z (thanks to M.Potekhin).</li> ! <li>Materials included. </ul> </li> --- 129,134 ---- <li>mposPhi fixed (thanks to M.Potekhin).</li> <li>pcon, phedra centered in z (thanks to M.Potekhin).</li> ! <li>Materials included.<li> ! <li>Flexible Color specification included.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2005-10-06 20:48:20
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9968/src/net/hep/AGDD/Data Modified Files: StandardMaterials.agdd Log Message: Identifiers example added Index: StandardMaterials.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardMaterials.agdd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StandardMaterials.agdd 6 Oct 2005 15:36:20 -0000 1.1 --- StandardMaterials.agdd 6 Oct 2005 20:48:11 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.2 2005/10/06 20:48:11 hrivnac + Identifiers example added + Revision 1.1 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 10,14 **** <!-- @author Jul...@ce... --> ! <materials version="2.0" date="2001-10-03" author="Stan Bentvelsen, Julius Hrivnac" --- 13,17 ---- <!-- @author Jul...@ce... --> ! <materials version="$Id$" date="2001-10-03" author="Stan Bentvelsen, Julius Hrivnac" |
|
From: Julius H. <hr...@us...> - 2005-10-06 20:48:20
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/doc-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9968/src/net/hep/AGDD/Test/doc-files Added Files: Identifiers.wrl.gz Log Message: Identifiers example added --- NEW FILE: Identifiers.wrl.gz --- (This appears to be a binary file; contents omitted.) |
|
From: Julius H. <hr...@us...> - 2005-10-06 20:48:20
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9968/src/net/hep/AGDD/Schema Modified Files: AGDD.xsd Log Message: Identifiers example added Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AGDD.xsd 6 Oct 2005 15:36:20 -0000 1.3 --- AGDD.xsd 6 Oct 2005 20:48:11 -0000 1.4 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.4 2005/10/06 20:48:11 hrivnac + Identifiers example added + Revision 1.3 2005/10/06 15:36:20 hrivnac Materials added, version moved to v7 *************** *** 104,108 **** <br></br> Currently one may find within the AGDD element ! section, which is a definition of the main division of the detector. <br></br> The DTD provides a main version id. This corresponds to a --- 107,112 ---- <br></br> Currently one may find within the AGDD element ! section, which is a definition of the main division of the detector ! and materials, which define all used materials. <br></br> The DTD provides a main version id. This corresponds to a |
|
From: Julius H. <hr...@us...> - 2005-10-06 20:48:19
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9968/src/net/hep/AGDD/Test/data Added Files: Identifiers.agdd Log Message: Identifiers example added --- NEW FILE: Identifiers.agdd --- <?xml version="1.0" encoding="UTF-8"?> <!-- GraXML AGDD Unit Test: Identifiers --> <!-- $Log: Identifiers.agdd,v $ Revision 1.1 2005/10/06 20:48:12 hrivnac Identifiers example added --> <!-- @version $Id: Identifiers.agdd,v 1.1 2005/10/06 20:48:12 hrivnac Exp $ --> <!-- @author Jul...@ce... --> <AGDD DTD_version = "v7" xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="StandardMaterials.agdd"/> <section DTD_version = "v7" name = "Identifiers" version = "$Id: Identifiers.agdd,v 1.1 2005/10/06 20:48:12 hrivnac Exp $" date = "5 October 2005" author = "Julius Hrivnac" top_volume = "TEST"> <box name="box" material="Lead" X_Y_Z="500; 500; 500" /> <composition name="TEST"> <posXYZ X_Y_Z="6000; 6000; 0"> <volume name="box"/> <identifier field="singleIdentifier" value="0"/> </posXYZ> <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="box"/> <identifier field="singleIdentifier" value="1"/> </posXYZ> <mposZ ncopy="3" dZ="2000"> <volume name="box"/> <identifier field="multipleIdentifier" value="0" step="2"/> </mposZ> </composition> </section> </AGDD> |
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9968/src/net/hep/AGDD/GeometricModel/Reps Modified Files: Box.java Cons.java Para.java Pcon.java Phedra.java Trap.java Trd.java Tubs.java Log Message: Identifiers example added Index: Trd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Trd.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Trd.java 30 Mar 2005 13:42:56 -0000 1.1 --- Trd.java 6 Oct 2005 20:48:11 -0000 1.2 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 75,79 **** // Create Trapezod and use it ! builder().setMaterial(trd.getMaterial()); use(new Trapezoid(xmpympz[0], xmpympz[1], --- 78,82 ---- // Create Trapezod and use it ! builder().setMaterial(trd.getMaterial().toString()); use(new Trapezoid(xmpympz[0], xmpympz[1], Index: Phedra.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Phedra.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Phedra.java 12 Aug 2005 09:27:43 -0000 1.2 --- Phedra.java 6 Oct 2005 20:48:11 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.2 2005/08/12 09:27:43 hrivnac * new version started, pcon and phedra placed at z-center *************** *** 101,105 **** // Create Trapezod and use it ! builder().setMaterial(phedra.getMaterial()); use(new PolyGoneSegment(risD, rosD, --- 104,108 ---- // Create Trapezod and use it ! builder().setMaterial(phedra.getMaterial().toString()); use(new PolyGoneSegment(risD, rosD, Index: Pcon.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Pcon.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Pcon.java 12 Aug 2005 09:27:43 -0000 1.2 --- Pcon.java 6 Oct 2005 20:48:11 -0000 1.3 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.2 2005/08/12 09:27:43 hrivnac * new version started, pcon and phedra placed at z-center *************** *** 100,104 **** // Create Trapezod and use it ! builder().setMaterial(pcon.getMaterial()); use(new PolyConeSegment(ri, ro, --- 103,107 ---- // Create Trapezod and use it ! builder().setMaterial(pcon.getMaterial().toString()); use(new PolyConeSegment(ri, ro, Index: Tubs.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Tubs.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Tubs.java 30 Mar 2005 13:42:56 -0000 1.1 --- Tubs.java 6 Oct 2005 20:48:11 -0000 1.2 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 75,79 **** // Create Trapezod and use it ! builder().setMaterial(tubs.getMaterial()); use(new ConeSegment(rioz[0], rioz[1], --- 78,82 ---- // Create Trapezod and use it ! builder().setMaterial(tubs.getMaterial().toString()); use(new ConeSegment(rioz[0], rioz[1], Index: Para.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Para.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Para.java 30 Mar 2005 13:42:56 -0000 1.1 --- Para.java 6 Oct 2005 20:48:11 -0000 1.2 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 83,87 **** // Create Trapezod and use it ! builder().setMaterial(para.getMaterial()); use(new Trapezoid(xyz[0], xyz[0], --- 86,90 ---- // Create Trapezod and use it ! builder().setMaterial(para.getMaterial().toString()); use(new Trapezoid(xyz[0], xyz[0], Index: Trap.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Trap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Trap.java 31 Mar 2005 15:10:26 -0000 1.2 --- Trap.java 6 Oct 2005 20:48:11 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.2 2005/03/31 15:10:26 hrivnac * Trap fixed *************** *** 79,83 **** // Create Trapezod and use it ! builder().setMaterial(trap.getMaterial()); use(new Trapezoid(xmumdpupdympz[0], xmumdpupdympz[1], --- 82,86 ---- // Create Trapezod and use it ! builder().setMaterial(trap.getMaterial().toString()); use(new Trapezoid(xmumdpupdympz[0], xmumdpupdympz[1], Index: Cons.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Cons.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Cons.java 30 Mar 2005 13:42:56 -0000 1.1 --- Cons.java 6 Oct 2005 20:48:11 -0000 1.2 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 75,79 **** // Create Trapezod and use it ! builder().setMaterial(cons.getMaterial()); use(new ConeSegment(rio1rio2z[0], rio1rio2z[1], --- 78,82 ---- // Create Trapezod and use it ! builder().setMaterial(cons.getMaterial().toString()); use(new ConeSegment(rio1rio2z[0], rio1rio2z[1], Index: Box.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Box.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Box.java 30 Mar 2005 13:42:56 -0000 1.1 --- Box.java 6 Oct 2005 20:48:11 -0000 1.2 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.2 2005/10/06 20:48:11 hrivnac + * Identifiers example added + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 82,86 **** // Create Trapezod and use it ! builder().setMaterial(box.getMaterial()); use(new Trapezoid(xyz[0], xyz[1], --- 85,89 ---- // Create Trapezod and use it ! builder().setMaterial(box.getMaterial().toString()); use(new Trapezoid(xyz[0], xyz[1], |
|
From: Julius H. <hr...@us...> - 2005-10-06 20:48:19
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9968/src Modified Files: index.html Log Message: Identifiers example added Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** index.html 6 Oct 2005 15:36:20 -0000 1.10 --- index.html 6 Oct 2005 20:48:11 -0000 1.11 *************** *** 33,36 **** --- 33,37 ---- <li><a href="Examples/Copies.agdd">Copies.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Copies.wrl.gz">Copies.wrl</a></li> <li><a href="Examples/Envelopes.agdd">Envelopes.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Envelopes.wrl.gz">Envelopes.wrl</a></li> + <li><a href="Examples/Identifiers.agdd">Identifiers.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Indentifiers.wrl.gz">Indentifiers.wrl</a></li> <li><a href="Examples/Including.agdd">Including.agdd</a>, <a href="Examples/Included.agdd">Included.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Including.wrl.gz">Including.wrl</a></li> *************** *** 40,43 **** --- 41,45 ---- <li><a href="Examples/Rotations.agdd">Rotations.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Rotations.wrl.gz">Rotations.wrl</a></li> <li><a href="Examples/Shifts.agdd">Shifts.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Shifts.wrl.gz">Shifts.wrl</a></li> + <li><a href="Examples/StandardMaterials.agdd">StandardMaterials.agdd</a></li> <li><a href="Examples/Solids.agdd">Solids.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/Solids.wrl.gz">Solids.wrl</a></li> <li><a href="Examples/arrays.agdd">arrays.agdd</a> - <a href="JavaDoc/net/hep/AGDD/Test/doc-files/arrays.wrl.gz">arrays.wrl</a></li> |
|
From: Julius H. <hr...@us...> - 2005-10-06 20:48:19
|
Update of /cvsroot/graxml/DetDescr/AGDD/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9968/ant Modified Files: build.xml Log Message: Identifiers example added Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/ant/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 6 Oct 2005 15:35:41 -0000 1.4 --- build.xml 6 Oct 2005 20:48:11 -0000 1.5 *************** *** 198,201 **** --- 198,202 ---- <copy todir="${doc}/Examples" flatten="true"> <fileset dir="${src}/net/hep/AGDD/Schema" includes="*.xsd"/> + <fileset dir="${src}/net/hep/AGDD/Data" includes="*.agdd"/> <fileset dir="${src}/net/hep/AGDD/Test/data" includes="*.agdd"/> </copy> |
