[Gzz-commits] gzz ./TODO gzz/vob/impl/OrthoCoorder.java gzz/v...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    02/11/21 04:52:35

Modified files:
        .              : TODO 
        gzz/vob/impl   : OrthoCoorder.java 
        gzz/vob        : AffineVobCoorder.java VobScene.java 
                         VobCoorder.java 
        test/gzz/vob   : textvob.test 

Log message:
        Implementing PEG w2sx

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.406&tr2=1.407&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/impl/OrthoCoorder.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/AffineVobCoorder.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobScene.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/VobCoorder.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/vob/textvob.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.406 gzz/TODO:1.407
--- gzz/TODO:1.406      Thu Nov 21 04:50:03 2002
+++ gzz/TODO    Thu Nov 21 04:52:35 2002
@@ -51,8 +51,6 @@
             + Ted's bindings for it
        + PEG asynch ms blocks
            + asynch xu links?
-    humppake:
-       - implement PEG w2sx--tjl
     tuukkah:
        - release engineering 
            - list main changes 
Index: gzz/gzz/vob/AffineVobCoorder.java
diff -u gzz/gzz/vob/AffineVobCoorder.java:1.13 
gzz/gzz/vob/AffineVobCoorder.java:1.14
--- gzz/gzz/vob/AffineVobCoorder.java:1.13      Sun Oct 20 05:50:06 2002
+++ gzz/gzz/vob/AffineVobCoorder.java   Thu Nov 21 04:52:35 2002
@@ -31,14 +31,14 @@
     /** Default implementation using affineCoordsys.
      */
     public int ortho(int into, float depth,
-               float x, float y, float w, float h) {
+               float x, float y, float sx, float sy) {
        return affineCoordsys(into, depth, 
-               x, y, w, 0, 0, h);
+               x, y, sx, 0, 0, sy);
     }
     public void setOrthoParams(int cs, float depth,
-               float x, float y, float w, float h) {
+               float x, float y, float sx, float sy) {
        setAffineParams(cs, depth, 
-               x, y, w, 0, 0, h);
+               x, y, sx, 0, 0, sy);
     }
 
 
Index: gzz/gzz/vob/VobCoorder.java
diff -u gzz/gzz/vob/VobCoorder.java:1.23 gzz/gzz/vob/VobCoorder.java:1.24
--- gzz/gzz/vob/VobCoorder.java:1.23    Mon Nov 11 07:01:32 2002
+++ gzz/gzz/vob/VobCoorder.java Thu Nov 21 04:52:35 2002
@@ -49,7 +49,7 @@
      *             system into, <code>0</code> for the root
      *             coordinate system.
      */
-    abstract public int ortho(int into, float depth, float x, float y, float 
w, float h);
+    abstract public int ortho(int into, float depth, float x, float y, float 
sx, float sy);
 
     public int translate(int into, float x, float y) {
        return ortho(into, 0, x, y, 1, 1);
@@ -61,7 +61,7 @@
        return ortho(into, 0, 0, 0, sx, sy);
     }
 
-    abstract public void setOrthoParams(int into, float depth, float x, float 
y, float w, float h);
+    abstract public void setOrthoParams(int into, float depth, float x, float 
y, float sx, float sy);
 
     public void setTranslateParams(int into, float x, float y) {
        setOrthoParams(into, 0, x, y, 1, 1);
Index: gzz/gzz/vob/VobScene.java
diff -u gzz/gzz/vob/VobScene.java:1.15 gzz/gzz/vob/VobScene.java:1.16
--- gzz/gzz/vob/VobScene.java:1.15      Thu Nov  7 04:33:31 2002
+++ gzz/gzz/vob/VobScene.java   Thu Nov 21 04:52:35 2002
@@ -66,9 +66,9 @@
     }
 
     final public int orthoCS(int into, Object key, float depth, 
-                               float x, float y, float w, float h) {
+                               float x, float y, float sx, float sy) {
        return matcher.addSub(into, coords.ortho(into,
-                       depth, x, y, w, h), key);
+                       depth, x, y, sx, sy), key);
     }
     final public int translateCS(int into, Object key, float x, float y) {
        return matcher.addSub(into, coords.translate(into, x, y), key);
Index: gzz/gzz/vob/impl/OrthoCoorder.java
diff -u gzz/gzz/vob/impl/OrthoCoorder.java:1.2 
gzz/gzz/vob/impl/OrthoCoorder.java:1.3
--- gzz/gzz/vob/impl/OrthoCoorder.java:1.2      Mon Nov 11 07:01:32 2002
+++ gzz/gzz/vob/impl/OrthoCoorder.java  Thu Nov 21 04:52:35 2002
@@ -29,7 +29,7 @@
  */
 
 public class OrthoCoorder extends VobCoorder {
-public static final String rcsid = "$Id: OrthoCoorder.java,v 1.2 2002/11/11 
12:01:32 tjl Exp $";
+public static final String rcsid = "$Id: OrthoCoorder.java,v 1.3 2002/11/21 
09:52:35 humppake Exp $";
     public static boolean dbg = false;
     private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { System.err.println(s); }
@@ -115,8 +115,8 @@
        if(maxdepth < depth) maxdepth = depth;
        return sys.add(into, depth, x, y, sx, sy, w, h);
     }
-    public int ortho(int into, float depth, float x, float y, float w, float 
h) {
-       return orthoBox(into, depth, x, y, w, h, 1, 1);
+    public int ortho(int into, float depth, float x, float y, float sx, float 
sy) {
+       return orthoBox(into, depth, x, y, sx, sy, 1, 1);
     }
 
 
Index: gzz/test/gzz/vob/textvob.test
diff -u gzz/test/gzz/vob/textvob.test:1.3 gzz/test/gzz/vob/textvob.test:1.4
--- gzz/test/gzz/vob/textvob.test:1.3   Wed Nov 20 12:23:50 2002
+++ gzz/test/gzz/vob/textvob.test       Thu Nov 21 04:52:35 2002
@@ -35,7 +35,7 @@
     """
 
 def testWH():
-    """Tests that vob is drawn like it tolds as getWidth() and getHeight()."""
+    """Tests that TextVob is drawn like it tolds as getWidth() and 
getHeight()."""
     vs = getvs()
     size = vs.getSize()
     vs.map.put(gzz.vob.vobs.SolidBgVob(Color.red))