[Gzz-commits] fenfire/org/fenfire/modules/pp PPCanvasCursor.j...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/16 03:46:47

Modified files:
        org/fenfire/modules/pp: PPCanvasCursor.java SinglePaper.java 

Log message:
        Fix irregu coords. Were chained wrongly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasCursor.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/SinglePaper.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/modules/pp/PPCanvasCursor.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.17 
fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.18
--- fenfire/org/fenfire/modules/pp/PPCanvasCursor.java:1.17     Wed Apr 16 
02:31:30 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasCursor.java  Wed Apr 16 03:46:47 2003
@@ -24,7 +24,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.17 
2003/04/16 06:31:30 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.18 
2003/04/16 07:46:47 tjl Exp $";  
     public static boolean dbg = false;
     private static void p(String s) { if (dbg) pa(s); }
     private static void pa(String s) { 
System.out.println("PPCanvasCursor::"+s); }
@@ -165,8 +165,10 @@
        }
        
        if (GraphicsAPI.getInstance() instanceof GLAPI) {
-           c2fCS = vs.orthoCS(into, "C2F",0,0,0, 10,10);
-           int c2fCSInv = vs.orthoCS(into, "C2FINV",0,0,0, 10,10);
+           c2fCS = vs.orthoCS(0, "C2F",0,0,0, 10,10);
+           vs.matcher.add(into, c2fCS, "C2F");
+           int c2fCSInv = vs.orthoCS(0, "C2FINV",0,0,0, 10,10);
+           vs.matcher.add(into, c2fCSInv, "C2FINV");
            
            setZoomPan(vs, into);
            SinglePaper.i(fen, node, window, nodeview)
Index: fenfire/org/fenfire/modules/pp/SinglePaper.java
diff -u fenfire/org/fenfire/modules/pp/SinglePaper.java:1.8 
fenfire/org/fenfire/modules/pp/SinglePaper.java:1.9
--- fenfire/org/fenfire/modules/pp/SinglePaper.java:1.8 Tue Apr 15 10:43:42 2003
+++ fenfire/org/fenfire/modules/pp/SinglePaper.java     Wed Apr 16 03:46:47 2003
@@ -17,7 +17,7 @@
  * the background and the vobs inside the plane.
  */
 public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.8 2003/04/15 
14:43:42 mudyc Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.9 2003/04/16 
07:46:47 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -131,6 +131,7 @@
        final int frameUnit = vs.unitSqCS(frameCS, "USQ");
 
        final int frameUnit2paper = vs.orthoCS(inversePanZoom, "PZIN", 0, 
+//                                     -sqs[0], -sqs[1], sqs[0], sqs[1]);
                                        -sqs[0]/2, -sqs[1]/2, sqs[0], sqs[1]);