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

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/07/19 07:12:03

Modified files:
        org/fenfire/demo: buoyoing.py fenpdfcontext.py 
        org/fenfire/view: PageSpanLayout.java 

Log message:
        enfilade selection fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.96 
fenfire/org/fenfire/demo/buoyoing.py:1.97
--- fenfire/org/fenfire/demo/buoyoing.py:1.96   Sat Jul 19 05:04:36 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Sat Jul 19 07:12:02 2003
@@ -59,6 +59,7 @@
 #ff.util.lava.CoordsysCache.dbg = 1
 #ff.view.AreaSelectingView2D.dbg = 1
 ff.view.buoy.TransclusionConnector.dbg = 1
+#ff.impl.SimpleNodeContent.dbg = 1
 
 
 vob.putil.demo.usingNormalBindings = 0
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.10 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.11
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.10      Sat Jul 19 05:04:36 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Sat Jul 19 07:12:02 2003
@@ -100,8 +100,9 @@
                     v = ff.util.lava.view.getView(main, 
ff.view.PageScrollView2D)
                     layout = v.getLayout(main.getPlane())
                     enf = layout.getSelection( int(s[0]), int(s[1]),
-                                               int(s[2]), int(s[3]))
+                                               int(s[2]-s[0]), int(s[3]-s[1]))
                     paper = pp.newPaper()
+                    p('new note')
                     note = Nodes.get(pp.newNote(paper, 0,0, ''))
                     p('enfilade:', enf)
                     fen.txt.set(note, enf)
Index: fenfire/org/fenfire/view/PageSpanLayout.java
diff -u fenfire/org/fenfire/view/PageSpanLayout.java:1.17 
fenfire/org/fenfire/view/PageSpanLayout.java:1.18
--- fenfire/org/fenfire/view/PageSpanLayout.java:1.17   Sat Jul 19 05:04:36 2003
+++ fenfire/org/fenfire/view/PageSpanLayout.java        Sat Jul 19 07:12:03 2003
@@ -229,21 +229,24 @@
        Enfilade1D enf = null;
 
        // Go into page where selection starts
-       for (; p<pages.length; p++)
-           if (x < xywh[4*p + 2] + w) break;
+       for (; p<pages.length; p++) {
+           if (x < pages[p].getSize().width + w) break;
+           w += pages[p].getSize().width;
+       }
 
+       w = 0;
        for (; p<pages.length; p++) {
            // check y
-           if (y > xywh[4*p + 3]) throw new Error("Selection out of 
page,"+p+", y:"+y);
+           if (y > pages[p].getSize().height) throw new Error("Selection out 
of page,"+p+", y:"+y);
            // check height
-           if (height > xywh[4*p + 3]) throw new Error("Selection out of 
page,"+p+", h:"+height);
+           if ((y + height) > pages[p].getSize().height) throw new 
Error("Selection out of page,"+p+", h:"+height);
 
            // everything ok, so get a clip from page for returning enfilade.
            if (enf == null) {
-               w = (int)Math.min(wLeft, xywh[4*p + 2] - x);
+               w = (int)Math.min(wLeft, pages[p].getSize().width - x);
                enf = new Enfilade1DImpl(pages[p].subArea(x,y, w, height));
            } else {
-               w = (int)Math.min(wLeft, xywh[4*p + 2]);
+               w = (int)Math.min(wLeft, pages[p].getSize().width);
                Enfilade1D.Maker m = enf.getMaker();
                enf.plus(m.makeEnfilade(pages[p].subArea(0,y, w, height)));
            }