Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29260/org/freehep/j3d
Modified Files:
ConeSegment.java
Log Message:
Cone more liberal
Index: ConeSegment.java
===================================================================
RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/ConeSegment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConeSegment.java 16 Jan 2007 14:56:25 -0000 1.2
--- ConeSegment.java 5 Nov 2007 15:01:21 -0000 1.3
***************
*** 17,20 ****
--- 17,23 ----
* <pre>
* $Log$
+ * Revision 1.3 2007/11/05 15:01:21 hrivnac
+ * Cone more liberal
+ *
* Revision 1.2 2007/01/16 14:56:25 hrivnac
* PolyGone added
***************
*** 91,98 ****
* @param xminp The x inner radius at +z/2.
* @param yminp The y inner radius at +z/2.
! * @param xmaxm The x outer radius at -z/2, xmaxm > xminm.
! * @param ymaxm The y outer radius at -z/2, ymaxm > yminm.
! * @param xmaxp The x outer radius at +z/2, xmaxp > xminp.
! * @param ymaxp The y outer radius at +z/2, ymaxp > yminp.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
--- 94,101 ----
* @param xminp The x inner radius at +z/2.
* @param yminp The y inner radius at +z/2.
! * @param xmaxm The x outer radius at -z/2, xmaxm >= xminm.
! * @param ymaxm The y outer radius at -z/2, ymaxm >= yminm.
! * @param xmaxp The x outer radius at +z/2, xmaxp >= xminp.
! * @param ymaxp The y outer radius at +z/2, ymaxp >= yminp.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
***************
*** 132,137 ****
* @param rminm The inner radius at -z/2.
* @param rminp The inner radius at +z/2.
! * @param rmaxm The outer radius at -z/2, rmaxm > rminm.
! * @param rmaxp The outer radius at +z/2, rmaxp > rminp.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
--- 135,140 ----
* @param rminm The inner radius at -z/2.
* @param rminp The inner radius at +z/2.
! * @param rmaxm The outer radius at -z/2, rmaxm >= rminm.
! * @param rmaxp The outer radius at +z/2, rmaxp >= rminp.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
***************
*** 166,170 ****
/** Create tube segment.
* @param rmin The inner radius.
! * @param rmax The outer radius at -z/2, rmax > rmin.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
--- 169,173 ----
/** Create tube segment.
* @param rmin The inner radius.
! * @param rmax The outer radius at -z/2, rmax >= rmin.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
***************
*** 197,201 ****
/** Create tube.
* @param rmin The inner radius.
! * @param rmax The outer radius at -z/2, rmax > rmin.
* @param l The length.
* @param granularity The number of segments of curves approximations, granulariy > 2.
--- 200,204 ----
/** Create tube.
* @param rmin The inner radius.
! * @param rmax The outer radius at -z/2, rmax >= rmin.
* @param l The length.
* @param granularity The number of segments of curves approximations, granulariy > 2.
***************
*** 254,261 ****
* @param xminp The x inner radius at +z/2.
* @param yminp The y inner radius at +z/2.
! * @param xmaxm The x outer radius at -z/2, xmaxm > xminm.
! * @param ymaxm The y outer radius at -z/2, ymaxm > yminm.
! * @param xmaxp The x outer radius at +z/2, xmaxp > xminp.
! * @param ymaxp The y outer radius at +z/2, ymaxp > yminp.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
--- 257,264 ----
* @param xminp The x inner radius at +z/2.
* @param yminp The y inner radius at +z/2.
! * @param xmaxm The x outer radius at -z/2, xmaxm >= xminm.
! * @param ymaxm The y outer radius at -z/2, ymaxm >= yminm.
! * @param xmaxp The x outer radius at +z/2, xmaxp >= xminp.
! * @param ymaxp The y outer radius at +z/2, ymaxp >= yminp.
* @param l The length.
* @param phimin The starting azimutal angle [rad], 0-2*pi.
***************
*** 282,289 ****
phimax = Equalator.correct(phimax, 2*PI);
// Check preconditins
! if (! (xmaxm > xminm &&
! ymaxm > yminm &&
! xmaxp > xminp &&
! ymaxp > yminp &&
phimin <= 2*PI && phimin >= 0 &&
phimax <= 2*PI && phimax >= 0 &&
--- 285,292 ----
phimax = Equalator.correct(phimax, 2*PI);
// Check preconditins
! if (! (xmaxm >= xminm &&
! ymaxm >= yminm &&
! xmaxp >= xminp &&
! ymaxp >= yminp &&
phimin <= 2*PI && phimin >= 0 &&
phimax <= 2*PI && phimax >= 0 &&
***************
*** 292,296 ****
xminm + ", " + yminm + ", " + xmaxm + ", " + ymaxm + ", " + xminp + ", " + yminp + ", " + xmaxp + ", " + ymaxp + ", " + phimin + ", " + phimax + ")" +
" are illegal, they should satisfy following conditions:" +
! " xminm < xmaxm, yminm < ymaxm, xminp < xmaxp, yminp < ymaxp, 0 <= phimin < phimax <= 2*pi");
}
if (! (granularity > 2)) {
--- 295,299 ----
xminm + ", " + yminm + ", " + xmaxm + ", " + ymaxm + ", " + xminp + ", " + yminp + ", " + xmaxp + ", " + ymaxp + ", " + phimin + ", " + phimax + ")" +
" are illegal, they should satisfy following conditions:" +
! " xminm <= xmaxm, yminm <= ymaxm, xminp <= xmaxp, yminp <= ymaxp, 0 <= phimin < phimax <= 2*pi");
}
if (! (granularity > 2)) {
|
