[Gzz-commits] fenfire/org/fenfire demo/buoyoing.py view/Paper...

[Tuomas J. Lukka]

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

Modified files:
        org/fenfire/demo: buoyoing.py 
        org/fenfire/view: PaperView2D.java 
        org/fenfire/view/buoy: NodeType2D.java 

Log message:
        Move paper backwards to show the pages

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PaperView2D.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/NodeType2D.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.28 
fenfire/org/fenfire/demo/buoyoing.py:1.29
--- fenfire/org/fenfire/demo/buoyoing.py:1.28   Sat Apr 26 04:31:41 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Sat Apr 26 04:41:03 2003
@@ -140,22 +140,22 @@
 paperview = ff.view.PaperView2D(vob.putil.demowindow.w, view)
 irregu = ff.view.IrregularViewportView2D(paperview)
 
-paperviewonly = ff.view.PaperView2D(vob.putil.demowindow.w, None)
+# paperviewonly = ff.view.PaperView2D(vob.putil.demowindow.w, None)
 
 ff.view.buoy.NodeType2D.effigy = 0
 
-irregu.debugFlags = irregu.DEBUG_CONTENT | irregu.DEBUG_CHILD
+# irregu.debugFlags = irregu.DEBUG_CONTENT | irregu.DEBUG_CHILD
 # irregu.border = 10
-irregu.type = 2
+#irregu.type = 2
 
 plane = Nodes.get(paperA)
 
 mainNode = ff.view.buoy.MainNode2D(plane, irregu)
 # mainNode = ff.view.buoy.MainNode2D(plane, paperview)
 
-connector = ff.view.buoy.PPConnector(fen, paperviewonly)
-connector.hackForTesting = 1
-# connector = ff.view.buoy.PPConnector(fen, irregu)
+#connector = ff.view.buoy.PPConnector(fen, paperviewonly)
+#connector.hackForTesting = 1
+connector = ff.view.buoy.PPConnector(fen, irregu)
 
 class Scene(vob.buoy.buoymanager.RealBuoyManager):
     def __init__(self):
Index: fenfire/org/fenfire/view/PaperView2D.java
diff -u fenfire/org/fenfire/view/PaperView2D.java:1.4 
fenfire/org/fenfire/view/PaperView2D.java:1.5
--- fenfire/org/fenfire/view/PaperView2D.java:1.4       Fri Apr 25 08:44:43 2003
+++ fenfire/org/fenfire/view/PaperView2D.java   Sat Apr 26 04:41:03 2003
@@ -13,7 +13,7 @@
  */
 public class PaperView2D extends View2D {
     public static boolean dbg = true;
-public static final String rcsid = "$Id: PaperView2D.java,v 1.4 2003/04/25 
12:44:43 tjl Exp $";
+public static final String rcsid = "$Id: PaperView2D.java,v 1.5 2003/04/26 
08:41:03 tjl Exp $";
     private static void pa(String s) { System.out.println("AlphContent: "+s); }
 
     public PaperMill paperMill;
@@ -63,7 +63,9 @@
            }
 
        }
-       vs.put(v, box2screen, magnified);
+
+       vs.put(v, vs.translateCS(box2screen, "Papertr", 0, 0, 1000), 
+               magnified);
 
        if(child != null)
            child.render(vs, plane, matchingParent,
Index: fenfire/org/fenfire/view/buoy/NodeType2D.java
diff -u fenfire/org/fenfire/view/buoy/NodeType2D.java:1.3 
fenfire/org/fenfire/view/buoy/NodeType2D.java:1.4
--- fenfire/org/fenfire/view/buoy/NodeType2D.java:1.3   Sat Apr 26 04:31:41 2003
+++ fenfire/org/fenfire/view/buoy/NodeType2D.java       Sat Apr 26 04:41:04 2003
@@ -82,12 +82,12 @@
        float scale = w / rect.width;
        if(scale < h / rect.height) scale = h / rect.height;
 
-///    int box2paper = vs.coords.orthoBox(0, 0, rect.x, rect.y, 
-///                                       1/scale, 1/scale, 
-///                                       w, h);
-       int box2paper = vs.coords.orthoBox(0, 0, 0, 0, 
-                                          1, 1, 
+       int box2paper = vs.coords.orthoBox(0, 0, rect.x, rect.y, 
+                                          1/scale, 1/scale, 
                                           w, h);
+//     int box2paper = vs.coords.orthoBox(0, 0, 0, 0, 
+//                                        1, 1, 
+//                                        w, h);
        vs.matcher.add(into, box2paper, "BUOYPAP");
 
        view.render(vs, plane, into, into, box2paper);