graxml-commit Mailing List for GraXML (Page 20)
Brought to you by:
hrivnac
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: starXML <st...@us...> - 2006-09-19 18:45:50
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3622/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel Modified Files: Evaluator.java Log Message: Waypoint checkin Index: Evaluator.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Evaluator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Evaluator.java 8 Feb 2006 21:29:52 -0000 1.1 --- Evaluator.java 19 Sep 2006 18:45:47 -0000 1.2 *************** *** 39,42 **** --- 39,45 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 18:45:47 starxml + * Waypoint checkin + * * Revision 1.1 2006/02/08 21:29:52 starxml * Adding first cut of working components *************** *** 75,79 **** * @param builder The related {@link MasterBuilder}. */ public Evaluator(MasterBuilder builder) { ! _format = new java.text.DecimalFormat("#,##0.0###"); } --- 78,82 ---- * @param builder The related {@link MasterBuilder}. */ public Evaluator(MasterBuilder builder) { ! _format = new java.text.DecimalFormat("#,##0.0#######"); } |
From: starXML <st...@us...> - 2006-09-19 18:45:19
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3248/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel Modified Files: Positioner.java Log Message: Waypoint checkin Index: Positioner.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Positioner.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Positioner.java 8 Feb 2006 21:29:52 -0000 1.1 --- Positioner.java 19 Sep 2006 18:45:12 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- // Generic Model import net.hep.AGDD.JAXB.VolumeType; + import net.hep.AGDD.JAXB.IdentifierType; import net.hep.AGDD.JAXB.Data; import net.hep.AGDD.JAXB.CompositionType; *************** *** 38,41 **** --- 39,45 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 18:45:12 starxml + * Waypoint checkin + * * Revision 1.1 2006/02/08 21:29:52 starxml * Adding first cut of working components *************** *** 303,306 **** --- 307,312 ---- key+=";"+phi1+";"+phi2+";"+String.valueOf(n); + System.out.println("Key: "+ key); + return key; } *************** *** 320,325 **** public void AddNodeRotation(String parent, String daughter, int Ncopy, String [] Position, String [] Rotation) { ! ! String suffix = (Ncopy==1)?"":String.valueOf(Ncopy); String CombiTransName = "ct_"+daughter+suffix; --- 326,331 ---- public void AddNodeRotation(String parent, String daughter, int Ncopy, String [] Position, String [] Rotation) { ! // Use suffix to have unique combitrans names: ct_foo123 ! String suffix = (Ncopy==1)?"":String.valueOf(Ncopy); String CombiTransName = "ct_"+daughter+suffix; *************** *** 338,368 **** if (o instanceof VolumeType) { String key=keyToPosition((VolumeType)o); ! // System.out.println("Key: "+key); ! ! // if(builder().compStackNotEmpty()) { ! // System.out.println("Peeking comp: "+ builder().peekComp()); ! // } ! ! String realParent = builder().peekComp(); ! ! Evaluator evaluator = (builder()).evaluator(); String[] poz = evaluator.formatted(xyz); ! String[] rot1 = evaluator.formattedRad2Deg(rot); ! // System.out.println("Rotation"+" "+rot1[0]+" "+rot1[1]+" "+rot1[2]); int Ncopy = Solid.Ncopy(key); ! String genName = Solid.FromKeyHash(key); ! ! //System.out.println("STAR: positioning: "+genName+" in "+realParent+" with Ncopy="+Ncopy); ! if(rot[0]==0.0 && rot[1]==0.0 && rot[2]==0.0) { // unity rotation ! AddNode(realParent, genName, Ncopy, poz); ! } ! else { ! AddNodeRotation(realParent, genName, Ncopy, poz, rot1); ! } } } --- 344,368 ---- if (o instanceof VolumeType) { String key=keyToPosition((VolumeType)o); ! String realParent = builder().peekComp(); // if(builder().compStackNotEmpty()) {System.out.println("Peeking comp: "+ builder().peekComp());} ! if(builder().InCompHash(realParent)) {return;} // don't position volumes inside a finished composition + Evaluator evaluator = (builder()).evaluator(); String[] poz = evaluator.formatted(xyz); ! String[] rot1 = evaluator.formattedRad2Deg(rot);// System.out.println("Rotation"+" "+rot1[0]+" "+rot1[1]+" "+rot1[2]); int Ncopy = Solid.Ncopy(key); ! String genName = Solid.FromKeyHash(key); // System.out.println("Positioning: "+genName+" in "+realParent+" with Ncopy="+Ncopy); ! // unity rotation or not: ! if(rot[0]==0.0 && rot[1]==0.0 && rot[2]==0.0) {AddNode(realParent, genName, Ncopy, poz); } ! else {AddNodeRotation(realParent, genName, Ncopy, poz, rot1);} } + if (o instanceof IdentifierType) { + IdentifierType i = (IdentifierType) o; + String f = i.getField(); + String v = i.getValue(); + System.out.println("Identifier: "+f+" "+v); + } } *************** *** 376,379 **** --- 376,380 ---- } + /** Logging . */ private static Logger log = Logger.getLogger(Positioner.class); |
From: starXML <st...@us...> - 2006-09-19 18:42:42
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2450/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel Modified Files: TGeoAGDDBuilder.java Log Message: Updated features Index: TGeoAGDDBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/TGeoAGDDBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TGeoAGDDBuilder.java 8 Feb 2006 21:25:09 -0000 1.2 --- TGeoAGDDBuilder.java 19 Sep 2006 18:42:31 -0000 1.3 *************** *** 18,22 **** // Java import java.util.Stack; ! //import java.util.List; --- 18,22 ---- // Java import java.util.Stack; ! import java.util.HashMap; *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2006/09/19 18:42:31 starxml + * Updated features + * * Revision 1.2 2006/02/08 21:25:09 starxml * First cut of the TGeoAGDDBuilder *************** *** 277,279 **** --- 280,300 ---- } + protected static HashMap _compHash = new HashMap(1000); + + // -- + public static boolean InCompHash(String key) { + return _compHash.containsKey(key); + } + public static void ToCompHash(String key, String data) { + // System.out.println("to key hash "+key+" "+data); + _compHash.put(key, data); + } + + public static String FromCompHash(String key) { + String data=(String) _compHash.get(key); + // System.out.println("from comp hash "+key+" "+data); + return data; + } + + } |
From: Julius H. <hr...@us...> - 2006-09-19 15:28:36
|
Update of /cvsroot/graxml/DetDescr/AGDD/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22124 Modified Files: index.html Log Message: Identifiers enabled Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/index.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** index.html 18 Apr 2006 21:37:39 -0000 1.18 --- index.html 19 Sep 2006 15:28:30 -0000 1.19 *************** *** 67,73 **** <ul> <li>Migrate to JAXB 2.0.</li> - <li>Sphere.</li> - <li>Torus.</li> - <li>Parametrised volumes.</li> <li>Global choice of units default.</li> </ul> --- 67,70 ---- *************** *** 131,134 **** --- 128,132 ---- <li>BuildingBlock included.</li> <li>Multiple compositions can be xincluded inside buildingBlock.</li> + <li>Identifiers supported, can be used with formnulas.</li> </ul> </li> |
From: Julius H. <hr...@us...> - 2006-09-19 15:28:36
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22124/net/hep/AGDD/GeometricModel Modified Files: AGDDBuilder.java Positioner.java Log Message: Identifiers enabled Index: Positioner.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Positioner.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Positioner.java 30 Mar 2005 13:42:56 -0000 1.1 --- Positioner.java 19 Sep 2006 15:28:30 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- import net.hep.AGDD.JAXB.VolumeType; import net.hep.AGDD.JAXB.Data; + import net.hep.AGDD.JAXB.Identifier; // GraXML *************** *** 35,38 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 91,94 **** --- 95,110 ---- Evaluator evaluator = builder().evaluator(); List<String> variables = new ArrayList<String>(); + // - Identifiers first + for (Object o : volumes) { + if (o instanceof Identifier) { + if (!_initialised) { + _field = ((Identifier)o).getField(); + _value = evaluator.valueOf(((Identifier)o).getValue(), "1")[0]; + _initialised = true; + } + _step = evaluator.valueOf(((Identifier)o).getStep(), "1")[0]; + } + } + // - Data and Volumes next for (Object o : volumes) { if (o instanceof Data && o instanceof Element) { *************** *** 101,104 **** --- 117,121 ---- if (vv instanceof Element) { builder().traverse((Element)vv, tr, parent); + log.debug("Assigning Identifier for " + builder().name() + ": " + _field + "=" + _value); } } *************** *** 112,115 **** --- 129,157 ---- } + /** Give the name <em>Identifier</em> field. + * @return The name of the <em>Identifier</em> field. */ + public String idField() { + return _field; + } + + /** Give the value of the <em>Identifier</em>. + * @return The value of the <em>Identifier</em>. */ + public float idValue() { + return _value; + } + + /** Add step to the <em>Identifier</em>. */ + public void step() { + _value += _step; + } + + private String _field; + + private float _value = 0f; + + private float _step = 1f; + + private boolean _initialised = false; + /** Verify that {@link MasterBuilder} type is {@link AGDDBuilder} and * set it. Index: AGDDBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/AGDDBuilder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AGDDBuilder.java 23 Dec 2005 12:48:42 -0000 1.5 --- AGDDBuilder.java 19 Sep 2006 15:28:30 -0000 1.6 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.6 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.5 2005/12/23 12:48:42 hrivnac * schema should be in the current directory *************** *** 77,88 **** * @return The unique version of the name. */ public String name(String name) { ! if (conDB().getConnection(name) != null) { int i = 0; ! while (conDB().getConnection(name + ";" + ++i) != null) {} ! name = name + ";" + i; } ! return name; } /** Set position so it can be used later. * @param v The position {@link Vector3d}. */ --- 80,100 ---- * @return The unique version of the name. */ public String name(String name) { ! _name = name; ! if (conDB().getConnection(_name) != null) { int i = 0; ! while (conDB().getConnection(_name + ";" + ++i) != null) {} ! _name = _name + ";" + i; } ! return _name; ! } ! ! /** Give current unique name. ! * @return The current unique name. */ ! public String name() { ! return _name; } + public String _name; + /** Set position so it can be used later. * @param v The position {@link Vector3d}. */ |
From: Julius H. <hr...@us...> - 2006-09-19 15:28:36
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22124/net/hep/AGDD/Test/data Modified Files: Identifiers.agdd Log Message: Identifiers enabled Index: Identifiers.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Test/data/Identifiers.agdd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Identifiers.agdd 23 Nov 2005 16:13:10 -0000 1.3 --- Identifiers.agdd 19 Sep 2006 15:28:30 -0000 1.4 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.4 2006/09/19 15:28:30 hrivnac + Identifiers enabled + Revision 1.3 2005/11/23 16:13:10 hrivnac media and colors added, buildingBlock added *************** *** 30,33 **** --- 33,38 ---- top_volume = "TEST"> + <var name="var" value="10"/> + <box name="box" medium="active" X_Y_Z="500; 500; 500" /> *************** *** 39,43 **** <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="box"/> ! <identifier field="singleIdentifier" value="1"/> </posXYZ> <mposZ ncopy="3" dZ="2000"> --- 44,48 ---- <posXYZ X_Y_Z="-6000; -6000; 0"> <volume name="box"/> ! <identifier field="singleIdentifier" value="var * 2"/> </posXYZ> <mposZ ncopy="3" dZ="2000"> |
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22124/net/hep/AGDD/GeometricModel/Reps Modified Files: MposPhi.java MposR.java MposWedge.java MposX.java MposY.java MposZ.java PosRPhiZ.java PosXYZ.java Log Message: Identifiers enabled Index: PosRPhiZ.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/PosRPhiZ.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PosRPhiZ.java 30 Mar 2005 13:42:56 -0000 1.1 --- PosRPhiZ.java 19 Sep 2006 15:28:30 -0000 1.2 *************** *** 40,43 **** --- 40,46 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 81,87 **** xyz[1] = rphiz[0] * (float)sin(rphiz[1]); xyz[2] = rphiz[2]; use(new Position(xyz, rot, s[0], pos.isImpliedRot() ? rphiz[1] : 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); --- 84,91 ---- xyz[1] = rphiz[0] * (float)sin(rphiz[1]); xyz[2] = rphiz[2]; + List vol = pos.getVolumeOrIdentifierOrAbstractData(); use(new Position(xyz, rot, s[0], pos.isImpliedRot() ? rphiz[1] : 0), tg, ! vol, parent); Index: MposPhi.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/MposPhi.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MposPhi.java 30 Sep 2005 07:51:59 -0000 1.3 --- MposPhi.java 19 Sep 2006 15:28:30 -0000 1.4 *************** *** 41,44 **** --- 41,47 ---- * <pre> * $Log$ + * Revision 1.4 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.3 2005/09/30 07:51:59 hrivnac * M.Potekhin: 360->2pi fix *************** *** 97,100 **** --- 100,104 ---- xyz[2] = rz[1]; float phi; + List vol = pos.getVolumeOrIdentifierOrAbstractData(); for (int i = 0; i < (int)ncopy[0]; i++) { phi = phi0[0] + dphi[0] * i; *************** *** 103,108 **** use(new Position(xyz, rot, s[0], pos.isImpliedRot() ? phi : 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); } --- 107,113 ---- use(new Position(xyz, rot, s[0], pos.isImpliedRot() ? phi : 0), tg, ! vol, parent); + step(); } Index: PosXYZ.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/PosXYZ.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PosXYZ.java 30 Mar 2005 13:42:56 -0000 1.1 --- PosXYZ.java 19 Sep 2006 15:28:30 -0000 1.2 *************** *** 38,41 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 77,83 **** // Position all volumes use(new Position(xyz, rot, s[0], 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); --- 80,87 ---- // Position all volumes + List vol = pos.getVolumeOrIdentifierOrAbstractData(); use(new Position(xyz, rot, s[0], 0), tg, ! vol, parent); Index: MposX.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/MposX.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposX.java 30 Mar 2005 13:42:56 -0000 1.1 --- MposX.java 19 Sep 2006 15:28:30 -0000 1.2 *************** *** 38,41 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 77,86 **** xyz[1] = yz[0]; xyz[2] = yz[1]; for (int i = 0; i < (int)ncopy[0]; i++) { xyz[0] = x0[0] + dx[0] * i; use(new Position(xyz, rot, s[0], 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); } --- 80,91 ---- xyz[1] = yz[0]; xyz[2] = yz[1]; + List vol = pos.getVolumeOrIdentifierOrAbstractData(); for (int i = 0; i < (int)ncopy[0]; i++) { xyz[0] = x0[0] + dx[0] * i; use(new Position(xyz, rot, s[0], 0), tg, ! vol, parent); + step(); } Index: MposR.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/MposR.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposR.java 30 Mar 2005 13:42:56 -0000 1.1 --- MposR.java 19 Sep 2006 15:28:30 -0000 1.2 *************** *** 40,43 **** --- 40,46 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 84,87 **** --- 87,91 ---- float[] xyz = new float[3]; xyz[2] = zphi[0]; + List vol = pos.getVolumeOrIdentifierOrAbstractData(); for (int i = 0; i < (int)ncopy[0]; i++) { xyz[0] = (r0[0] + dr[0] * i) * (float)cos(zphi[1]); *************** *** 89,94 **** use(new Position(xyz, rot, s[0], 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); } --- 93,99 ---- use(new Position(xyz, rot, s[0], 0), tg, ! vol, parent); + step(); } Index: MposY.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/MposY.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MposY.java 30 Mar 2005 13:42:56 -0000 1.1 --- MposY.java 19 Sep 2006 15:28:30 -0000 1.2 *************** *** 38,41 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.2 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.1 2005/03/30 13:42:56 hrivnac * AGDD added *************** *** 80,89 **** xyz[0] = zx[1]; xyz[2] = zx[0]; for (int i = 0; i < (int)ncopy[0]; i++) { xyz[1] = y0[0] + dy[0] * i; use(new Position(xyz, rot, s[0], 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); } --- 83,94 ---- xyz[0] = zx[1]; xyz[2] = zx[0]; + List vol = pos.getVolumeOrIdentifierOrAbstractData(); for (int i = 0; i < (int)ncopy[0]; i++) { xyz[1] = y0[0] + dy[0] * i; use(new Position(xyz, rot, s[0], 0), tg, ! vol, parent); + step(); } Index: MposZ.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/MposZ.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MposZ.java 23 Sep 2005 09:07:05 -0000 1.2 --- MposZ.java 19 Sep 2006 15:28:30 -0000 1.3 *************** *** 40,43 **** --- 40,46 ---- * <pre> * $Log$ + * Revision 1.3 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.2 2005/09/23 09:07:05 hrivnac * logic fix, thanks to M.Potekhin *************** *** 103,112 **** xyz[1] = rphi[0] * (float)sin(rphi[1]); } for (int i = 0; i < (int)ncopy[0]; i++) { xyz[2] = z0[0] + dz[0] * i; use(new Position(xyz, rot, s[0], 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); } --- 106,117 ---- xyz[1] = rphi[0] * (float)sin(rphi[1]); } + List vol = pos.getVolumeOrIdentifierOrAbstractData(); for (int i = 0; i < (int)ncopy[0]; i++) { xyz[2] = z0[0] + dz[0] * i; use(new Position(xyz, rot, s[0], 0), tg, ! vol, parent); + step(); } Index: MposWedge.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/MposWedge.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MposWedge.java 30 Sep 2005 07:51:59 -0000 1.2 --- MposWedge.java 19 Sep 2006 15:28:30 -0000 1.3 *************** *** 41,44 **** --- 41,47 ---- * <pre> * $Log$ + * Revision 1.3 2006/09/19 15:28:30 hrivnac + * Identifiers enabled + * * Revision 1.2 2005/09/30 07:51:59 hrivnac * M.Potekhin: 360->2pi fix *************** *** 86,89 **** --- 89,93 ---- xyz[2] = rz[1]; float phi; + List vol = pos.getVolumeOrIdentifierOrAbstractData(); for (int i = 0; i < (int)ncopy[0]; i++) { if (sectors[i] != 0) { *************** *** 93,98 **** use(new Position(xyz, rot, s[0], pos.isImpliedRot() ? phi : 0), tg, ! pos.getVolumeOrIdentifierOrAbstractData(), parent); } } --- 97,103 ---- use(new Position(xyz, rot, s[0], pos.isImpliedRot() ? phi : 0), tg, ! vol, parent); + step(); } } |
From: Julius H. <hr...@us...> - 2006-06-30 10:12:13
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7705 Modified Files: Pcon.java Log Message: centered pcon Index: Pcon.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Reps/Pcon.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Pcon.java 7 Oct 2005 15:53:47 -0000 1.4 --- Pcon.java 30 Jun 2006 10:12:09 -0000 1.5 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.5 2006/06/30 10:12:09 hrivnac + * centered pcon + * * Revision 1.4 2005/10/07 15:53:47 hrivnac * Colors introduced *************** *** 95,99 **** } } ! double delz = (z[z.length - 1] - z[0]) / 2.0; for (int j = 0; j < i; j++) { z[j] -= delz; --- 98,102 ---- } } ! double delz = (z[z.length - 1] + z[0]) / 2.0; for (int j = 0; j < i; j++) { z[j] -= delz; |
From: Julius H. <hr...@us...> - 2006-06-09 13:09:34
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv895/net/hep/graphics/GraXML/Java3DExtensions/Interactivity Modified Files: Interacter.java Log Message: cleaning Index: Interacter.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/Interacter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Interacter.java 9 Jun 2006 13:05:54 -0000 1.5 --- Interacter.java 9 Jun 2006 13:09:25 -0000 1.6 *************** *** 27,30 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.6 2006/06/09 13:09:25 hrivnac + * cleaning + * * Revision 1.5 2006/06/09 13:05:54 hrivnac * cleaning *************** *** 111,116 **** boolean wireframe = (node instanceof Shape3D && _outlined && outlineColor != null); - System.out.println(wireframe + " " + _solid); - // Don't create interactivity if non-interactive SceneGraph is being created // or non-interactive Interacter is requested --- 114,117 ---- |
From: Julius H. <hr...@us...> - 2006-06-09 13:06:08
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31858/net/hep/graphics/GraXML/Java3DExtensions/Interactivity Modified Files: Interacter.java Log Message: cleaning Index: Interacter.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/Interacter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Interacter.java 31 May 2006 15:29:28 -0000 1.4 --- Interacter.java 9 Jun 2006 13:05:54 -0000 1.5 *************** *** 27,30 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.5 2006/06/09 13:05:54 hrivnac + * cleaning + * * Revision 1.4 2006/05/31 15:29:28 hrivnac * detailed parameters can be set after Config.set() is run *************** *** 108,111 **** --- 111,116 ---- boolean wireframe = (node instanceof Shape3D && _outlined && outlineColor != null); + System.out.println(wireframe + " " + _solid); + // Don't create interactivity if non-interactive SceneGraph is being created // or non-interactive Interacter is requested *************** *** 161,174 **** transform.addChild(node); } ! if (!_solid && wireframe) { ! OutlinedShape3DFactory.outline((Shape3D)node, outlineColor); ! transform.addChild(node); ! } ! if (_solid && wireframe) { ! Node clone = ((Shape3D)node).cloneNode(false); ! OutlinedShape3DFactory.outline((Shape3D)clone, outlineColor); ! transform.addChild(node); ! transform.addChild(clone); ! } addChild(transform); --- 166,179 ---- transform.addChild(node); } ! if (!_solid && wireframe) { ! OutlinedShape3DFactory.outline((Shape3D)node, outlineColor); ! transform.addChild(node); ! } ! if (_solid && wireframe) { ! Node clone = ((Shape3D)node).cloneNode(false); ! OutlinedShape3DFactory.outline((Shape3D)clone, outlineColor); ! transform.addChild(node); ! transform.addChild(clone); ! } addChild(transform); |
From: Julius H. <hr...@us...> - 2006-06-09 13:05:57
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31858/net/hep/graphics/GraXML Modified Files: MasterBuilder.java Log Message: cleaning Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MasterBuilder.java 7 Jun 2006 16:00:19 -0000 1.8 --- MasterBuilder.java 9 Jun 2006 13:05:53 -0000 1.9 *************** *** 60,63 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.9 2006/06/09 13:05:53 hrivnac + * cleaning + * * Revision 1.8 2006/06/07 16:00:19 hrivnac * HEP3D Stripification is reported *************** *** 292,296 **** log.info(count() + " elements processed"); log.info("Optimised:\n" + optDB().toString()); ! log.info("Stripified:\n" + org.freehep.j3d.Solid.stripifier().getStripifierStats()); System.gc(); log.info((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024 + " MB of memory used"); --- 295,299 ---- log.info(count() + " elements processed"); log.info("Optimised:\n" + optDB().toString()); ! log.debug("Stripified:\n" + org.freehep.j3d.Solid.stripifier().getStripifierStats()); System.gc(); log.info((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024 + " MB of memory used"); |
From: Julius H. <hr...@us...> - 2006-06-07 18:13:17
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25766/src/org/freehep/j3d Modified Files: Solid.java Log Message: Shape3Ds are stripified, it should help performance Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Solid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Solid.java 5 Sep 2005 12:16:26 -0000 1.1 --- Solid.java 7 Jun 2006 15:59:32 -0000 1.2 *************** *** 6,9 **** --- 6,10 ---- import com.sun.j3d.utils.geometry.GeometryInfo; import com.sun.j3d.utils.geometry.NormalGenerator; + import com.sun.j3d.utils.geometry.Stripifier; /** General Solid. *************** *** 11,14 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.2 2006/06/07 15:59:32 hrivnac + * Shape3Ds are stripified, it should help performance + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 39,42 **** --- 43,47 ---- geometryInfo.setCoordinates(coordinates); _normalGenerator.generateNormals(geometryInfo); + _stripifier.stripify(geometryInfo); if (_first) { setGeometry(geometryInfo.getGeometryArray()); *************** *** 48,54 **** --- 53,68 ---- } + /** Give associated {@link Stripifier}. It can be + * used to get its statistics. + * @return The associated {@link Stripifier}. */ + public static Stripifier stripifier() { + return _stripifier; + } + private boolean _first = true; private static NormalGenerator _normalGenerator = new NormalGenerator(); + + private static Stripifier _stripifier = new Stripifier(Stripifier.COLLECT_STATS); } |
From: Julius H. <hr...@us...> - 2006-06-07 18:12:28
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25900/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: HEP3D Stripification is reported Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Guide.html 31 May 2006 15:29:28 -0000 1.12 --- Guide.html 7 Jun 2006 16:00:22 -0000 1.13 *************** *** 627,631 **** <i>Generaly tricky, as SceneGraph of a visible picture is compiled and often also optimised.</i></li> ! <li>Global stripifier to optimise geometry.<br> <i>Not simple as interferes with switchable connections. Can dramaticaly improve performance.</i></li> --- 627,631 ---- <i>Generaly tricky, as SceneGraph of a visible picture is compiled and often also optimised.</i></li> ! <li>*** Global stripifier to optimise geometry.<br> <i>Not simple as interferes with switchable connections. Can dramaticaly improve performance.</i></li> *************** *** 647,651 **** <li>Animation (rotation).</li> <li>Possibility to save output XML file.</li> ! <li>Possibility to save binary internal format (so that long Geometric Model optimisation can be skipped).</li> <li>Interface between Java3D and OpenInventor.</li> --- 647,651 ---- <li>Animation (rotation).</li> <li>Possibility to save output XML file.</li> ! <li>*** Possibility to save binary internal format (so that long Geometric Model optimisation can be skipped).</li> <li>Interface between Java3D and OpenInventor.</li> *************** *** 657,660 **** --- 657,662 ---- <li>Switching on/off objects of some time, with same name pattern, etc. Maybe using symbolic links.</li> + <li>Partial optimisation (for subgraph).</li> + <li>Optimisation/quality effects documentation.</li> </ul> <u>Found Bugs</u> |
From: Julius H. <hr...@us...> - 2006-06-07 18:12:21
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25766/src Modified Files: index.html Log Message: Shape3Ds are stripified, it should help performance Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.html 31 May 2006 14:27:49 -0000 1.5 --- index.html 7 Jun 2006 15:59:26 -0000 1.6 *************** *** 133,136 **** --- 133,137 ---- <ul> <li>Shape3D can be outlined without clone creation.</li> + <li>Shape3Ds are stripified for performance.</li> </ul> </li> |
From: Julius H. <hr...@us...> - 2006-06-07 18:10:22
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25900/net/hep/graphics/GraXML Modified Files: Config.java MasterBuilder.java Log Message: HEP3D Stripification is reported Index: Config.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Config.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Config.java 31 May 2006 15:29:28 -0000 1.3 --- Config.java 7 Jun 2006 16:00:19 -0000 1.4 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.4 2006/06/07 16:00:19 hrivnac + * HEP3D Stripification is reported + * * Revision 1.3 2006/05/31 15:29:28 hrivnac * detailed parameters can be set after Config.set() is run *************** *** 137,141 **** DetachableConnection.setDisconnected(GlobalOptions.graphical() && DetachableConnection.disconnected()); } ! // State --------------------------------------------------------------------- --- 140,144 ---- DetachableConnection.setDisconnected(GlobalOptions.graphical() && DetachableConnection.disconnected()); } ! // State --------------------------------------------------------------------- Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MasterBuilder.java 31 May 2006 15:29:28 -0000 1.7 --- MasterBuilder.java 7 Jun 2006 16:00:19 -0000 1.8 *************** *** 60,63 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.8 2006/06/07 16:00:19 hrivnac + * HEP3D Stripification is reported + * * Revision 1.7 2006/05/31 15:29:28 hrivnac * detailed parameters can be set after Config.set() is run *************** *** 277,282 **** } catch (FileNotFoundException e) { ! throw new GraXMLException("Can't find " + file, e); ! } traverse(element, _group, ""); } --- 280,285 ---- } catch (FileNotFoundException e) { ! throw new GraXMLException("Can't find " + file, e); ! } traverse(element, _group, ""); } *************** *** 286,292 **** // Report about results time = System.currentTimeMillis() - time; ! System.out.println(""); log.info(count() + " elements processed"); ! log.info(optDB().toString()); System.gc(); log.info((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024 + " MB of memory used"); --- 289,296 ---- // Report about results time = System.currentTimeMillis() - time; ! log.info("\n"); log.info(count() + " elements processed"); ! log.info("Optimised:\n" + optDB().toString()); ! log.info("Stripified:\n" + org.freehep.j3d.Solid.stripifier().getStripifierStats()); System.gc(); log.info((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024 + " MB of memory used"); *************** *** 297,304 **** // Configurator ------------------------------------------------------------- ! /** Perform specific configuration in {@link MasterBuilder} subclass.. */ public abstract void configure(); - public void finish() {}; // Dispatcher ---------------------------------------------------------------- --- 301,309 ---- // Configurator ------------------------------------------------------------- ! /** Perform specific configuration in {@link MasterBuilder} subclass. */ public abstract void configure(); + /** TBD */ + public void finish() {}; // Dispatcher ---------------------------------------------------------------- *************** *** 482,486 **** _j3d = j3d; } ! private static J3DFrame _j3d = new J3DFrame(); --- 487,491 ---- _j3d = j3d; } ! private static J3DFrame _j3d = new J3DFrame(); *************** *** 609,613 **** // Data ---------------------------------------------------------------------- ! /** Count tarversed elements. * @return The number of already traversed elements. */ public int count() { --- 614,618 ---- // Data ---------------------------------------------------------------------- ! /** Count traversed elements. * @return The number of already traversed elements. */ public int count() { |
From: Julius H. <hr...@us...> - 2006-06-07 18:08:38
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25900/net/hep/graphics/GraXML/Java3DExtensions Modified Files: J3DFrame.java Log Message: HEP3D Stripification is reported Index: J3DFrame.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/J3DFrame.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** J3DFrame.java 30 Mar 2005 20:35:48 -0000 1.2 --- J3DFrame.java 7 Jun 2006 16:00:21 -0000 1.3 *************** *** 41,44 **** --- 41,47 ---- * <pre> * $Log$ + * Revision 1.3 2006/06/07 16:00:21 hrivnac + * HEP3D Stripification is reported + * * Revision 1.2 2005/03/30 20:35:48 hrivnac * custom exporters enabled *************** *** 320,325 **** } ! /** Switch on/off {@link Clipper}. ! * @param enable Whether {@link Clipper} should be switched on. */ public void enableClipper(boolean enable) { if (enable && _clipper == null) { --- 323,328 ---- } ! /** Switch on/off {@link Clipper}. ! * @param enable Whether {@link Clipper} should be switched on. */ public void enableClipper(boolean enable) { if (enable && _clipper == null) { |
From: Julius H. <hr...@us...> - 2006-06-02 15:20:06
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16959/net/hep/AGDD/Schema Modified Files: AGDD.xsd Log Message: Color may be invisible Index: AGDD.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Schema/AGDD.xsd,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AGDD.xsd 18 Apr 2006 21:37:39 -0000 1.8 --- AGDD.xsd 2 Jun 2006 15:19:57 -0000 1.9 *************** *** 2,5 **** --- 2,8 ---- <!-- $Log$ + Revision 1.9 2006/06/02 15:19:57 hrivnac + Color may be invisible + Revision 1.8 2006/04/18 21:37:39 hrivnac compositions in BuildingBlocks *************** *** 1658,1664 **** </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> --- 1661,1668 ---- </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:attribute name="visible" type="xs:boolean" default="true" /> </xs:complexType> </xs:element> |
From: Julius H. <hr...@us...> - 2006-06-02 15:20:04
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16959/net/hep/AGDD/Data Modified Files: StandardColors.agdd Log Message: Color may be invisible Index: StandardColors.agdd =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/Data/StandardColors.agdd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** StandardColors.agdd 20 Dec 2005 23:54:43 -0000 1.6 --- StandardColors.agdd 2 Jun 2006 15:19:57 -0000 1.7 *************** *** 3,6 **** --- 3,9 ---- <!-- $Log$ + Revision 1.7 2006/06/02 15:19:57 hrivnac + Color may be invisible + Revision 1.6 2005/12/20 23:54:43 hrivnac standard includes moved *************** *** 32,38 **** <!-- Standards ================================================================ --> ! <color name="parametrised" rgb="red; green; blue"/> <color name="random" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()"/> <color name="randomTransparent" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()" transparency="0.5"/> <color name="black" rgb=" 0; 0; 0"/> --- 35,42 ---- <!-- Standards ================================================================ --> ! <color name="parametrised" rgb="red; green; blue"/> <color name="random" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()"/> <color name="randomTransparent" rgb="256 * Math.random(); 256 * Math.random(); 256 * Math.random()" transparency="0.5"/> + <color name="invisible" rgb="0; 0; 0" visible="false"/> <color name="black" rgb=" 0; 0; 0"/> |
From: Julius H. <hr...@us...> - 2006-06-02 15:20:04
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16959/net/hep/AGDD/GeometricModel Modified Files: Solid.java Log Message: Color may be invisible Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/GeometricModel/Solid.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Solid.java 23 Nov 2005 16:13:10 -0000 1.4 --- Solid.java 2 Jun 2006 15:19:57 -0000 1.5 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.5 2006/06/02 15:19:57 hrivnac + * Color may be invisible + * * Revision 1.4 2005/11/23 16:13:10 hrivnac * media and colors added, buildingBlock added *************** *** 77,80 **** --- 80,86 ---- Group tg) { + // Ignore if invisible + if (!_visible) return; + // Get element properties String info = name; // TBD: use material *************** *** 224,227 **** --- 230,234 ---- _transparency = transparency[0]; } + _visible = color.isVisible(); } *************** *** 242,245 **** --- 249,253 ---- private float _transparency = 0.0f; + private boolean _visible = true; /** Logging . */ |
From: Julius H. <hr...@us...> - 2006-05-31 15:29:32
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9087/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Log Message: detailed parameters can be set after Config.set() is run Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Guide.html 31 May 2006 14:26:13 -0000 1.11 --- Guide.html 31 May 2006 15:29:28 -0000 1.12 *************** *** 262,265 **** --- 262,266 ---- <a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/JiveEvent/JavaDoc">JiveEvent</a>). <ul> + <!-- BUG: Config defaults wrong --> <li>Global Options:</li> <ul> *************** *** 289,292 **** --- 290,295 ---- <ul> <li><tt><font color="#990000">Interacter.setInteractivity(boolean interactive); // default = true, Config default = (optimisation < 6)</font></tt></li> + <li><tt><font color="#990000">Interacter.setOutlined(boolean outlined); // default = true, Config default = (optimisation < 6)</font></tt></li> + <li><tt><font color="#990000">Interacter.setSolid(boolean solid); // default = true, Config default = (optimisation < 6)</font></tt></li> <li><tt><font color="#990000">SelectedColor.setLineAntiAliasing(boolean lineAntiAliasing); // default = false, Config default = (quality > 5)</font></tt></li> <li><tt><font color="#990000">SelectedColor.setPalette(int palette); // default = RANDOM, also possible: ATLANTIS, SOLIDATLANTIS</font></tt></li> *************** *** 908,912 **** <li>Bug fixes:</li> <ul> ! <li>...</li> </ul> </ul> --- 911,915 ---- <li>Bug fixes:</li> <ul> ! <li>Properties can be changed after Config.set() is called.</li> </ul> </ul> |
From: Julius H. <hr...@us...> - 2006-05-31 15:29:31
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9087/net/hep/graphics/GraXML/Java3DExtensions/Interactivity Modified Files: Interacter.java Log Message: detailed parameters can be set after Config.set() is run Index: Interacter.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/Interacter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Interacter.java 31 May 2006 14:26:13 -0000 1.3 --- Interacter.java 31 May 2006 15:29:28 -0000 1.4 *************** *** 27,30 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.4 2006/05/31 15:29:28 hrivnac + * detailed parameters can be set after Config.set() is run + * * Revision 1.3 2006/05/31 14:26:13 hrivnac * optimisation = 8,9 creates pure wireframe scenegraph *************** *** 103,107 **** _name = name; - boolean wireframe = (node instanceof Shape3D && _outlined && outlineColor != null); --- 106,109 ---- |
From: Julius H. <hr...@us...> - 2006-05-31 15:29:31
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9087/net/hep/graphics/GraXML Modified Files: Config.java MasterBuilder.java Log Message: detailed parameters can be set after Config.set() is run Index: Config.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Config.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Config.java 31 May 2006 14:26:13 -0000 1.2 --- Config.java 31 May 2006 15:29:28 -0000 1.3 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.3 2006/05/31 15:29:28 hrivnac + * detailed parameters can be set after Config.set() is run + * * Revision 1.2 2006/05/31 14:26:13 hrivnac * optimisation = 8,9 creates pure wireframe scenegraph *************** *** 104,107 **** --- 107,111 ---- setExtensions(); setDisconnecter(); + _configured = true; } *************** *** 133,136 **** --- 137,149 ---- DetachableConnection.setDisconnected(GlobalOptions.graphical() && DetachableConnection.disconnected()); } + + // State --------------------------------------------------------------------- + + /** Is already configured ? */ + public static final boolean configured() { + return _configured; + } + + private static boolean _configured = false; /** Logging . */ Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MasterBuilder.java 8 Feb 2006 23:20:18 -0000 1.6 --- MasterBuilder.java 31 May 2006 15:29:28 -0000 1.7 *************** *** 60,63 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.7 2006/05/31 15:29:28 hrivnac + * detailed parameters can be set after Config.set() is run + * * Revision 1.6 2006/02/08 23:20:18 starxml * Small additions to place a couple of hooks we need for automatic code generation. *************** *** 156,159 **** --- 159,163 ---- * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ // TBD: only JAXB supported + // TBD: write comments to new stuff public abstract class MasterBuilder { *************** *** 199,222 **** // Main entry ---------------------------------------------------------------- - - // Aux stubs for AGDD - public void auxiliaryOutput(String filename) {} - private static String _sourceFile = ""; - - public static void setSource(String s) { - // Get the filename and drop the base: - String filename = s; - int i = s.lastIndexOf('/'); - - if (i>-1) { - filename = s.substring(i); - } - - _sourceFile=filename; - } - - public static String getSource() { - return _sourceFile; - } /** Build Geometric Model {@link BranchGroup} from JAXB --- 203,206 ---- *************** *** 234,247 **** ! auxiliaryOutput(file); ! ! setSource(file); ! _group = group; // If RootWindow exists, run in graphical mode if (_window == null) { Config.setGraphical(false); } ! else { Config.set(); } --- 218,230 ---- ! auxiliaryOutput(file); ! setSource(file); _group = group; + // If RootWindow exists, run in graphical mode if (_window == null) { Config.setGraphical(false); } ! else if (!Config.configured()) { Config.set(); } *************** *** 610,614 **** } - private static String _buildersFile = "builders.properties"; --- 593,596 ---- *************** *** 635,638 **** --- 617,638 ---- private int _count = 0; + public static void setSource(String s) { + String filename = s; + int i = s.lastIndexOf('/'); + if (i > -1) { + filename = s.substring(i); + } + _sourceFile = filename; + } + + public static String getSource() { + return _sourceFile; + } + + private static String _sourceFile = ""; + + /** Auxiliary stubs for AGDD. */ + public void auxiliaryOutput(String filename) {} + /** Give version of the {@link MasterBuilder} subclass. * @return The version of the {@link MasterBuilder} subclass. */ |
From: Julius H. <hr...@us...> - 2006-05-31 14:28:00
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20553/org/freehep/j3d Modified Files: OutlinedShape3DFactory.java Log Message: existing Shape3D can be outlined without clonying Index: OutlinedShape3DFactory.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/OutlinedShape3DFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OutlinedShape3DFactory.java 5 Sep 2005 12:16:26 -0000 1.1 --- OutlinedShape3DFactory.java 31 May 2006 14:27:49 -0000 1.2 *************** *** 15,18 **** --- 15,21 ---- * <pre> * $Log$ + * Revision 1.2 2006/05/31 14:27:49 hrivnac + * existing Shape3D can be outlined without clonying + * * Revision 1.1 2005/09/05 12:16:26 hrivnac * HEP3D introduction *************** *** 68,71 **** --- 71,100 ---- // Create new Shape3D as a clone Shape3D oShape = (Shape3D)(shape.cloneNode(false)); + outline(oShape, color); + return oShape; + } + + /** Change into wireframe {@link Shape3D}. + * @param shape The {@link Shape3D} to be oulined. + * @param color The requested color of wireframe, + * if null, {@link #_outlineColor} is taken, + * if also that is null, null is returned. + * There are special values defined: + * <ul> + * <li><code>BLACK</code> + * <li><code>WHITE</code> + * <li><code>DARK</code> - darker version of the <code>shape</code>'s color + * <li><code>BRIGHT</code> - brighter version of the <code>shape</code>'s color + * </ul> */ + public static void outline(Shape3D shape, Color3f color) { + // Do nothing if color is null + if (color == null) { + if (_outlineColor != null) { + color = _outlineColor; + } + else { + return; + } + } // Reuse existing Appearance if it exists Appearance appearance = shape.getAppearance(); *************** *** 82,86 **** // Setup special colors, if requested if (color == BRIGHT) { ! oShape.getAppearance().getMaterial().getDiffuseColor(color); color.x = color.x * 1.5f; color.y = color.y * 1.5f; --- 111,115 ---- // Setup special colors, if requested if (color == BRIGHT) { ! shape.getAppearance().getMaterial().getDiffuseColor(color); color.x = color.x * 1.5f; color.y = color.y * 1.5f; *************** *** 88,92 **** } else if (color == DARK) { ! oShape.getAppearance().getMaterial().getDiffuseColor(color); color.x = color.x / 3; color.y = color.y / 3; --- 117,121 ---- } else if (color == DARK) { ! shape.getAppearance().getMaterial().getDiffuseColor(color); color.x = color.x / 3; color.y = color.y / 3; *************** *** 95,100 **** // Set outline of oShape, return oShape appearance.setMaterial(new Material(color, color, color, color, 1.0f)); ! oShape.setAppearance(appearance); ! return oShape; } --- 124,128 ---- // Set outline of oShape, return oShape appearance.setMaterial(new Material(color, color, color, color, 1.0f)); ! shape.setAppearance(appearance); } |
From: Julius H. <hr...@us...> - 2006-05-31 14:27:58
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20553 Modified Files: index.html Log Message: existing Shape3D can be outlined without clonying Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.html 8 Sep 2005 21:56:33 -0000 1.4 --- index.html 31 May 2006 14:27:49 -0000 1.5 *************** *** 64,67 **** --- 64,68 ---- <li>Test all binary operations.</li> <li>Use <a href="https://jgeom.dev.java.net">JGeom</a>.</li> + <li>Relax limits on phi, allow negative phi.</li> </ul> </li> *************** *** 131,135 **** <li>New features: <ul> ! <li>...</li> </ul> </li> --- 132,136 ---- <li>New features: <ul> ! <li>Shape3D can be outlined without clone creation.</li> </ul> </li> |
From: Julius H. <hr...@us...> - 2006-05-31 14:26:22
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20186 Modified Files: GraXML.jnlp Log Message: optimisation = 8,9 creates pure wireframe scenegraph Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GraXML.jnlp 17 Jan 2006 17:39:34 -0000 1.2 --- GraXML.jnlp 31 May 2006 14:26:13 -0000 1.3 *************** *** 17,38 **** <j2se max-heap-size="536870912" version="1.5+"/> <jar href="AGDD.jar"/> - <jar href="colt.jar"/> - <jar href="freehep-hep3d.jar"/> - <jar href="jlfgr.jar"/> - <jar href="relaxngDatatype.jar"/> - <jar href="xml-apis.jar"/> <jar href="bool.jar"/> - <jar href="freehep-j3d.jar"/> - <jar href="jax-qname.jar"/> - <jar href="log4j-1.2.8.jar"/> - <jar href="xsdlib.jar"/> <jar href="bsh-2.0b1.jar"/> <jar href="cx3djava100a.jar"/> <jar href="GDML.jar"/> - <jar href="GraXML.jar" main="true"/> <jar href="GraXMLDisplay.exe.jar"/> <jar href="JiveEvent.jar"/> ! <jar href="namespace.jar"/> <jar href="xercesImpl.jar"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.3-latest.jnlp"/> <extension href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML-JAXB.jnlp"/> --- 17,36 ---- <j2se max-heap-size="536870912" version="1.5+"/> <jar href="AGDD.jar"/> <jar href="bool.jar"/> <jar href="bsh-2.0b1.jar"/> + <jar href="colt.jar"/> <jar href="cx3djava100a.jar"/> + <jar href="freehep-hep3d.jar"/> + <jar href="freehep-j3d.jar"/> <jar href="GDML.jar"/> <jar href="GraXMLDisplay.exe.jar"/> + <jar href="GraXML.jar" main="true"/> <jar href="JiveEvent.jar"/> ! <jar href="jlfgr.jar"/> ! <jar href="log4j-1.2.8.jar"/> ! <jar href="relaxngDatatype.jar"/> <jar href="xercesImpl.jar"/> + <jar href="xml-apis.jar"/> + <jar href="xsdlib.jar"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.3-latest.jnlp"/> <extension href="http://home.cern.ch/hrivnac/Activities/Packages/WebStart/GraXML-JAXB.jnlp"/> |