[Gzz-commits] fenfire/org/fenfire/modules/pp UniquePaperVob.java

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/22 17:59:27

Modified files:
        org/fenfire/modules/pp: UniquePaperVob.java 

Log message:
        fix x/y mathematic

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/UniquePaperVob.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/UniquePaperVob.java
diff -u fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.10 
fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.11
--- fenfire/org/fenfire/modules/pp/UniquePaperVob.java:1.10     Tue Apr 22 
08:14:32 2003
+++ fenfire/org/fenfire/modules/pp/UniquePaperVob.java  Tue Apr 22 17:59:27 2003
@@ -14,8 +14,8 @@
  * surrounded by a rectangle of the current foreground color.
  */
 public class UniquePaperVob extends AbstractVob {
-public static final String rcsid = "$Id: UniquePaperVob.java,v 1.10 2003/04/22 
12:14:32 mudyc Exp $";
-    public static boolean dbg = false;
+public static final String rcsid = "$Id: UniquePaperVob.java,v 1.11 2003/04/22 
21:59:27 mudyc Exp $";
+    public static boolean dbg = true;
     private static void pa(String s) { 
System.out.println("UniquePaperVob::"+s); }
 
 
@@ -69,7 +69,7 @@
 
            if (a > Math.PI/4 && a <= Math.PI *3f/4) {
                // verticals..
-               f = mx + mw/2 - panx*zoom;
+               f = mx + mw/2 + panx*zoom;
 
                // >> if too far we have to be at least mw away from mx. 
                while ( f < mx - 2*mw) {
@@ -93,7 +93,7 @@
            } else {
                j = (float)Math.sin(k - Math.PI/2);
                // horizontals..
-               f = my + mh/2 - pany*zoom;
+               f = my + mh/2 + pany*zoom;
 
                // >> if too far we have to be at least mw away from my. 
                while ( f < my - 2*mh) {
@@ -101,7 +101,7 @@
                    f += Math.abs( (((1-ratio) * linew)/j)*zoom );
                }
                // add x component
-               f += (panx*zoom)*(float)Math.tan(a);
+               f -= (panx*zoom)*(float)Math.tan(a);
 
                if (a < Math.PI/4)
                    f += (mw/2)*(float)Math.tan(a);