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

[Tuomas J. Lukka]

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

Modified files:
        gzz/view       : PageSpanCellView.java 
        gzz/view/buoy  : buoymanager.py pagespanNodes.py zzNodes.py 

Log message:
        Getting there... Now can switch between buoys\!

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/PageSpanCellView.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/pagespanNodes.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/zzNodes.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/gzz/view/PageSpanCellView.java
diff -u gzz/gzz/view/PageSpanCellView.java:1.13 
gzz/gzz/view/PageSpanCellView.java:1.14
--- gzz/gzz/view/PageSpanCellView.java:1.13     Thu Feb  6 04:19:40 2003
+++ gzz/gzz/view/PageSpanCellView.java  Thu Feb  6 07:27:59 2003
@@ -164,6 +164,16 @@
            }
        }
 
+       /** Place this layout strictly fitted into the given
+        * box.
+        */
+       public void placeBoxed(VobScene vs, int into, float importance, float 
pixelscale) {
+           int unit = vs.unitSqCS(into, "PSPCV.UNIT");
+           int scaled = vs.scaleCS(unit, "PSPCV.SCALED",
+                       1.0f / w, 1.0f / h);
+           place(vs, scaled, importance, pixelscale);
+       }
+
 
     }
 
@@ -187,7 +197,7 @@
      */
     public void place(Enfilade1D enf, VobScene vs, int into, 
                                float importance, float pixelscale) {
-       getLayout(enf).place(vs, into, importance, pixelscale);
+       getLayout(enf).placeBoxed(vs, into, importance, pixelscale);
 
     }
 
@@ -198,7 +208,7 @@
        Layout l = getLayout(
          ((VStreamCellTexter)c.space.getCellTexter()).getEnfilade(c, null)
                );
-       l.place( vs, box, .5f, 100);
+       l.placeBoxed( vs, box, .5f, 100);
     }
     public void getSize(Cell c, ViewContext context, float[] out) {
        getSize(
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.9 
gzz/gzz/view/buoy/buoymanager.py:1.10
--- gzz/gzz/view/buoy/buoymanager.py:1.9        Thu Feb  6 07:14:29 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Thu Feb  6 07:28:00 2003
@@ -36,14 +36,20 @@
        self.vs = vs
        self.cs = { }
 
-       self.nadirCS = vs.translateCS(0, "NADIRORIGIN", 400, 1500)
+       self.ctrx = vs.size.width / 2
+       self.ctry = vs.size.height / 7 * 3
+
+       mainsize = vs.size.width * .5
+
+       self.nadirCS = vs.translateCS(0, "NADIRORIGIN", self.ctrx, 
+                   1.5 * vs.size.height)
 
        vs.put(background((.5,.8,.5)))
 
-       center = vs.translateCS(0, "Center", 400, 300)
+       center = vs.translateCS(0, "Center", self.ctrx, self.ctry)
 
        main = vs.orthoBoxCS(center, "MAINVP", 0, 
-                               -100, -100, .2, .2, 1000, 1000)
+                               -mainsize/2, -mainsize/2, 1, 1, mainsize, 
mainsize)
        self.vs.activate(main)
 
        self.mainNode.renderMain(vs, self.nadir(main))
@@ -51,20 +57,20 @@
 
 
     def link(self, direction, anchorCS, otherNode, linkId, otherAnchor):
-       x = 400
-       r = 200
+       x = self.ctrx
+       r = self.ctrx * .75
        if dir > 0:
            buoy = self.vs.coords.buoyOnCircle(0, anchorCS,
-                               x, 300, r, 
-                               x-r, 300, 
+                               x, self.ctry, r, 
+                               x-r, self.ctry, 
                                0.1)
        else:
            buoy = self.vs.coords.buoyOnCircle(0, anchorCS,
-                               x, 300, r, 
-                               x+r, 300,
+                               x, self.ctry, r, 
+                               x+r, self.ctry,
                                0.1)
        self.vs.matcher.add(buoy, linkId)
-       into = self.vs.orthoBoxCS(buoy, "V", 0, 0, 0, .5, .5, 150, 150)
+       into = self.vs.orthoBoxCS(buoy, "V", -100, 0, 0, .5, .5, 150, 150)
        into = self.nadir(into)
        self.vs.activate(into)
        self.cs[into] = (otherNode, linkId, otherAnchor)
Index: gzz/gzz/view/buoy/pagespanNodes.py
diff -u gzz/gzz/view/buoy/pagespanNodes.py:1.15 
gzz/gzz/view/buoy/pagespanNodes.py:1.16
--- gzz/gzz/view/buoy/pagespanNodes.py:1.15     Thu Feb  6 06:53:14 2003
+++ gzz/gzz/view/buoy/pagespanNodes.py  Thu Feb  6 07:28:00 2003
@@ -39,9 +39,7 @@
        if layout == None: 
            layout = pscv.getLayout(anchorSpan.getScrollBlock())
        # For now, we'll just squish to fit
-       unit = vs.unitSqCS(into, "UNIT")
-       scaled = vs.scaleCS(unit, "SCALED", 1.0 / layout.w, 1.0 / layout.h)
-       layout.place(vs, scaled, .5, 200)
+       layout.placeBoxed(vs, into, .5, 200)
 
 class AnchorPageSpanNodeType(AbstractPageSpanNodeType):
     def renderBuoy(self, vs, into, linkId, anchorSpan):
@@ -71,10 +69,7 @@
 
        # XXX This is not right: the distortion
        # should be done here.
-       unit = vs.unitSqCS(into, "UNIT")
-       scaled = vs.scaleCS(unit, "SCALED", 
-               1.0 / self.layout.w, 1.0 / self.layout.h)
-       self.layout.place(vs, scaled, 1, 200)
+       self.layout.placeBoxed(vs, into, 1, 200)
 
        matches = (self.nodetype.scrollBlockLinker
                            .enfiladeOverlap.getMatches(self.enf))
Index: gzz/gzz/view/buoy/zzNodes.py
diff -u gzz/gzz/view/buoy/zzNodes.py:1.8 gzz/gzz/view/buoy/zzNodes.py:1.9
--- gzz/gzz/view/buoy/zzNodes.py:1.8    Thu Feb  6 07:14:29 2003
+++ gzz/gzz/view/buoy/zzNodes.py        Thu Feb  6 07:28:00 2003
@@ -19,8 +19,8 @@
        gzz.view.PageSpanCellView(),
        gzz.view.ImageCellContentView()))
 
-defx = 400
-defy = 300
+defx = 200
+defy = 150
 
 class VanishingNodeType(CellBuoyViewNodeType):
     def ownsCell(self, c):