[Gzz-commits] gzz gzz/view/buoy/ScrollblockCellLinker.java gz...

[Tuomas J. Lukka]

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

Modified files:
        gzz/view/buoy  : ScrollblockCellLinker.java pagespanNodes.py 
        test/gzz/view/buoy: buoysys.test 

Log message:
        Second stage all right\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/ScrollblockCellLinker.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/buoy/buoysys.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gzz/gzz/view/buoy/ScrollblockCellLinker.java
diff -u gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.7 
gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.8
--- gzz/gzz/view/buoy/ScrollblockCellLinker.java:1.7    Tue Feb  4 09:05:29 2003
+++ gzz/gzz/view/buoy/ScrollblockCellLinker.java        Tue Feb  4 10:02:59 2003
@@ -28,9 +28,16 @@
 
     public BuoyViewNodeType pageSpanNodeType;
 
+    public BuoyViewNodeType cellNodeType;
+
     public void doLinks(Cell c, VobScene vs, int cs, 
                            BuoyViewNodeType cellNodeType, 
                            BuoyLinkListener listener) {
+
+       // XXX Dangerous! Shouldn't need to do this!!!
+       // Fix architecture
+       this.cellNodeType = cellNodeType;
+
        Enfilade1D enf = ((VStreamCellTexter)c.space.getCellTexter()).
                                getEnfilade(c, null);
        List l = enf.getList();
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.6 
gzz/gzz/view/buoy/pagespanNodes.py:1.7
--- gzz/gzz/view/buoy/pagespanNodes.py:1.6      Tue Feb  4 09:05:29 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py  Tue Feb  4 10:02:59 2003
@@ -9,8 +9,8 @@
     return gzz.media.impl.Enfilade1DImpl.theMaker.makeEnfilade(span)
 
 class PageSpanNodeType(BuoyViewNodeType):
-    def __init__(self, space):
-       self.space = space
+    def __init__(self, scrollBlockLinker):
+       self.scrollBlockLinker = scrollBlockLinker
     def renderBuoy(self, vs, into, linkId, anchorSpan):
        # XXX!!!!
        # Irregu!
@@ -20,10 +20,11 @@
        pscv.placeCentered(makeEnf(sb.getCurrent()), vs, into, s,
                    .5, 200);
     def createMainNode(self, linkId, anchorSpan, listener):
-       return PageSpanMainNode(anchorSpan, listener)
+       return PageSpanMainNode(self, anchorSpan, listener)
 
 class PageSpanMainNode(BuoyViewMainNode):
-    def __init__(self, anchorSpan, listener):
+    def __init__(self, nodetype, anchorSpan, listener):
+       self.nodetype = nodetype
        self.listener = listener
        self.scrollBlock = anchorSpan.getScrollBlock()
        self.enf = makeEnf(self.scrollBlock.getCurrent())
@@ -33,7 +34,13 @@
        self.x = pscv.xoffs
        self.y = pscv.yoffs
     def renderMain(self, vs, into):
-       pass
+       pscv.placeCentered(self.enf, vs, into, None, 1, 200)
+       matches = (self.nodetype.scrollBlockLinker
+                           .enfiladeOverlap.getMatches(self.enf))
+       for m in matches:
+           self.listener.link(-1, into, 
+                   self.nodetype.scrollBlockLinker.cellNodeType,
+                   gzz.util.Pair(m, self.scrollBlock), m)
     def mouse(self, mouseEvent, oldVS):
        pass
     def keystroke(self, key):
Index: gzz/test/gzz/view/buoy/buoysys.test
diff -u gzz/test/gzz/view/buoy/buoysys.test:1.10 
gzz/test/gzz/view/buoy/buoysys.test:1.11
--- gzz/test/gzz/view/buoy/buoysys.test:1.10    Tue Feb  4 08:55:55 2003
+++ gzz/test/gzz/view/buoy/buoysys.test Tue Feb  4 10:02:59 2003
@@ -49,8 +49,8 @@
 
 
     # Create the buoy view elements
-    scrollblockLinker = ScrollblockCellLinker()
-    scrollblockLinker.pageSpanNodeType = pagespanNodes.PageSpanNodeType()
+    scrollblockLinker = ScrollblockCellLinker(space)
+    scrollblockLinker.pageSpanNodeType = 
pagespanNodes.PageSpanNodeType(scrollblockLinker)
     adaptor = BuoyAdaptor()
     adaptor.cellNodes = [zzNodes.VanishingNodeType()]
     adaptor.cellLinkers = [scrollblockLinker]