[Gzz-commits] gzz/gzz media/impl/Enfilade1DImpl.java view/Pag...

[Tuomas J. Lukka]

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

Modified files:
        gzz/media/impl : Enfilade1DImpl.java 
        gzz/view       : PageSpanCellView.java 
        gzz/view/buoy  : ScrollblockCellLinker.java 

Log message:
        A little further

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/Enfilade1DImpl.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/ScrollblockCellLinker.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gzz/media/impl/Enfilade1DImpl.java
diff -u gzz/gzz/media/impl/Enfilade1DImpl.java:1.12 
gzz/gzz/media/impl/Enfilade1DImpl.java:1.13
--- gzz/gzz/media/impl/Enfilade1DImpl.java:1.12 Sat Dec  7 19:56:55 2002
+++ gzz/gzz/media/impl/Enfilade1DImpl.java      Tue Feb  4 02:51:48 2003
@@ -29,7 +29,7 @@
 /** A simple tree implementation of enfilades.
  */
 public class Enfilade1DImpl implements Enfilade1D {
-static public final String rcsid = "$Id: Enfilade1DImpl.java,v 1.12 2002/12/08 
00:56:55 benja Exp $";
+static public final String rcsid = "$Id: Enfilade1DImpl.java,v 1.13 2003/02/04 
07:51:48 tjl Exp $";
 
     /** The char used to represent non-textual spans.
      */
@@ -55,7 +55,7 @@
        }
     }
 
-    static Maker theMaker = new Enfilade1DImplMaker();
+    public static Maker theMaker = new Enfilade1DImplMaker();
     public Maker getMaker() { return theMaker; }
 
     private final int l;
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.5 
gzz/gzz/view/PageSpanCellView.java:1.6
--- gzz/gzz/view/PageSpanCellView.java:1.5      Wed Jan 29 09:23:02 2003
+++ gzz/gzz/view/PageSpanCellView.java  Tue Feb  4 02:51:48 2003
@@ -33,7 +33,7 @@
     // XXX KLUDGE!
     public float xoffs, yoffs;
 
-    public void getSize(Enfilade1D enf, ViewContext context, float[] out, 
+    public void getSize(Enfilade1D enf, float[] out, 
                            PageSpan center) {
        int npages = enf.length();
 
@@ -111,10 +111,10 @@
      * @param pixelscale The pixel scale at which the image requests are made
      */
     public void placeCentered(Enfilade1D enf, VobScene vs, int into, 
-                               ViewContext context, PageSpan center,
+                                PageSpan center,
                                float importance, float pixelscale) {
        if(cached != enf)
-           getSize(enf, context, null, center);
+           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.2 
gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.3
--- gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.2    Tue Feb  4 01:29:50 2003
+++ gzz/gzz/view/buoy/ScrollblockCellLinker.java        Tue Feb  4 02:51:48 2003
@@ -5,6 +5,7 @@
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.awt.event.MouseEvent;
 import gzz.view.*;
 import gzz.media.*;
 import gzz.vob.*;
@@ -41,7 +42,47 @@
        }
     }
 
+    PageSpanCellView pscv = new PageSpanCellView();
+    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;
+       }
 
+    }
 
     // XXX Reverse links! Scrollblock to 
 }