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

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/04/25 08:49:29

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

Log message:
        closer... but not right

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/MainNode2D.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.22 
fenfire/org/fenfire/demo/buoyoing.py:1.23
--- fenfire/org/fenfire/demo/buoyoing.py:1.22   Fri Apr 25 07:19:39 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Fri Apr 25 08:49:29 2003
@@ -180,7 +180,8 @@
     #wholepage = pg0.getCurrent().subSpan(0,1)
     #span = wholepage.subArea(70, 50, 400, 100)
     paperA = ppAct.newPaper()
-    note1 = ppAct.newNote(paperA, 0,-50, 'This is a test!')
+    note1 = ppAct.newNote(paperA, 0,0, 'This is a test!')
+    note1b = ppAct.newNote(paperA, 100, 100, 'This is translated by 
(100,100)!')
     #linkid1 = addTrans(span, paper)
 
     paperB = ppAct.newPaper()
Index: fenfire/org/fenfire/view/buoy/MainNode2D.java
diff -u fenfire/org/fenfire/view/buoy/MainNode2D.java:1.6 
fenfire/org/fenfire/view/buoy/MainNode2D.java:1.7
--- fenfire/org/fenfire/view/buoy/MainNode2D.java:1.6   Fri Apr 25 08:16:02 2003
+++ fenfire/org/fenfire/view/buoy/MainNode2D.java       Fri Apr 25 08:49:29 2003
@@ -76,9 +76,11 @@
        vs.coords.getSqSize(into, tmp);
        w = tmp[0]; h = tmp[1];
        focusFrame = into;
-       box2paper =
-           vs.coords.orthoBox(0, 0, panX-w/2, panY-h/2, 
-                              1/zoom, 1/zoom, w, h);
+
+       // create the coordsys, then position it through other method
+       // this way, we only have the positioning code in one place
+       box2paper = vs.coords.orthoBox(0,0,0,0,0,0,0,0);
+       setZoomPan(vs, box2paper);
 
        view.render(vs, plane, into, into, box2paper);
     }
@@ -158,9 +160,7 @@
      */
     private void setZoomPan(VobScene vs, int mainFrame) {
        DefaultVobMatcher m = (DefaultVobMatcher)vs.matcher;
-       // The point is that cs should transform (panx, pany) to (0,0)
-       // and (panx+1, pany+1) to (zoom, zoom)
-       vs.coords.setOrthoBoxParams(box2paper, 0, panX-w/2, panY-h/2, 
+       vs.coords.setOrthoBoxParams(box2paper, 0, panX-w*zoom/2, panY-h*zoom/2, 
                                    1/zoom, 1/zoom, w, h);
     }
 }