graxml-commit Mailing List for GraXML (Page 2)
Brought to you by:
hrivnac
Menu
▾
▴
graxml-commit — CVS commit notifications of GraXML
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(6) |
Jun
(2) |
Jul
|
Aug
(12) |
Sep
(32) |
Oct
(41) |
Nov
(16) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(10) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(12) |
Jul
|
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(169) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(100) |
Nov
(14) |
Dec
(10) |
| 2008 |
Jan
(37) |
Feb
(4) |
Mar
(10) |
Apr
(73) |
May
(22) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julius H. <hr...@us...> - 2008-05-02 14:10:45
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26438/net/hep/atlas/graphics/JiveEvent/Test/data Added Files: JiveXML_6302_37323_fullRDO.xml Log Message: prepared for 1.0.0 --- NEW FILE: JiveXML_6302_37323_fullRDO.xml --- <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="JiveXML_event.xsl"?> <?ATLAS Release: "13.0.30"?> <!--!DOCTYPE Event SYSTEM "event.dtd"--> <Event version="13.0.30" runNumber="6302" eventNumber="37323" dateTime=""> <Cluster count="4" storeGateKey="egClusterCollection_ESD"> <cells multiple="84.000000"> 757335428 757335430 757335432 757335434 757335436 757335438 755004514 755005026 755005538 751042950 751042952 751042954 751042956 751042958 751043462 751043464 751043466 751043468 751043470 751043974 751043976 751043978 751043980 751043982 751044486 751044488 751044490 751044492 751044494 751044998 751045000 751045002 751045004 751045006 748945504 748945506 748946016 748946018 748946528 748946530 749207648 749207650 749208160 749208162 749208672 749208674 749209184 749209186 749209696 749209698 749210208 749210210 749210720 749210722 749211232 749211234 749211744 749211746 749212256 749212258 749212768 749212770 749213280 749213282 749213792 749213794 749214304 749214306 749214816 749214818 749215328 749215330 749215840 749215842 749216352 749216354 746586208 [...39478 lines suppressed...] </sgkey> <tracks multiple="5.300000"> -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 </tracks> <x> 4.073840 3.593427 0.000000 -0.011026 0.000000 0.000000 -0.011026 -0.000357 -0.000518 -0.000558 </x> <y> -18.522743 -17.469543 0.000000 0.062997 0.000000 0.000000 0.062997 0.001028 -0.000952 -0.001001 </y> <z> -52.877888 -51.237976 0.000000 1.476718 0.000000 0.000000 1.476718 1.345021 1.343661 1.347178 </z> </RVx> </Event> |
|
From: Julius H. <hr...@us...> - 2008-05-02 14:09:48
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25905 Modified Files: index.html Log Message: prepared for 1.0.0 Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.html 22 Dec 2007 15:29:47 -0000 1.8 --- index.html 2 May 2008 14:09:49 -0000 1.9 *************** *** 35,43 **** </ul> </li> - <li>Bug fixes: - <ul> - <li>...</li> - </ul> - </li> </ul> </li> --- 35,38 ---- *************** *** 50,58 **** </ul> </li> - <li>Bug fixes: - <ul> - <li>...</li> - </ul> - </li> </ul> </li> --- 45,48 ---- *************** *** 64,75 **** </ul> </li> - <li>Bug fixes: - <ul> - <li>...</li> - </ul> - </li> </ul> </li> ! <li><u>0.1.4:</u> <ul> <li>New features: --- 54,60 ---- </ul> </li> </ul> </li> ! <li><u>1.0.0:</u> <ul> <li>New features: *************** *** 77,85 **** <li>Demo files exported to GraXML.</li> <li>Migrated to JAXB 2.0.</li> ! </ul> ! </li> ! <li>Bug fixes: ! <ul> ! <li>...</li> </ul> </li> --- 62,66 ---- <li>Demo files exported to GraXML.</li> <li>Migrated to JAXB 2.0.</li> ! <li>Support for kinematic objects.</li> </ul> </li> *************** *** 114,118 **** <hr> <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=JiveEvent"> ! <address><a href="http://hrivnac.home.cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> --- 95,99 ---- <hr> <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=JiveEvent"> ! <address><a href="http://cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2008-05-02 14:05:16
|
Update of /cvsroot/graxml/Graphics/HEP3D/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22049 Modified Files: ToDo.txt build.xml Log Message: prepared for 1.2.0 Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/ant/ToDo.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ToDo.txt 5 Sep 2005 12:16:25 -0000 1.1 --- ToDo.txt 2 May 2008 14:05:10 -0000 1.2 *************** *** 1,5 **** - check inclusiveness of precondition limits - - check G4 constructors - write overview with major features description --- 1 ---- Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/ant/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 29 Apr 2008 14:35:34 -0000 1.9 --- build.xml 2 May 2008 14:05:10 -0000 1.10 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="pre-1.1.4"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="1.2.0"/> <path id="classpath.build"> |
|
From: Julius H. <hr...@us...> - 2008-05-02 14:04:49
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21645 Modified Files: index.html Log Message: prepared for 1.2.0 Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** index.html 25 Apr 2008 13:23:09 -0000 1.13 --- index.html 2 May 2008 14:04:48 -0000 1.14 *************** *** 36,41 **** </ul> The most resent version can be obtained from my <a href="http://home.cern.ch/hrivnac/Activities/Packages/HEP3D-dist.tar.gz">personal distribution</a>, ! more stable version is avalable from the GraXML <a href="https://sourceforge.net/projects/graxml/">SourceForge</a> project ! or <a href="http://java.freehep.org">FreeHEP</a> project. </p> <p> --- 36,40 ---- </ul> The most resent version can be obtained from my <a href="http://home.cern.ch/hrivnac/Activities/Packages/HEP3D-dist.tar.gz">personal distribution</a>, ! more stable version is avalable from the GraXML <a href="https://sourceforge.net/projects/graxml/">SourceForge</a> project. </p> <p> *************** *** 56,59 **** --- 55,60 ---- <li><a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/AGDD">AGDD</a></li> <li><a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/GDML">GDML</a></li> + <li><a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/JiveEvent">JiveEvent</a></li> + <li><a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/JiveGeometry">JiveGeometry</a></li> <li><a href="http://hrivnac.home.cern.ch/hrivnac/Activities/Packages/GraXML">GraXML</a></li> </ul> *************** *** 112,120 **** </ul> </li> - <li>Bug fixes: - <ul> - <li>...</li> - </ul> - </li> </ul> </li> --- 113,116 ---- *************** *** 126,134 **** </ul> </li> - <li>Bug fixes: - <ul> - <li>...</li> - </ul> - </li> </ul> </li> --- 122,125 ---- *************** *** 141,152 **** </ul> </li> - <li>Bug fixes: - <ul> - <li>...</li> - </ul> - </li> </ul> </li> ! <li><u>1.1.4:</u> <ul> <li>New features: --- 132,138 ---- </ul> </li> </ul> </li> ! <li><u>1.2.0:</u> <ul> <li>New features: *************** *** 160,163 **** --- 146,158 ---- </ul> </li> + </ul> + </li> + <li><u>*.*.*:</u> + <ul> + <li>New features: + <ul> + <li>...</li> + </ul> + </li> <li>Bug fixes: <ul> *************** *** 170,174 **** <hr> <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=HEP3D"> ! <address><a href="http://home.cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> --- 165,169 ---- <hr> <img width="0" height="0" src="http://hrivnac.home.cern.ch/hrivnac/cgi-bin/record.pl?page=HEP3D"> ! <address><a href="http://cern.ch/~hrivnac">J.Hrivnac</a>, @BUILD@</address> <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2008-05-02 14:01:18
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv19354 Modified Files: ToDo.txt build.xml Log Message: prepared for 3.2.0 Index: ToDo.txt =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/ToDo.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ToDo.txt 26 Sep 2007 15:48:22 -0000 1.5 --- ToDo.txt 2 May 2008 14:01:15 -0000 1.6 *************** *** 1,14 **** - make section.data xsd:date (it is xs:string now) - - unused imports - - TBD,BUG,... - - describe custom colors file - - describe work with SourceForge - - update Guide wrt JiveGeometry - - put all test files into test *bsh scripts and on Web --- 1 ---- Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** build.xml 29 Apr 2008 14:41:17 -0000 1.23 --- build.xml 2 May 2008 14:01:20 -0000 1.24 *************** *** 12,16 **** <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="3.1.10.2"/> <path id="classpath.build"> --- 12,16 ---- <property name="env.ANT_SITE" value="dist"/> <property file="ant/config-${env.ANT_SITE}.properties"/> ! <property name="version" value="3.2.0"/> <path id="classpath.build"> |
|
From: Julius H. <hr...@us...> - 2008-05-02 13:58:50
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17441 Modified Files: index.html Log Message: prepared for 3.2.0 Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/index.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** index.html 24 Jan 2008 23:08:24 -0000 1.12 --- index.html 2 May 2008 13:58:20 -0000 1.13 *************** *** 9,16 **** <tr> <td width="50%"> ! <p>Full Framework consist of GraXML Toolkit and several ! libraries implementing Generic and Geometric Models. ! End-user interacts only with two application programs: ! <b>GraXML.sh</b> interactive display and <b>GraXMLConverter.sh</b>.</p> <p>Current version: <b>@VERSION@</b> <small>[@BUILD@]</small></p> </td> --- 9,17 ---- <tr> <td width="50%"> ! <p>Full Framework consist of GraXML Toolkit, several ! libraries implementing Generic and Geometric Models and ens-user ! applications: ! <b>GraXML.sh</b> interactive display, <b>GraXMLConverter.sh</b> ! and GraXML-Atlantis integrated package.</p> <p>Current version: <b>@VERSION@</b> <small>[@BUILD@]</small></p> </td> *************** *** 24,28 **** </ul> </li> ! <li>The latest <a href="http://cern.ch/hrivnac/Activities/Packages/GraXML-dist.tar.gz">full distribution</a> (ready to run).</li> <li><a href="Gallery">Gallery</a></li> <li>Documentation: --- 25,29 ---- </ul> </li> ! <li>The latest <a href="http://cern.ch/hrivnac/Activities/Packages/GraXML-dist.tar.gz">full distribution</a>.</li> <li><a href="Gallery">Gallery</a></li> <li>Documentation: *************** *** 55,59 **** <hr> <img width="0" height="0" src="http://home.cern.ch/hrivnac/cgi-bin/record.pl?page=GraXML"> ! <address><a href="http://home.cern.ch/hrivnac">J.Hrivnac</a>, @BUILD@</address> <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> --- 56,60 ---- <hr> <img width="0" height="0" src="http://home.cern.ch/hrivnac/cgi-bin/record.pl?page=GraXML"> ! <address><a href="http://cern.ch/hrivnac">J.Hrivnac</a>, @BUILD@</address> <script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics1.js"/><script type="text/javascript" src="http://cern.ch/hrivnac/google-analytics2.js"/> </body> |
|
From: Julius H. <hr...@us...> - 2008-05-02 13:58:24
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17441/net/hep/graphics/GraXML/doc-files Modified Files: Guide.html Help.gif Log Message: prepared for 3.2.0 Index: Help.gif =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Help.gif,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs7CGQJh and /tmp/cvsjZRcY1 differ Index: Guide.html =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/doc-files/Guide.html,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Guide.html 17 Mar 2008 14:29:59 -0000 1.30 --- Guide.html 2 May 2008 13:58:21 -0000 1.31 *************** *** 32,35 **** --- 32,36 ---- <li><a href="#Related%20Development">Related Development</a></li> <ul> + <li><a href="http://cern.ch/hrivnac/Activities/Packages/GraXMLBridge/JavaDoc/atlantis/graxml3d/doc-files/Atlantis3D.html">Atlantis3D</a></li> <li><a href="http://ivana.home.cern.ch/ivana/VGM.html">Virtual Geometry Model</a> Geant4 and Root to GDML/AGDD Convertor</li> <li><a href="http://root.cern.ch/root/vmc/XML.html">Virtual Monte Carlo</a> Geant4 to GDML/AGDD Convertor</a></li> *************** *** 317,320 **** --- 318,324 ---- <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Jet0.setPtCut(float ptCut); // default = 0.0</font></tt></li> <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Track.setLineWidth(int lineWidth); // default = 2</font></tt></li> + <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Track.setText(boolean text); // default = false</font></tt></li> + <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Track.setPtCut(float ptCut); // default = 0.5</font></tt></li> + <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Track.setTextPtCut(float textPtCut); // default = 1</font></tt></li> <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.STC.setLineWidth(int lineWidth); // default = 2</font></tt></li> <li><tt><font color="#990000">net.hep.atlas.graphics.JiveEvent.GeometricModel.Reps.Electron.setLineWidth(int lineWidth); // default = 4</font></tt></li> *************** *** 474,477 **** --- 478,483 ---- Clicking on the middle mouse button limits Showing to several level (defined by <code>ConnectionsDB.setLevelLimit(int)</code>. + Clicking on right mouse button allows to change transparency etc. attributes + of the selected object. In the case of an Optimised SceneGraph, the effect may be sometimes surprising for a user as elements are linked together (some are just reference to others) *************** *** 483,487 **** <li>Italic description - object is not visible.</li> </ul> ! <li>Envelope components.</li> <li>Clipper.</li> </ol> --- 489,499 ---- <li>Italic description - object is not visible.</li> </ul> ! <li>Switches envelope components on/off.</li> ! <ul> ! <li>Axis</li> ! <li>Legent</li> ! <li>Cylinder</li> ! <li>Floor</li> ! </ul> <li>Clipper.</li> </ol> *************** *** 526,529 **** --- 538,543 ---- <h2><a name="Related Development"></a>Related Development</h2> <ul> + <li>GraXML together with <a href="http://cern.ch/atlantis">Atlantis</a> forms + <a href="http://cern.ch/hrivnac/Activities/Packages/GraXMLBridge/JavaDoc/atlantis/graxml3d/doc-files/Atlantis3D.html">Atlantis3D</a> package.</li> <li><a href="PovRay.html">Photo-realistic Ray Tracing</a> of GraXML pictures is possible using <a href="http://www.povray.org/">POVRay</a> tool.</li> *************** *** 645,648 **** --- 659,664 ---- <h2><a name="InLinks"></a>InLinks</h2> <ul> + <li><a href="http://atlas.web.cern.ch/Atlas/GROUPS/GRAPHICS">Atlas Graphics Group</a></li> + <li><a href="http://cern.ch/atlantis">Atlantis</a></li> <li><a href="http://www.openden.com/modules/weblinks/singlelink.php?lid=1847">OpenDEN</a></li> <li><a href="http://www.files-library.com/files/GraXML.html">Files Library</a></li> *************** *** 651,654 **** --- 667,676 ---- <li><a href="http://www.iterating.com/products/Graxml">Iterating</a></li> <li><a href="http://programs4all.net/programs/GraXML.htm">Programs for all</a></li> + <li><a href="http://hrivnac.free.fr/wordpress">Blog of J.Hrivnac</a>: + <ul> + <li><a href="http://hrivnac.free.fr/wordpress/?p=81">GraXML gives 3D View to Atlantis</a></li> + <li><a href="http://hrivnac.free.fr/wordpress/?p=109">New GraXML Features</a></li> + <li><a href="http://hrivnac.free.fr/wordpress/?p=129">Atlantis Geometry in GraXML</a></li> + </ul></li> </ul> *************** *** 674,678 **** <li>Local Operations for groups.</li> <li>Graphics View <--> Tree View identification (by highlighting).</li> - <li>Operations from Tree View.</li> <li>Setting options via GUI.</li> <li>Support for user-defined GUI plugins.</li> --- 696,699 ---- *************** *** 952,956 **** </ul> </ul> ! <li>*.*.*:</li> <ul> <li>New features:</li> --- 973,977 ---- </ul> </ul> ! <li>3.2.0:</li> <ul> <li>New features:</li> *************** *** 969,972 **** --- 990,999 ---- <li>Floor added to Envelope.</li> </ul> + <li>*.*.*:</li> + <ul> + <li>New features:</li> + <ul> + <li>...</li> + </ul> <li>Bug fixes:</li> <ul> |
|
From: Julius H. <hr...@us...> - 2008-04-30 16:10:57
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11334/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps Modified Files: ETMis.java Electron.java Event.java Muon.java Photon.java S3D.java STC.java STr.java Track.java Log Message: Tracks are grouped, cleaning Index: Muon.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Muon.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Muon.java 29 Apr 2008 14:42:18 -0000 1.2 --- Muon.java 30 Apr 2008 16:10:50 -0000 1.3 *************** *** 58,61 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/30 16:10:50 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.2 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 72,76 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public final class Muon extends Particle { --- 75,78 ---- Index: ETMis.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/ETMis.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ETMis.java 29 Apr 2008 14:42:18 -0000 1.3 --- ETMis.java 30 Apr 2008 16:10:50 -0000 1.4 *************** *** 58,61 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/30 16:10:50 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.3 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 75,79 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public final class ETMis extends Particle { --- 78,81 ---- Index: STC.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/STC.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** STC.java 29 Apr 2008 14:42:18 -0000 1.10 --- STC.java 30 Apr 2008 16:10:51 -0000 1.11 *************** *** 60,63 **** --- 60,66 ---- * <pre> * $Log$ + * Revision 1.11 2008/04/30 16:10:51 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.10 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 98,102 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public final class STC extends JiveRep { --- 101,104 ---- Index: S3D.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/S3D.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** S3D.java 29 Apr 2008 14:42:18 -0000 1.11 --- S3D.java 30 Apr 2008 16:10:51 -0000 1.12 *************** *** 58,61 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.12 2008/04/30 16:10:51 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.11 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 99,103 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public final class S3D extends JiveRep { --- 102,105 ---- Index: Track.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Track.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Track.java 29 Apr 2008 14:42:18 -0000 1.12 --- Track.java 30 Apr 2008 16:10:51 -0000 1.13 *************** *** 50,57 **** --- 50,59 ---- import javax.vecmath.Vector3f; import javax.vecmath.Point3f; + import javax.vecmath.Point3d; import javax.vecmath.Color3f; // FreeHEP import hep.graphics.j3d.Helix; + import org.freehep.j3d.PolyLine; // AWT *************** *** 59,62 **** --- 61,66 ---- // Java + import java.util.Map; + import java.util.HashMap; import static java.lang.Math.toRadians; import static java.lang.Math.log; *************** *** 75,78 **** --- 79,85 ---- * <pre> * $Log$ + * Revision 1.13 2008/04/30 16:10:51 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.12 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 119,123 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: antialising public final class Track extends JiveRep { --- 126,129 ---- *************** *** 133,141 **** } - // Create container - BranchGroup g = new BranchGroup(); - use(g, "Tracks", "Track Container"); - set(builder, g, "Tracks"); - // Get Type properties TrackType track = (TrackType)element; --- 139,142 ---- *************** *** 145,172 **** PolylineZType z = track.getPolylineZ(); NumPolylineType n = track.getNumPolyline(); ! float[] xs = floats(x.getValue()); ! float[] ys = floats(y.getValue()); ! float[] zs = floats(z.getValue()); ! int[] ns = ints( n.getValue()); // Draw all Tracks - String name; String info; boolean outlinedBckp = Interacter.outlined(); Interacter.setOutlined(false); - Shape3D shape; LineArray lineArray; Appearance appearance; Material material; Color3f color; - int j; // j traverses new Point3ds - int l = 0; // l traverses xs, ys, zs // Loop over Tracks for (int k = 0; k < ns.length; k++) { // Draw all Tracks name = "Track(" + storeGateKey + "/" + k + ")"; info = name + "[1-" + ns[k] + "]"; ! shape = new Shape3D(); ! color = color(); // ColorList is set => get Appearance from Color if (color == null) { --- 146,176 ---- PolylineZType z = track.getPolylineZ(); NumPolylineType n = track.getNumPolyline(); ! float[] xs = floats(x.getValue()); ! float[] ys = floats(y.getValue()); ! float[] zs = floats(z.getValue()); ! int[] ns = ints( n.getValue()); ! ! String name = "Track(" + storeGateKey + ")"; ! ! // Create container ! BranchGroup g = new BranchGroup(); ! use(g, name, "Track Container"); ! set(builder, g, name); // Draw all Tracks String info; boolean outlinedBckp = Interacter.outlined(); Interacter.setOutlined(false); LineArray lineArray; Appearance appearance; Material material; Color3f color; // Loop over Tracks + int l = 0; for (int k = 0; k < ns.length; k++) { // Draw all Tracks name = "Track(" + storeGateKey + "/" + k + ")"; info = name + "[1-" + ns[k] + "]"; ! color = color(storeGateKey); // ColorList is set => get Appearance from Color if (color == null) { *************** *** 181,217 **** appearance.setMaterial(new Material(color, color, color, color, 1f)); } - appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.0f)); appearance.setLineAttributes(new LineAttributes(lineWidth(), LineAttributes.PATTERN_SOLID, GlobalOptions.quality() > 5)); - shape.setAppearance(appearance); setAppearance(appearance); ! lineArray = new LineArray(2 * ns[k], ! GeometryArray.COORDINATES| ! GeometryArray.COLOR_3| ! GeometryArray.NORMALS); ! j = 0; ! // Construct Track ! for (int i = 0; i < ns[k]; i++) { ! if (i > 0 && i < ns[k] - 1) { ! lineArray.setCoordinate(j, new Point3d(xs[l] / builder().norm(), ! ys[l] / builder().norm(), ! zs[l] / builder().norm())); ! lineArray.setColor(j, color); ! lineArray.setNormal(j, new Vector3f(0, 0, 0)); ! shape.addGeometry(lineArray); ! j++; ! } ! lineArray.setCoordinate(j, new Point3d(xs[l] / builder().norm(), ! ys[l] / builder().norm(), ! zs[l] / builder().norm())); ! lineArray.setColor(j, color); ! lineArray.setNormal(j, new Vector3f(0, 0, 0)); ! shape.addGeometry(lineArray); ! j++; l++; } // Use Track ! use(shape, name, info); // Construct and Use Track label - // TBD: check pt, use pt if (_text) { _end = new Vector3d(xs[l - 1] / builder().norm(), --- 185,212 ---- appearance.setMaterial(new Material(color, color, color, color, 1f)); } appearance.setLineAttributes(new LineAttributes(lineWidth(), LineAttributes.PATTERN_SOLID, GlobalOptions.quality() > 5)); setAppearance(appearance); ! Point3d[] points; ! // Draw 1-points tracks from (0,0,0) ! if (ns[k] == 1) { ! points = new Point3d[2]; ! points[0] = new Point3d(0, 0, 0); ! points[1] = new Point3d(xs[l] / builder().norm(), ! ys[l] / builder().norm(), ! zs[l] / builder().norm()); l++; } + else { + points = new Point3d[ns[k]]; + for (int i = 0; i < ns[k]; i++) { + points[i] = new Point3d(xs[l] / builder().norm(), + ys[l] / builder().norm(), + zs[l] / builder().norm()); + l++; + } + } // Use Track ! use(new PolyLine(points, appearance), name, info); // Construct and Use Track label if (_text) { _end = new Vector3d(xs[l - 1] / builder().norm(), *************** *** 361,365 **** /** Set text description drawing. * @param text Whether draw text description of the Track, ! * the default is <code>true</code>. * @see #setTextPtCut . */ public static final void setText(boolean text) { --- 356,360 ---- /** Set text description drawing. * @param text Whether draw text description of the Track, ! * the default is <code>false</code>. * @see #setTextPtCut . */ public static final void setText(boolean text) { *************** *** 371,402 **** private static float _textPtCut = 1.0f; ! private static boolean _text = true; private static double _textSizeFactor = 20.0f; /** Set {@link Color}s to be used for line segments. * @param colorMap The array of {@link Color}s. * @param colorList The array of {@link Color}s indexes. */ ! public static void setColors(Color[] colorMap, int[] colorList) { ! _colorMap = colorMap; ! _colorList = colorList; ! _colorI = 0; } /** Give {@link Color3f} to be used for <em>i</em>s line segments. * @return The {@link Color3f} o be used for <em>i</em>s line segment, * <em>null</em> is colormap is not set. */ ! protected Color3f color() { ! if (_colorList == null) { return null; } ! return new Color3f(_colorMap[_colorList[_colorI++]]); } ! private static Color[] _colorMap; ! private static int[] _colorList; ! private static int _colorI; /** Give width of line segments, --- 366,405 ---- private static float _textPtCut = 1.0f; ! private static boolean _text = false; private static double _textSizeFactor = 20.0f; /** Set {@link Color}s to be used for line segments. + * @param key The key to set of {@link Color}s. * @param colorMap The array of {@link Color}s. * @param colorList The array of {@link Color}s indexes. */ ! public static void setColors(String key, ! Color[] colorMap, ! int[] colorList) { ! _colorMaps.put(key, colorMap); ! _colorLists.put(key, colorList); ! _colorIs.put(key, 0); } /** Give {@link Color3f} to be used for <em>i</em>s line segments. + * @param key The key to set of {@link Color}s. * @return The {@link Color3f} o be used for <em>i</em>s line segment, * <em>null</em> is colormap is not set. */ ! protected Color3f color(String key) { ! if (!_colorMaps.containsKey(key)) { return null; } ! Color[] colorMap = _colorMaps.get(key); ! int[] colorList = _colorLists.get(key); ! int colorI = _colorIs.get(key); ! _colorIs.put(key, colorI + 1); ! return new Color3f(colorMap[colorList[colorI]]); } ! private static Map<String, Color[]> _colorMaps = new HashMap<String, Color[]>(); ! private static Map<String, int[] > _colorLists = new HashMap<String, int[] >(); ! private static Map<String, Integer> _colorIs = new HashMap<String, Integer>(); /** Give width of line segments, Index: Event.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Event.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Event.java 29 Apr 2008 14:42:18 -0000 1.6 --- Event.java 30 Apr 2008 16:10:50 -0000 1.7 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.7 2008/04/30 16:10:50 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.6 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 112,116 **** } ! /** TBD */ public static short ord() { return _ord; --- 115,120 ---- } ! /** Give ordinary number of this event. ! * @return The ordinary number of this event. */ public static short ord() { return _ord; Index: Electron.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Electron.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Electron.java 29 Apr 2008 14:42:18 -0000 1.4 --- Electron.java 30 Apr 2008 16:10:50 -0000 1.5 *************** *** 58,61 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/30 16:10:50 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.4 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 78,82 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public final class Electron extends Particle { --- 81,84 ---- Index: STr.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/STr.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** STr.java 29 Apr 2008 14:42:18 -0000 1.10 --- STr.java 30 Apr 2008 16:10:51 -0000 1.11 *************** *** 63,66 **** --- 63,69 ---- * <pre> * $Log$ + * Revision 1.11 2008/04/30 16:10:51 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.10 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 77,81 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public final class STr extends JiveRep { --- 80,83 ---- Index: Photon.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Reps/Photon.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Photon.java 29 Apr 2008 14:42:18 -0000 1.4 --- Photon.java 30 Apr 2008 16:10:50 -0000 1.5 *************** *** 58,61 **** --- 58,64 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/30 16:10:50 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.4 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 78,82 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public final class Photon extends Particle { --- 81,84 ---- |
|
From: Julius H. <hr...@us...> - 2008-04-30 16:10:56
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11334/net/hep/atlas/graphics/JiveEvent/Test Modified Files: GeometricModel.java JAXB.java Log Message: Tracks are grouped, cleaning Index: JAXB.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test/JAXB.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JAXB.java 29 Apr 2008 14:42:18 -0000 1.4 --- JAXB.java 30 Apr 2008 16:10:51 -0000 1.5 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/30 16:10:51 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.4 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 59,63 **** JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! // TBD u.setValidating(true); log.info("Opening " + args[0]); // Get event --- 62,66 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! // u.setValidating(true); log.info("Opening " + args[0]); // Get event Index: GeometricModel.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/Test/GeometricModel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GeometricModel.java 29 Apr 2008 14:42:18 -0000 1.4 --- GeometricModel.java 30 Apr 2008 16:10:51 -0000 1.5 *************** *** 19,22 **** --- 19,25 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/30 16:10:51 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.4 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 59,63 **** JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! //TBD u.setValidating(true); log.info("Opening " + args[0]); // Get event --- 62,66 ---- JAXBContext jc = JAXBContext.newInstance("net.hep.atlas.graphics.JiveEvent.JAXB"); Unmarshaller u = jc.createUnmarshaller(); ! // u.setValidating(true); log.info("Opening " + args[0]); // Get event |
|
From: Julius H. <hr...@us...> - 2008-04-30 16:10:49
|
Update of /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11334/net/hep/atlas/graphics/JiveEvent/GeometricModel Modified Files: Jet0.java PDG.java Particle.java Log Message: Tracks are grouped, cleaning Index: Particle.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Particle.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Particle.java 29 Apr 2008 14:42:18 -0000 1.9 --- Particle.java 30 Apr 2008 16:10:49 -0000 1.10 *************** *** 59,62 **** --- 59,65 ---- * <pre> * $Log$ + * Revision 1.10 2008/04/30 16:10:49 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.9 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 94,98 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public abstract class Particle extends JiveRep { --- 97,100 ---- *************** *** 124,130 **** Interacter.setOutlined(false); Shape3D shape = new Shape3D(); - LineArray lineArray; - Appearance appearance; - Material material; Color3f color; double x; --- 126,129 ---- *************** *** 140,174 **** y = pts[i] * sin(phis[i]); z = pts[i] / 2 * (exp(etas[i]) - exp(-etas[i])); - // ColorList is set => get Appearance from Color color = color(i); ! if (color == null) { ! color = new Color3f(); ! appearance = builder().appearance(name, name); ! material = appearance.getMaterial(); ! material.getSpecularColor(color); ! } ! // ColorList is not set => get Color from Appearance ! else { ! appearance = new Appearance(); ! appearance.setMaterial(new Material(color, color, color, color, 1f)); ! } ! appearance.setLineAttributes(new LineAttributes(lineWidth(), linePattern(), GlobalOptions.quality() > 5)); ! shape.setAppearance(appearance); ! setAppearance(appearance); ! lineArray = new LineArray(2, ! GeometryArray.COORDINATES| ! GeometryArray.COLOR_3| ! GeometryArray.NORMALS); ! lineArray.setCoordinate(0, new Point3d(builder().vertex()[0] / builder().norm(), ! builder().vertex()[1] / builder().norm(), ! builder().vertex()[2] / builder().norm())); ! lineArray.setCoordinate(1, new Point3d(x + builder().vertex()[0] / builder().norm(), ! y + builder().vertex()[0] / builder().norm(), ! z + builder().vertex()[0] / builder().norm())); ! lineArray.setColor(0, color); ! lineArray.setColor(1, color); ! lineArray.setNormal(0, new Vector3f(0, 0, 0)); ! lineArray.setNormal(1, new Vector3f(0, 0, 0)); ! shape.addGeometry(lineArray); } use(shape, name, info); --- 139,144 ---- y = pts[i] * sin(phis[i]); z = pts[i] / 2 * (exp(etas[i]) - exp(-etas[i])); color = color(i); ! addLine(shape, x, y, z, name, color); } use(shape, name, info); *************** *** 182,186 **** * @param etx The particle' <em>etx</em>s. * @param ety The particle' <em>ety</em>s. */ - // TBD: refactor protected void construct(String type, String storeGateKey, --- 152,155 ---- *************** *** 198,208 **** Interacter.setOutlined(false); Shape3D shape = new Shape3D(); - LineArray lineArray; - Appearance appearance; - Material material; Color3f color = color(0); double x = etxs[0] * _ptFactor; double y = etys[0] * _ptFactor; double z = 0; // ColorList is set => get Appearance from Color if (color == null) { --- 167,196 ---- Interacter.setOutlined(false); Shape3D shape = new Shape3D(); Color3f color = color(0); double x = etxs[0] * _ptFactor; double y = etys[0] * _ptFactor; double z = 0; + addLine(shape, x, y, z, name, color); + use(shape, name, info); + Interacter.setOutlined(outlinedBckp); + + } + + /** Construct {@link LineArray} and add to {@link Shape3D}. + * @param shape The {@link Shape3D} being constructed. + * @param x The x coordinate of the line end. + * @param y The y coordinate of the line end. + * @param z The z coordinate of the line end. + * @param name The name of the {@link Shape3D}. + * @param color The {@link Color3f} of the {@link Shape3D}. */ + private void addLine(Shape3D shape, + double x, + double y, + double z, + String name, + Color3f color) { + LineArray lineArray; + Appearance appearance; + Material material; // ColorList is set => get Appearance from Color if (color == null) { *************** *** 217,221 **** appearance.setMaterial(new Material(color, color, color, color, 1f)); } - appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.0f)); appearance.setLineAttributes(new LineAttributes(lineWidth(), linePattern(), GlobalOptions.quality() > 5)); shape.setAppearance(appearance); --- 205,208 ---- *************** *** 229,234 **** builder().vertex()[2] / builder().norm())); lineArray.setCoordinate(1, new Point3d(x + builder().vertex()[0] / builder().norm(), ! y + builder().vertex()[1] / builder().norm(), ! z + builder().vertex()[2] / builder().norm())); lineArray.setColor(0, color); lineArray.setColor(1, color); --- 216,221 ---- builder().vertex()[2] / builder().norm())); lineArray.setCoordinate(1, new Point3d(x + builder().vertex()[0] / builder().norm(), ! y + builder().vertex()[0] / builder().norm(), ! z + builder().vertex()[0] / builder().norm())); lineArray.setColor(0, color); lineArray.setColor(1, color); *************** *** 236,242 **** lineArray.setNormal(1, new Vector3f(0, 0, 0)); shape.addGeometry(lineArray); - use(shape, name, info); - Interacter.setOutlined(outlinedBckp); - } --- 223,226 ---- Index: Jet0.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/Jet0.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Jet0.java 29 Apr 2008 14:42:18 -0000 1.7 --- Jet0.java 30 Apr 2008 16:10:48 -0000 1.8 *************** *** 55,58 **** --- 55,61 ---- * <pre> * $Log$ + * Revision 1.8 2008/04/30 16:10:48 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.7 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 84,88 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use HEP3D public abstract class Jet0 extends JiveRep { --- 87,90 ---- *************** *** 102,123 **** PhiType phi, PtType pt) { ! ! // Get Jet properties ! float[] etas = floats(eta.getValue()); ! float[] phis = floats(phi.getValue()); ! float[] pts = null; ! if (pt != null) { ! pts = floats(pt.getValue()); ! } ! type += "(" + storeGateKey + ")"; ! ! // Draw all Jets ! // - save and restore tg as it may be changed by draw*(...) ! Group tmpTg = tg(); ! for (int i = 0; i < etas.length; i++) { ! drawJet(etas[i], phis[i], pts[i], type, i); ! setTg(tmpTg); ! } ! } --- 104,108 ---- PhiType phi, PtType pt) { ! construct(type, count, storeGateKey, eta, phi, pt.getValue()); } *************** *** 135,154 **** PhiType phi, EtType et) { // Get Jet properties float[] etas = floats(eta.getValue()); float[] phis = floats(phi.getValue()); ! float[] ets = null; ! if (et != null) { ! ets = floats(et.getValue()); ! } type += "(" + storeGateKey + ")"; // Draw all Jets // - save and restore tg as it may be changed by draw*(...) - // TBD: refactor Group tmpTg = tg(); for (int i = 0; i < etas.length; i++) { ! drawJet(etas[i], phis[i], ets[i], type, i); setTg(tmpTg); } --- 120,151 ---- PhiType phi, EtType et) { + construct(type, count, storeGateKey, eta, phi, et.getValue()); + } + + /** Construct Java3D representation of this <em>Jet</em>. + * @param type The jet' type (name). + * @param count The number of jets in a set. + * @param storeGateKey The corresponding <em>StoreGate</em> key. + * @param eta The jet' <em>eta</em>s. + * @param phi The jet' <em>phi</em>s. + * @param et The jet' <em>et</em>s or <em>pt</em>s. */ + protected void construct(String type, + int count, + String storeGateKey, + EtaType eta, + PhiType phi, + String ept) { // Get Jet properties float[] etas = floats(eta.getValue()); float[] phis = floats(phi.getValue()); ! float[] epts = floats(ept); type += "(" + storeGateKey + ")"; // Draw all Jets // - save and restore tg as it may be changed by draw*(...) Group tmpTg = tg(); for (int i = 0; i < etas.length; i++) { ! drawJet(etas[i], phis[i], epts[i], type, i); setTg(tmpTg); } *************** *** 221,225 **** * @param pt The pt of the Jet0. * @return The {@link ConeSegment} representing the Jet0. */ - // TBD: simplify private Shape3D drawCone(String name, float x, --- 218,221 ---- Index: PDG.java =================================================================== RCS file: /cvsroot/graxml/Graphics/JiveEvent/src/net/hep/atlas/graphics/JiveEvent/GeometricModel/PDG.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PDG.java 29 Apr 2008 14:42:18 -0000 1.5 --- PDG.java 30 Apr 2008 16:10:48 -0000 1.6 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.6 2008/04/30 16:10:48 hrivnac + * Tracks are grouped, cleaning + * * Revision 1.5 2008/04/29 14:42:18 hrivnac * javadoc cleaned *************** *** 115,120 **** /** Give the charge of the particle. * @param code The PDG code of the particle. ! * return The charge of the particle, <code>1</code> if unknown.. */ ! // TBD: ??? public int charge(int code) { Integer ch = _charges.get(abs(code)); --- 118,122 ---- /** Give the charge of the particle. * @param code The PDG code of the particle. ! * @return The charge of the particle, <code>1</code> if unknown.. */ public int charge(int code) { Integer ch = _charges.get(abs(code)); |
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3914/org/freehep/j3d Modified Files: Cuboid.java Equalator.java Extrusion.java PointSet.java PolyGone.java PolyGoneSegment.java Ring.java Solid.java Log Message: cleaning Index: PolyGoneSegment.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyGoneSegment.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PolyGoneSegment.java 20 Jan 2007 00:17:35 -0000 1.3 --- PolyGoneSegment.java 29 Apr 2008 22:36:40 -0000 1.4 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 22:36:40 hrivnac + * cleaning + * * Revision 1.3 2007/01/20 00:17:35 hrivnac * PolyGoneSegment generalised *************** *** 79,84 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD generalise PolyConeSegment to zmins, zmaxs - // TBD test zmins, zmaxs public class PolyGoneSegment extends Solid { --- 82,85 ---- Index: Equalator.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Equalator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Equalator.java 16 Jan 2007 14:56:25 -0000 1.2 --- Equalator.java 29 Apr 2008 22:36:35 -0000 1.3 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 22:36:35 hrivnac + * cleaning + * * Revision 1.2 2007/01/16 14:56:25 hrivnac * PolyGone added *************** *** 30,34 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: implement Comparable public class Equalator { --- 33,36 ---- Index: Cuboid.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Cuboid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Cuboid.java 25 Apr 2008 13:22:45 -0000 1.1 --- Cuboid.java 29 Apr 2008 22:36:35 -0000 1.2 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/29 22:36:35 hrivnac + * cleaning + * * Revision 1.1 2008/04/25 13:22:45 hrivnac * Cuboid added, Extrusion improved *************** *** 29,33 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: documentation picture public class Cuboid extends Solid { --- 32,35 ---- *************** *** 50,54 **** /** Perform the construction. - // TBD: check for consistency * @param points The array of {@link Point3d}s, points.length == 8. * It can be null. --- 52,55 ---- Index: PolyGone.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PolyGone.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PolyGone.java 15 Feb 2007 10:49:47 -0000 1.4 --- PolyGone.java 29 Apr 2008 22:36:40 -0000 1.5 *************** *** 17,20 **** --- 17,23 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/29 22:36:40 hrivnac + * cleaning + * * Revision 1.4 2007/02/15 10:49:47 hrivnac * doc updated *************** *** 68,72 **** * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ - // TBD: check for consistency protected void construct(Point3d[] points, int[] stripCounts, --- 71,74 ---- Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Solid.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Solid.java 14 Feb 2007 21:33:27 -0000 1.5 --- Solid.java 29 Apr 2008 22:36:40 -0000 1.6 *************** *** 12,15 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.6 2008/04/29 22:36:40 hrivnac + * cleaning + * * Revision 1.5 2007/02/14 21:33:27 hrivnac * Extrussion added *************** *** 90,94 **** * others are holes. * It can be null, then no holes are created. */ - // TBD: check for consistency protected void addCoordinatesPolygone(Point3d[] coordinates, int[] stripCounts) { --- 93,96 ---- Index: PointSet.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/PointSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PointSet.java 2 Oct 2007 17:22:45 -0000 1.1 --- PointSet.java 29 Apr 2008 22:36:39 -0000 1.2 *************** *** 13,20 **** /** <code>PointSet</code> defined from points. - * <img src="doc-files/PointSet.gif"> TBD * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.1 2007/10/02 17:22:45 hrivnac * PointSet added --- 13,22 ---- /** <code>PointSet</code> defined from points. * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.2 2008/04/29 22:36:39 hrivnac + * cleaning + * * Revision 1.1 2007/10/02 17:22:45 hrivnac * PointSet added Index: Extrusion.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Extrusion.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Extrusion.java 25 Apr 2008 13:22:45 -0000 1.2 --- Extrusion.java 29 Apr 2008 22:36:36 -0000 1.3 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 22:36:36 hrivnac + * cleaning + * * Revision 1.2 2008/04/25 13:22:45 hrivnac * Cuboid added, Extrusion improved *************** *** 32,36 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: documentation picture public class Extrusion extends Solid { --- 35,38 ---- *************** *** 71,75 **** /** Perform the construction. - // TBD: check for consistency * @param points The array of {@link Point2d}s, points.length > 2. * It can be null. --- 73,76 ---- Index: Ring.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Ring.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Ring.java 17 Apr 2008 22:54:46 -0000 1.2 --- Ring.java 29 Apr 2008 22:36:40 -0000 1.3 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 22:36:40 hrivnac + * cleaning + * * Revision 1.2 2008/04/17 22:54:46 hrivnac * Ring changed *************** *** 36,41 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: documentation picture - // TBD: make RingSegment public class Ring extends Solid { --- 39,42 ---- *************** *** 51,55 **** * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ - // TBD: rho > 0 public Ring(Point2d[] points, double phi0, --- 52,55 ---- *************** *** 62,66 **** /** Perform the construction. - // TBD: check for consistency * @param points The array of {@link Point2d}s in z-rho plane, points.length > 2. * x is radial coordinate of ring. Ring is created over x-y plane. --- 62,65 ---- |
|
From: Julius H. <hr...@us...> - 2008-04-29 22:36:40
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3914/org/freehep/j3d/doc-files Added Files: Cuboit.gif Ring.gif Log Message: cleaning --- NEW FILE: Cuboit.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Ring.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Julius H. <hr...@us...> - 2008-04-29 21:51:36
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/doc-files In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML/GUI/Components/doc-files Modified Files: EnvelopePanel.gif Added Files: HelpPanel.gif Removed Files: HelpLabel.gif Log Message: cleaning --- NEW FILE: HelpPanel.gif --- (This appears to be a binary file; contents omitted.) --- HelpLabel.gif DELETED --- Index: EnvelopePanel.gif =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/doc-files/EnvelopePanel.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsCprxxz and /tmp/cvs4UD1tx differ |
|
From: Julius H. <hr...@us...> - 2008-04-29 21:51:36
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML/GUI/Components Modified Files: HelpPanel.java Log Message: cleaning Index: HelpPanel.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/Components/HelpPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HelpPanel.java 29 Apr 2008 14:36:25 -0000 1.2 --- HelpPanel.java 29 Apr 2008 21:51:03 -0000 1.3 *************** *** 13,20 **** /** Context sensitive Help {@link JLabel} * and performance feedback. ! * <br><img src="doc-files/HelpLabel.gif"> TBD * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.2 2008/04/29 14:36:25 hrivnac * javadoc cleaned --- 13,23 ---- /** Context sensitive Help {@link JLabel} * and performance feedback. ! * <br><img src="doc-files/HelpPanel.gif"> * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.3 2008/04/29 21:51:03 hrivnac + * cleaning + * * Revision 1.2 2008/04/29 14:36:25 hrivnac * javadoc cleaned |
|
From: Julius H. <hr...@us...> - 2008-04-29 21:51:29
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML/FrontEnd Modified Files: GraXMLThread.java Log Message: cleaning Index: GraXMLThread.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/GraXMLThread.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GraXMLThread.java 29 Apr 2008 14:36:24 -0000 1.10 --- GraXMLThread.java 29 Apr 2008 21:51:02 -0000 1.11 *************** *** 21,24 **** --- 21,27 ---- * <pre> * $Log$ + * Revision 1.11 2008/04/29 21:51:02 hrivnac + * cleaning + * * Revision 1.10 2008/04/29 14:36:24 hrivnac * javadoc cleaned *************** *** 91,95 **** } ! // TBD public void detach() { _instance = null; --- 94,98 ---- } ! /** Detach and stop {@link Thread}. Nullify all resource. */ public void detach() { _instance = null; |
|
From: Julius H. <hr...@us...> - 2008-04-29 21:51:29
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML Modified Files: MasterBuilder.java SceneGroup.java Log Message: cleaning Index: SceneGroup.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/SceneGroup.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SceneGroup.java 29 Apr 2008 14:36:24 -0000 1.6 --- SceneGroup.java 29 Apr 2008 21:51:00 -0000 1.7 *************** *** 28,31 **** --- 28,34 ---- * <pre> * $Log$ + * Revision 1.7 2008/04/29 21:51:00 hrivnac + * cleaning + * * Revision 1.6 2008/04/29 14:36:24 hrivnac * javadoc cleaned *************** *** 129,133 **** /** Parse XML file and create {@link BranchGroup}. * @param element The top element of JAXB tree. */ - // TBD: refactor public SceneGroup(Object element, String builderName) throws GraXMLException { --- 132,135 ---- Index: MasterBuilder.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/MasterBuilder.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** MasterBuilder.java 29 Apr 2008 14:36:24 -0000 1.20 --- MasterBuilder.java 29 Apr 2008 21:51:00 -0000 1.21 *************** *** 62,65 **** --- 62,68 ---- * <pre> * $Log$ + * Revision 1.21 2008/04/29 21:51:00 hrivnac + * cleaning + * * Revision 1.20 2008/04/29 14:36:24 hrivnac * javadoc cleaned *************** *** 203,208 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: only JAXB supported - // TBD: write comments to new stuff public abstract class MasterBuilder { --- 206,209 ---- *************** *** 321,325 **** JAXBContext jc = JAXBContext.newInstance(jaxb()); Unmarshaller u = jc.createUnmarshaller(); ! //u.setValidating(true); TBD element = u.unmarshal(source); } --- 322,326 ---- JAXBContext jc = JAXBContext.newInstance(jaxb()); Unmarshaller u = jc.createUnmarshaller(); ! //u.setValidating(true); element = u.unmarshal(source); } *************** *** 391,395 **** public abstract void configure(); ! /** TBD */ public void finish() {}; --- 392,396 ---- public abstract void configure(); ! /** Placeholder for finishing in subclasses. */ public void finish() {}; *************** *** 466,470 **** * strategy and supplied patrameters * (@see BuildOptions#colorPerMaterial). */ ! public final Appearance appearance(String name, String material) { // No Appearance in non-graphical mode if (!GlobalOptions.graphical()) { --- 467,472 ---- * strategy and supplied patrameters * (@see BuildOptions#colorPerMaterial). */ ! public final Appearance appearance(String name, ! String material) { // No Appearance in non-graphical mode if (!GlobalOptions.graphical()) { *************** *** 512,516 **** * @return The {@link Appearance} chosen according to the defined * strategy and supplied patrameters. */ - // TBD: refactor public final Appearance appearance(String name, short red, --- 514,517 ---- *************** *** 734,738 **** private int _count = 0; ! public static void setSource(String s) { String filename = s; int i = s.lastIndexOf('/'); --- 735,742 ---- private int _count = 0; ! /** Set filename of the file containing XML Generic Model. ! * @param s The filename of the file containing XML Generic Model. ! * Path is stripped off. */ ! public static void setSource(String s) { String filename = s; int i = s.lastIndexOf('/'); *************** *** 743,746 **** --- 747,752 ---- } + /** Give filename of the file containing XML Generic Model. + * @return The filename of the file containing XML Generic Model. */ public static String getSource() { return _sourceFile; *************** *** 749,753 **** private static String _sourceFile = ""; ! /** Auxiliary stubs for AGDD. */ public void auxiliaryOutput(String filename) {} --- 755,760 ---- private static String _sourceFile = ""; ! /** Auxiliary output placeholder. ! * @param filename The name of file to write output to. */ public void auxiliaryOutput(String filename) {} |
|
From: Julius H. <hr...@us...> - 2008-04-29 21:51:29
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML/GUI Modified Files: RootWindow.java Log Message: cleaning Index: RootWindow.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/GUI/RootWindow.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** RootWindow.java 29 Apr 2008 14:36:25 -0000 1.15 --- RootWindow.java 29 Apr 2008 21:51:03 -0000 1.16 *************** *** 79,82 **** --- 79,85 ---- * <pre> * $Log$ + * Revision 1.16 2008/04/29 21:51:03 hrivnac + * cleaning + * * Revision 1.15 2008/04/29 14:36:25 hrivnac * javadoc cleaned *************** *** 688,692 **** * @param e The {@link Throwable} to report. * @param l The {@link Logger} to use. */ - // BUG: Specific Exceptions should be handled elsewhere public static final void reportException(String text, Throwable e, Logger l) { l.error(text + ", see GraXML.log for details"); --- 691,694 ---- |
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML/Disconnecter Modified Files: ConnectionManager.java ViewerTreeCellRenderer.java ViewerTreeFactory.java ViewerTreeMouseListener.java Log Message: cleaning Index: ViewerTreeFactory.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeFactory.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ViewerTreeFactory.java 29 Apr 2008 14:36:24 -0000 1.4 --- ViewerTreeFactory.java 29 Apr 2008 21:51:01 -0000 1.5 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/29 21:51:01 hrivnac + * cleaning + * * Revision 1.4 2008/04/29 14:36:24 hrivnac * javadoc cleaned *************** *** 84,88 **** } ! // TBD public static ConnectionManager connectionManager() { return _connectionManager; --- 87,92 ---- } ! /** Give associated {@link ConnectionManager}. ! * @return The associated {@link ConnectionManager}. */ public static ConnectionManager connectionManager() { return _connectionManager; Index: ViewerTreeCellRenderer.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeCellRenderer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ViewerTreeCellRenderer.java 29 Apr 2008 14:36:24 -0000 1.4 --- ViewerTreeCellRenderer.java 29 Apr 2008 21:51:01 -0000 1.5 *************** *** 14,17 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/29 21:51:01 hrivnac + * cleaning + * * Revision 1.4 2008/04/29 14:36:24 hrivnac * javadoc cleaned *************** *** 46,50 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: repaint immediately when something changes public final class ViewerTreeCellRenderer extends DefaultTreeCellRenderer { --- 49,52 ---- Index: ViewerTreeMouseListener.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeMouseListener.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ViewerTreeMouseListener.java 29 Apr 2008 16:50:47 -0000 1.7 --- ViewerTreeMouseListener.java 29 Apr 2008 21:51:01 -0000 1.8 *************** *** 43,46 **** --- 43,49 ---- * <pre> * $Log$ + * Revision 1.8 2008/04/29 21:51:01 hrivnac + * cleaning + * * Revision 1.7 2008/04/29 16:50:47 hrivnac * TreeView operations work also on folders *************** *** 120,124 **** } ! // TBD private JMenuItem popupItem(String name, final short what, --- 123,142 ---- } ! /** Create popup {@link JMenuItem}. ! * @param name The item name. ! * @param what Which kind of operation to performed: ! * <ol> ! * <li>{@link #PICKING} - just pick the object ! * to be available for further ! * operations</li> ! * <li>{@link #TRANSPARENCY} - modify the object' ! * transparency</li> ! * <li>{@link #POLYGON} - modify the object' polygon ! * status</li> ! * </ol> ! * @param how Which operation should be performed, enumerated via ! * picking {@link CallBack}. ! * @param help The ToolTip text. ! * @return The new popup {@link JMenuItem}. */ private JMenuItem popupItem(String name, final short what, *************** *** 152,208 **** DetachableConnection connection; Group group; ! boolean global; ! boolean transform; ! boolean transparency; ! boolean polygon; ! boolean goTo; for (TreePath path : _tree.getSelectionPaths()) { name = path.getLastPathComponent().toString(); connection = _window.j3d().conDB().getConnection(name); ! group = connection.group(); ! for (TransformGroup tg : subTransformGroups(group, null)) { Object[] uo = {_window, name}; ! tg.setUserData(uo); ! global = _window.global(); ! transform = _window.transform(); ! transparency = _window.transparency(); ! polygon = _window.polygon(); ! goTo = _window.goTo(); ! _window.setGlobal( false); ! _window.setTransform( false); ! _window.setTransparency(what == TRANSPARENCY); ! _window.setPolygon( what == POLYGON); ! _window.setGoTo( false); ! _callBack.transformChanged(how, tg); ! _window.setGlobal( global); ! _window.setTransform( transform); ! _window.setTransparency(transparency); ! _window.setPolygon( polygon); ! _window.setGoTo( goTo); } } } ! /** Give (recursively) all {@link TransformGroup}s below specified {@link Group}. ! * @param group The {@link Group} containing {@link TransformGroup}s. ! * @param groups The {@link List} of already accumulated {@link TranmsformGroup}s. ! * Can be <code>null</code>. ! * @return The {@link List} of all accumulated {@link TranmsformGroup}s. */ ! private List<TransformGroup> subTransformGroups(Group group, ! List<TransformGroup> groups) { ! Node node; ! if (groups == null) { ! groups = new ArrayList<TransformGroup>(); } if (group instanceof TransformGroup) { ! groups.add((TransformGroup)group); } ! for (int i = 0; i < group.numChildren(); i++) { ! node = group.getChild(i); ! if (node instanceof Group) { ! subTransformGroups((Group)node, groups); } } ! return groups; } --- 170,240 ---- DetachableConnection connection; Group group; ! boolean global = _window.global(); ! boolean transform = _window.transform(); ! boolean transparency = _window.transparency(); ! boolean polygon = _window.polygon(); ! boolean goTo = _window.goTo(); ! _window.setGlobal( false); ! _window.setTransform( false); ! _window.setTransparency(what == TRANSPARENCY); ! _window.setPolygon( what == POLYGON); ! _window.setGoTo( false); for (TreePath path : _tree.getSelectionPaths()) { name = path.getLastPathComponent().toString(); connection = _window.j3d().conDB().getConnection(name); ! for (DetachableConnection c : subConnections(connection, null)) { ! group = c.group(); Object[] uo = {_window, name}; ! TransformGroup tg = transformGroup(group); ! if (tg != null) { ! tg.setUserData(uo); ! _callBack.transformChanged(how, tg); ! } } } + _window.setGlobal( global); + _window.setTransform( transform); + _window.setTransparency(transparency); + _window.setPolygon( polygon); + _window.setGoTo( goTo); } ! /** Give {@link List} of {@link DetachableConnection}s bellow ! * specified {@link DetachableConnection}. ! * @param connection The {@link DetachableConnection} to be traversed. ! * @param connections The {@link DetachableConnection}s accumulated so far. ! * It gets updated with new {@link DetachableConnection}s. ! * @return The {@link List} of all accumulated {@link DetachableConnection}s. */ ! private List<DetachableConnection> subConnections(DetachableConnection connection, ! List<DetachableConnection> connections) { ! if (connections == null) { ! connections = new ArrayList<DetachableConnection>(); } + connections.add(connection); + for (DetachableConnection c : connection.children()) { + subConnections(c, connections); + } + return connections; + } + + /** Give first {@link TransformGroup} below specified {@link Group}. + * Only one {@link TransformGroup} is returned. + * @param group The {@link Group} containing {@link TransformGroup}. + * @return The found {@link TranmsformGroup}. + * <code>null</code> if none found. */ + private TransformGroup transformGroup(Group group) { + Node node; if (group instanceof TransformGroup) { ! return (TransformGroup)group; } ! else { ! for (int i = 0; i < group.numChildren(); i++) { ! node = group.getChild(i); ! if (node instanceof Group) { ! return transformGroup((Group)node); ! } } } ! return null; } Index: ConnectionManager.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ConnectionManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConnectionManager.java 29 Apr 2008 14:36:24 -0000 1.3 --- ConnectionManager.java 29 Apr 2008 21:51:01 -0000 1.4 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 21:51:01 hrivnac + * cleaning + * * Revision 1.3 2008/04/29 14:36:24 hrivnac * javadoc cleaned *************** *** 87,92 **** // Change Processors --------------------------------------------------------- ! // TBD ! // TBD: refactor public final void show(String value) { DetachableConnection connection = _window.j3d().conDB().getConnection(value); --- 90,97 ---- // Change Processors --------------------------------------------------------- ! /** Show (connect) named {@link DetachableConnection}. Change ! * all {@link DetachableConnection}s below and above to capture ! * the change. ! * @param value The name of the {@link DetachableConnection} to be shown. */ public final void show(String value) { DetachableConnection connection = _window.j3d().conDB().getConnection(value); *************** *** 105,110 **** } ! // TBD ! // TBD: refactor public final void hide(String value) { DetachableConnection connection = _window.j3d().conDB().getConnection(value); --- 110,117 ---- } ! /** Hide (disconnect) named {@link DetachableConnection}. Change ! * all {@link DetachableConnection}s below and above to capture ! * the change. ! * @param value The name of the {@link DetachableConnection} to be hidden. */ public final void hide(String value) { DetachableConnection connection = _window.j3d().conDB().getConnection(value); |
|
From: Julius H. <hr...@us...> - 2008-04-29 21:51:07
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML/Java3DExtensions Modified Files: Colors.java DistanceComparator.java Envelope.java J3DFrame.java Log Message: cleaning Index: J3DFrame.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/J3DFrame.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** J3DFrame.java 29 Apr 2008 14:36:26 -0000 1.11 --- J3DFrame.java 29 Apr 2008 21:51:09 -0000 1.12 *************** *** 46,49 **** --- 46,52 ---- * <pre> * $Log$ + * Revision 1.12 2008/04/29 21:51:09 hrivnac + * cleaning + * * Revision 1.11 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 311,317 **** /** Scale Z-buffer limits and cuts by a factor. Both back and front ! * values are chenged by the same factor. * @param factor The factor to scale all limits by. */ - // BUG: mouse sensitivity stays the same public void changeLimits(double factor) { _frontLimit = _frontLimit * factor; --- 314,319 ---- /** Scale Z-buffer limits and cuts by a factor. Both back and front ! * values are changed by the same factor. * @param factor The factor to scale all limits by. */ public void changeLimits(double factor) { _frontLimit = _frontLimit * factor; Index: DistanceComparator.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/DistanceComparator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DistanceComparator.java 29 Apr 2008 14:36:26 -0000 1.3 --- DistanceComparator.java 29 Apr 2008 21:51:08 -0000 1.4 *************** *** 13,16 **** --- 13,19 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 21:51:08 hrivnac + * cleaning + * * Revision 1.3 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 42,46 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: refactor with Equalator public final class DistanceComparator<T extends Point3d> implements Comparator<T> { --- 45,48 ---- Index: Colors.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Colors.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Colors.java 29 Apr 2008 14:36:26 -0000 1.2 --- Colors.java 29 Apr 2008 21:51:08 -0000 1.3 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 21:51:08 hrivnac + * cleaning + * * Revision 1.2 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 115,120 **** * @param palette The palette number to be chosen, * the default is <code>0</code>. */ - // TBD: check for valid palette public void setPalette(int palette) { _palette = palette; } --- 118,126 ---- * @param palette The palette number to be chosen, * the default is <code>0</code>. */ public void setPalette(int palette) { + if (palette > _colors.length - 1) { + log.info("Palette number " + palette + " doesn't exist. The maximum is " + (_colors.length - 1) + ". 0 is used."); + palette = 0; + } _palette = palette; } *************** *** 123,128 **** * @param offset The offset start colors counting from, * the default is <code>0</code>. */ - // TBD: check for valid offset public void setOffset(int offset) { _index = offset; } --- 129,137 ---- * @param offset The offset start colors counting from, * the default is <code>0</code>. */ public void setOffset(int offset) { + if (offset > _colors[_palette].length - 1) { + log.info("Offset number " + offset + "for palette " + _palette + " doesn't exist. The maximum is " + (_colors[_palette].length - 1) + ". 0 is used."); + offset = 0; + } _index = offset; } Index: Envelope.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Envelope.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Envelope.java 29 Apr 2008 14:36:26 -0000 1.7 --- Envelope.java 29 Apr 2008 21:51:08 -0000 1.8 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.8 2008/04/29 21:51:08 hrivnac + * cleaning + * * Revision 1.7 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 77,81 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: antialiasing public final class Envelope extends BranchGroup { --- 80,83 ---- *************** *** 179,183 **** } ! // TBD public void change(String part) { // Axis --- 181,187 ---- } ! /** Change visibility of a component. ! * @param part The name of the component to change: ! * <code>Axis</code>, <code>Legend</code>, <code>Cylinder</code> or <code>Floor</code>. */ public void change(String part) { // Axis *************** *** 223,227 **** } ! // TBD private TransformGroup label(String text, double[] place, --- 227,238 ---- } ! /** Create axis <em>label</em>. ! * @param text The label' text. ! * @param place The xyz coordinates of the label. ! * @param color The {@link Color} of the label. ! * @param size The size of the label. ! * @param transparency The transparency level of the label. ! * @param drawPoint Whether point should be created at point' place. ! * @return The {@link TransformGroup} containing label. */ private TransformGroup label(String text, double[] place, *************** *** 263,282 **** } ! // TBD public static boolean axis() { return _axis; } ! // TBD public static boolean legend() { return _legend; } ! // TBD public static boolean cylinder() { return _cylinder; } ! // TBD public static boolean floor() { return _floor; --- 274,297 ---- } ! /** Tell if axis is drawn. ! * @return Whether axis is drawn. */ public static boolean axis() { return _axis; } ! /** Tell if legend is drawn. ! * @return Whether legend is drawn. */ public static boolean legend() { return _legend; } ! /** Tell if cylinder is drawn. ! * @return Whether cylinder is drawn. */ public static boolean cylinder() { return _cylinder; } ! /** Tell if floor is drawn. ! * @return Whether floor is drawn. */ public static boolean floor() { return _floor; *************** *** 299,303 **** private BranchGroup _floorGroup; ! // TBD public static final void setLength(double length) { _length = length; --- 314,319 ---- private BranchGroup _floorGroup; ! /** Set axis, cylinder and floor length. ! * @param length The axis length. */ public static final void setLength(double length) { _length = length; *************** *** 306,310 **** private static double _length = 2; ! // TBD public static final void setRadius(double radius) { _radius = radius; --- 322,327 ---- private static double _length = 2; ! /** Set cylinder radius. ! * @param radius The cylinder radius. */ public static final void setRadius(double radius) { _radius = radius; *************** *** 313,317 **** private static double _radius = 1; ! // TBD public static final void setNTicks(int nTicks) { _nTicks = nTicks; --- 330,335 ---- private static double _radius = 1; ! /** Set number of ticks on the axis. ! * @param nTicks The number of ticks on the axis. */ public static final void setNTicks(int nTicks) { _nTicks = nTicks; |
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9454/net/hep/graphics/GraXML/Java3DExtensions/Interactivity Modified Files: Interacter.java PickRotateActBehavior.java PickTranslateActBehavior.java PickZoomActBehavior.java Log Message: cleaning Index: PickRotateActBehavior.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/PickRotateActBehavior.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PickRotateActBehavior.java 29 Apr 2008 14:36:26 -0000 1.2 --- PickRotateActBehavior.java 29 Apr 2008 21:51:10 -0000 1.3 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 21:51:10 hrivnac + * cleaning + * * Revision 1.2 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 48,52 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: refactor wih other Behaviours public final class PickRotateActBehavior extends PickRotateBehavior { --- 51,54 ---- *************** *** 67,71 **** public final void setupCallback(PickingCallback callBack) { super.setupCallback(callBack); ! _callback = (CallBack)callBack; // TBD: check } --- 69,73 ---- public final void setupCallback(PickingCallback callBack) { super.setupCallback(callBack); ! _callback = (CallBack)callBack; } Index: Interacter.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/Interacter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Interacter.java 29 Apr 2008 14:36:26 -0000 1.10 --- Interacter.java 29 Apr 2008 21:51:10 -0000 1.11 *************** *** 27,30 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.11 2008/04/29 21:51:10 hrivnac + * cleaning + * * Revision 1.10 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 83,87 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: use minimal even in grahicsl non-interactive case public final class Interacter extends BranchGroup { --- 86,89 ---- *************** *** 300,304 **** private String _name = ""; ! /** TBD. */ public TransformGroup transform() { return _transform; --- 302,307 ---- private String _name = ""; ! /** Give <code>Interacter</code> {@link TransformGroup}. ! * @return The <code>Interacter</code> {@link TransformGroup}. */ public TransformGroup transform() { return _transform; *************** *** 307,311 **** private TransformGroup _transform; ! /** TBD. */ public Node node() { return _node; --- 310,315 ---- private TransformGroup _transform; ! /** Give contained {@link Node}. ! * @return The contained {@link Node}. */ public Node node() { return _node; Index: PickZoomActBehavior.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/PickZoomActBehavior.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PickZoomActBehavior.java 29 Apr 2008 14:36:26 -0000 1.2 --- PickZoomActBehavior.java 29 Apr 2008 21:51:10 -0000 1.3 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 21:51:10 hrivnac + * cleaning + * * Revision 1.2 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 48,52 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: refactor wih other Behaviours public final class PickZoomActBehavior extends PickZoomBehavior { --- 51,54 ---- *************** *** 67,71 **** public final void setupCallback(PickingCallback callBack) { super.setupCallback(callBack); ! _callback = (CallBack)callBack; // TBD: check } --- 69,73 ---- public final void setupCallback(PickingCallback callBack) { super.setupCallback(callBack); ! _callback = (CallBack)callBack; } Index: PickTranslateActBehavior.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Java3DExtensions/Interactivity/PickTranslateActBehavior.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PickTranslateActBehavior.java 29 Apr 2008 14:36:26 -0000 1.2 --- PickTranslateActBehavior.java 29 Apr 2008 21:51:10 -0000 1.3 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 21:51:10 hrivnac + * cleaning + * * Revision 1.2 2008/04/29 14:36:26 hrivnac * javadoc cleaned *************** *** 48,52 **** * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ - // TBD: refactor wih other Behaviours public final class PickTranslateActBehavior extends PickTranslateBehavior { --- 51,54 ---- *************** *** 67,71 **** public final void setupCallback(PickingCallback callBack) { super.setupCallback(callBack); ! _callback = (CallBack)callBack; // TBD: check } --- 69,73 ---- public final void setupCallback(PickingCallback callBack) { super.setupCallback(callBack); ! _callback = (CallBack)callBack; } |
|
From: Julius H. <hr...@us...> - 2008-04-29 16:51:35
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv513/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveRep.java Log Message: identity transformation added to ring-elements to allow later manipulations Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JiveRep.java 29 Apr 2008 14:46:21 -0000 1.10 --- JiveRep.java 29 Apr 2008 16:51:35 -0000 1.11 *************** *** 49,52 **** --- 49,55 ---- * <pre> * $Log$ + * Revision 1.11 2008/04/29 16:51:35 hrivnac + * identity transformation added to ring-elements to allow later manipulations + * * Revision 1.10 2008/04/29 14:46:21 hrivnac * javadoc cleaned *************** *** 140,148 **** zrho1[zrho.length - i - 1] = new Point2d(- zrho[i].x, zrho[i].y); } ! use(new Ring(zrho, phi0, nPhi, _appearance), name + "+", info); ! use(new Ring(zrho1, phi0, nPhi, _appearance), name + "-", info); } else { ! use(new Ring(zrho, phi0, nPhi, _appearance), name, info); } --- 143,151 ---- zrho1[zrho.length - i - 1] = new Point2d(- zrho[i].x, zrho[i].y); } ! use(ring(zrho, phi0, nPhi), name + "+", info); ! use(ring(zrho1, phi0, nPhi), name + "-", info); } else { ! use(ring(zrho, phi0, nPhi), name, info); } *************** *** 183,186 **** --- 186,209 ---- } + /** Draw one {@link Ring}. + * @param zrho The z-rho coordinates of the ring. + * @param phi0 The starting phi of the solid + * @param nPhi The number of segments in phi. */ + // Empty Transformation is added to allow later manipulation + private Shape3D ring(Point2d[] zrho, + double phi0, + int nPhi) { + + Ring ring = new Ring(zrho, phi0, nPhi, + _appearance); + Matrix3d m = new Matrix3d(UMATRIX); + TransformGroup it = new TransformGroup(new Transform3D(m, + new Vector3d(0, 0, 0), + 1)); + tg().addChild(it); + setTg(it); + return ring; + } + /** Draw one {@link Cuboid}. * @param zrho The z-rho coordinates of one solid cuboid. |
|
From: Julius H. <hr...@us...> - 2008-04-29 16:50:48
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32581/net/hep/graphics/GraXML/Disconnecter Modified Files: ViewerTreeMouseListener.java Log Message: TreeView operations work also on folders Index: ViewerTreeMouseListener.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/Disconnecter/ViewerTreeMouseListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ViewerTreeMouseListener.java 29 Apr 2008 14:36:24 -0000 1.6 --- ViewerTreeMouseListener.java 29 Apr 2008 16:50:47 -0000 1.7 *************** *** 32,35 **** --- 32,36 ---- // Java3D + import javax.media.j3d.Node; import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; *************** *** 42,45 **** --- 43,49 ---- * <pre> * $Log$ + * Revision 1.7 2008/04/29 16:50:47 hrivnac + * TreeView operations work also on folders + * * Revision 1.6 2008/04/29 14:36:24 hrivnac * javadoc cleaned *************** *** 148,152 **** DetachableConnection connection; Group group; - TransformGroup tg; boolean global; boolean transform; --- 152,155 ---- *************** *** 158,163 **** connection = _window.j3d().conDB().getConnection(name); group = connection.group(); ! if (group instanceof TransformGroup) { ! tg = (TransformGroup)group; Object[] uo = {_window, name}; tg.setUserData(uo); --- 161,165 ---- connection = _window.j3d().conDB().getConnection(name); group = connection.group(); ! for (TransformGroup tg : subTransformGroups(group, null)) { Object[] uo = {_window, name}; tg.setUserData(uo); *************** *** 182,185 **** --- 184,210 ---- } + /** Give (recursively) all {@link TransformGroup}s below specified {@link Group}. + * @param group The {@link Group} containing {@link TransformGroup}s. + * @param groups The {@link List} of already accumulated {@link TranmsformGroup}s. + * Can be <code>null</code>. + * @return The {@link List} of all accumulated {@link TranmsformGroup}s. */ + private List<TransformGroup> subTransformGroups(Group group, + List<TransformGroup> groups) { + Node node; + if (groups == null) { + groups = new ArrayList<TransformGroup>(); + } + if (group instanceof TransformGroup) { + groups.add((TransformGroup)group); + } + for (int i = 0; i < group.numChildren(); i++) { + node = group.getChild(i); + if (node instanceof Group) { + subTransformGroups((Group)node, groups); + } + } + return groups; + } + // Handlers ------------------------------------------------------------------ |
|
From: Julius H. <hr...@us...> - 2008-04-29 15:16:14
|
Update of /cvsroot/graxml/DetDescr/GDML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28891 Modified Files: build.xml Log Message: javadoc cleaned Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/ant/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** build.xml 19 Oct 2007 14:11:35 -0000 1.14 --- build.xml 29 Apr 2008 15:15:45 -0000 1.15 *************** *** 226,231 **** <group title="Geometric Model" packages="net.hep.geant4.GDML.GeometricModel*"/> <group title="Test" packages="net.hep.geant4.GDML.Test*"/> ! <link href="http://java.sun.com/j2se/1.6.0/docs/api"/> ! <link href="http://java.sun.com/products/java-media/3D/forDevelopers/J3D_1_3_API/j3dapi/"/> <link href="http://logging.apache.org/log4j/docs/api"/> <link href="http://www.beanshell.org/javadoc"/> --- 226,231 ---- <group title="Geometric Model" packages="net.hep.geant4.GDML.GeometricModel*"/> <group title="Test" packages="net.hep.geant4.GDML.Test*"/> ! <link href="http://java.sun.com/javase/6/docs/api"/> ! <link href="http://download.java.net/media/java3d/javadoc/1.5.0"/> <link href="http://logging.apache.org/log4j/docs/api"/> <link href="http://www.beanshell.org/javadoc"/> |
|
From: Julius H. <hr...@us...> - 2008-04-29 15:14:28
|
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27062/net/hep/geant4/GDML/GeometricModel Modified Files: Boolean.java Evaluator.java GDMLBuilder.java Solid.java Log Message: javadoc cleaned Index: Evaluator.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/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:58:25 -0000 1.2 --- Evaluator.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 38,41 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2005/05/13 14:58:25 hrivnac * Evaluator scales to 1m *************** *** 91,94 **** --- 94,101 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Solid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Solid.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Solid.java 25 Jan 2007 17:09:54 -0000 1.3 --- Solid.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 27,30 **** --- 27,33 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/25 17:09:54 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 77,80 **** --- 80,87 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Boolean.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Boolean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Boolean.java 25 Jan 2007 17:09:54 -0000 1.2 --- Boolean.java 29 Apr 2008 15:13:46 -0000 1.3 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:46 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:54 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 76,79 **** --- 79,86 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: GDMLBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/GDMLBuilder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GDMLBuilder.java 14 Jan 2007 17:21:43 -0000 1.6 --- GDMLBuilder.java 29 Apr 2008 15:13:47 -0000 1.7 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.7 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.6 2007/01/14 17:21:43 hrivnac * embedded demos included *************** *** 99,102 **** --- 102,109 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ |
Update of /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27062/net/hep/geant4/GDML/GeometricModel/Reps Modified Files: BooleanSolid.java Box.java Cone.java Eltube.java Gdml.java Hype.java Orb.java Para.java ParametrisedPlacement.java Polycone.java Polyhedra.java Position.java ReplicaPlacement.java Rotation.java Setup.java SinglePlacement.java Sphere.java Torus.java Trap.java Trd.java Tube.java Volume.java Log Message: javadoc cleaned Index: Trd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Trd.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Trd.java 25 Jan 2007 17:09:58 -0000 1.3 --- Trd.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/25 17:09:58 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 78,81 **** --- 81,88 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Sphere.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Sphere.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Sphere.java 25 Jan 2007 17:09:55 -0000 1.2 --- Sphere.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 79,82 **** --- 82,89 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Orb.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Orb.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Orb.java 25 Jan 2007 17:09:55 -0000 1.2 --- Orb.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 26,29 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 49,52 **** --- 52,59 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: ParametrisedPlacement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/ParametrisedPlacement.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ParametrisedPlacement.java 25 Jan 2007 17:09:55 -0000 1.2 --- ParametrisedPlacement.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 37,40 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 57,60 **** --- 60,67 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: ReplicaPlacement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/ReplicaPlacement.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReplicaPlacement.java 25 Jan 2007 17:09:55 -0000 1.2 --- ReplicaPlacement.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 33,36 **** --- 33,39 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 53,56 **** --- 56,63 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: SinglePlacement.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/SinglePlacement.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SinglePlacement.java 25 Jan 2007 17:09:55 -0000 1.2 --- SinglePlacement.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 23,26 **** --- 23,29 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 70,73 **** --- 73,80 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Box.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Box.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Box.java 25 Jan 2007 17:09:55 -0000 1.3 --- Box.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 96,99 **** --- 99,106 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Position.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Position.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Position.java 25 Jan 2007 17:09:55 -0000 1.2 --- Position.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 24,27 **** --- 24,30 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 74,77 **** --- 77,84 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Trap.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Trap.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Trap.java 25 Jan 2007 17:09:58 -0000 1.3 --- Trap.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 31,34 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/25 17:09:58 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 87,90 **** --- 90,97 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Hype.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Hype.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Hype.java 25 Jan 2007 17:09:55 -0000 1.2 --- Hype.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 31,34 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 57,60 **** --- 60,67 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Tube.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Tube.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Tube.java 25 Jan 2007 17:09:58 -0000 1.3 --- Tube.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 26,29 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/25 17:09:58 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 70,73 **** --- 73,80 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Setup.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Setup.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Setup.java 25 Jan 2007 17:09:55 -0000 1.2 --- Setup.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 22,25 **** --- 22,28 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 51,54 **** --- 54,61 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Gdml.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Gdml.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Gdml.java 26 Jan 2007 11:52:58 -0000 1.3 --- Gdml.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/26 11:52:58 hrivnac * Booleans types solved *************** *** 86,89 **** --- 89,96 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Polycone.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Polycone.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Polycone.java 25 Jan 2007 17:09:55 -0000 1.2 --- Polycone.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 30,33 **** --- 30,36 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 56,59 **** --- 59,66 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Para.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Para.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Para.java 25 Jan 2007 17:09:55 -0000 1.3 --- Para.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 31,34 **** --- 31,37 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 84,87 **** --- 87,94 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Cone.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Cone.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Cone.java 25 Jan 2007 17:09:55 -0000 1.3 --- Cone.java 29 Apr 2008 15:13:47 -0000 1.4 *************** *** 26,29 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.3 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 76,79 **** --- 79,86 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Polyhedra.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Polyhedra.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Polyhedra.java 25 Jan 2007 17:09:55 -0000 1.2 --- Polyhedra.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 55,58 **** --- 58,65 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: BooleanSolid.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/BooleanSolid.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BooleanSolid.java 26 Jan 2007 11:52:58 -0000 1.2 --- BooleanSolid.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 27,35 **** /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} * of <code>subtraction</code>, <code>intersections</code> and <code>union</code> GDML elements ! * connected via JAXB {@link net.hep.geant4.GDML.JAXB.Subtraction} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log$ * Revision 1.2 2007/01/26 11:52:58 hrivnac * Booleans types solved --- 27,38 ---- /** GraXML representation {@link net.hep.graphics.GraXML.GraXMLJAXBRep} * of <code>subtraction</code>, <code>intersections</code> and <code>union</code> GDML elements ! * connected via JAXB {@link net.hep.geant4.GDML.JAXB.BooleanSolidType} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/26 11:52:58 hrivnac * Booleans types solved *************** *** 61,64 **** --- 64,71 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Torus.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Torus.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Torus.java 25 Jan 2007 17:09:58 -0000 1.2 --- Torus.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 26,29 **** --- 26,32 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:58 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 49,52 **** --- 52,59 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Rotation.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Rotation.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Rotation.java 25 Jan 2007 17:09:55 -0000 1.2 --- Rotation.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 25,28 **** --- 25,31 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 84,87 **** --- 87,94 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Eltube.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Eltube.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Eltube.java 25 Jan 2007 17:09:55 -0000 1.2 --- Eltube.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 29,32 **** --- 29,35 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:55 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 52,55 **** --- 55,62 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ Index: Volume.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/GDML/src/net/hep/geant4/GDML/GeometricModel/Reps/Volume.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Volume.java 25 Jan 2007 17:09:58 -0000 1.2 --- Volume.java 29 Apr 2008 15:13:47 -0000 1.3 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/29 15:13:47 hrivnac + * javadoc cleaned + * * Revision 1.2 2007/01/25 17:09:58 hrivnac * migrated to JAXB 2.0, except Booleans *************** *** 90,93 **** --- 93,100 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ |
