[Gzz-commits] gzz/gzz/view PageSpanCellView.java buoy/Scrollb...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/04 04:53:06

Modified files:
        gzz/view       : PageSpanCellView.java 
        gzz/view/buoy  : ScrollblockCellLinker.java 
Added files:
        gzz/view/buoy  : pagespanNodes.py 

Log message:
        Move quickly changing things to python

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/ScrollblockCellLinker.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.6 
gzz/gzz/view/PageSpanCellView.java:1.7
--- gzz/gzz/view/PageSpanCellView.java:1.6      Tue Feb  4 02:51:48 2003
+++ gzz/gzz/view/PageSpanCellView.java  Tue Feb  4 04:53:06 2003
@@ -23,7 +23,6 @@
 
     public boolean useBg = true;
 
-    Enfilade1D cached;
     PageSpan[] pages;
     PageSpanPaper[] psps;
     float[] xywh;
@@ -88,7 +87,6 @@
            out[1] = h;
        }
 
-       cached = enf;
 
     }
 
@@ -113,8 +111,6 @@
     public void placeCentered(Enfilade1D enf, VobScene vs, int into, 
                                 PageSpan center,
                                float importance, float pixelscale) {
-       if(cached != enf)
-           getSize(enf, null, center);
        int npages = enf.length();
 
        // Now we can draw the pages.
Index: gzz/gzz/view/buoy/ScrollblockCellLinker.java
diff -u gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.4 
gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.5
--- gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.4    Tue Feb  4 03:30:54 2003
+++ gzz/gzz/view/buoy/ScrollblockCellLinker.java        Tue Feb  4 04:53:06 2003
@@ -20,7 +20,7 @@
  */
 public abstract class ScrollblockCellLinker implements CellBuoyViewLinker {
 
-    BuoyViewNodeType pageSpanNodeType;
+    public BuoyViewNodeType pageSpanNodeType;
 
     public void doLinks(Cell c, VobScene vs, int cs, 
                            BuoyViewNodeType cellNodeType, 
@@ -39,51 +39,6 @@
 
                listener.link(1, cs, pageSpanNodeType, new Pair(c, sb), s);
            }
-       }
-    }
-
-    PageSpanCellView pscv = new PageSpanCellView();
-
-    /** A dummy routine that makes an enfilade from a span.
-     * It's not nice that this is needed...
-     */
-    private Enfilade1D makeEnf(Object a) {
-       return gzz.media.impl.Enfilade1DImpl.theMaker.makeEnfilade(
-                           (Span)a);
-    }
-
-    public class PageSpanNodeType implements BuoyViewNodeType {
-       public void renderBuoy(VobScene vs, int into, Object linkId, Object 
anchor) {
-           // XXX!!!!
-           // Irregu!
-           // find edges of span
-           // should place only that region surrounded by irregu
-           PageSpan s = (PageSpan)anchor;
-           ScrollBlock sb = s.getScrollBlock();
-           pscv.placeCentered(makeEnf(sb.getCurrent()), vs, into, s,
-                       .5f, 200);
-       }
-       public BuoyViewMainNode createMainNode(Object linkId, Object anchor, 
-                           BuoyLinkListener l) {
-           return new PageSpanMainNode((PageSpan)anchor, l);
-       }
-    }
-    public class PageSpanMainNode implements BuoyViewMainNode {
-       float x, y;
-       ScrollBlock sb;
-       BuoyLinkListener listener;
-
-       public PageSpanMainNode(PageSpan sp, BuoyLinkListener listener) {
-           this.listener = listener;
-           this.sb = sp.getScrollBlock();
-       }
-
-       public void renderMain(VobScene vs, int into) {
-       }
-       public void keystroke(String s) {
-       }
-       public boolean mouse(MouseEvent e, VobScene oldVobScene) {
-           return false;
        }
     }