[Gzz-commits] gzz ./Makefile doc/pp/coords.rst gzz/modules/pp...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/01/03 02:16:56

Modified files:
        .              : Makefile 
        doc/pp         : coords.rst 
        gzz/modules/pp : PPView2.java 
        gzz/modules/pp/vob: VobCSGenerator.java 

Log message:
        Clean pp up slightly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.231&tr2=1.232&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pp/coords.rst.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/VobCSGenerator.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -u gzz/Makefile:1.231 gzz/Makefile:1.232
--- gzz/Makefile:1.231  Thu Jan  2 04:06:12 2003
+++ gzz/Makefile        Fri Jan  3 02:16:56 2003
@@ -180,21 +180,6 @@
 # maybe should use uniq?
 SRC0:=$(GENERATED) `find gzz/ -name "*.java"` `find test/gzz/ -name "*.java"`
 
-#$(wildcard gzz/*.java gzz/errors/*.java gzz/diff/*.java \
-#    gzz/impl/*.java gzz/impl/mirror/*.java gzz/media/*.java gzz/fuzzy/*.java \
-#    gzz/control/*.java lava/gzz/media/*.java gzz/media/impl/*.java \
-#    gzz/index/*.java gzz/index/impl/*.java gzz/zzutil/*.java 
gzz/impl/clasm/*.java \
-#    gzz/util/*.java gzz/vob/*.java gzz/vob/buoy/*.java gzz/gfx/gl/*.java \
-#    gzz/mediaserver/*.java lava/gzz/mediaserver/*.java 
gzz/mediaserver/*/*.java \
-#    lava/gzz/mediaserver/*/*.java gzz/mediaserver/http/*/*.java \
-#    lava/gzz/mediaserver/*/*/*.java gzz/ideas/*.java gzz/client/*.java \
-#    gzz/view/*.java gzz/client/awt/*.java gzz/client/gl/*.java \
-#    gzz/modules/contraints/*.java gzz/modules/mm/*.java lava/gzz/media/*.java 
\
-#    lava/gzz/media/impl/*.java gzz/slices/*.java gzz/storm/*.java \
-#    gzz/modules/email/*.java lava/test/gzz/storm/*.java gzz/vob/impl/*.java \
-#    gzz/vob/vobs/*.java gzz/vob/linebreaking/*.java \
-#    gzz/vob/impl/awt/*.java gzz/vob/impl/gl/*.java) $(TESTS) $(PP)
-# gzz/impl/zob/*.java 
 
 LAVASRC:= `find lava/gzz/ -name "*.java"` `find lava/test/gzz/ -name "*.java"`
 #$(wildcard lava/gzz/*.java lava/gzz/impl/*.java lava/gzz/impl/errors/*.java 
lava/gzz/impl/mirror/*.java lava/gzz/storm/*.java lava/gzz/util/*.java 
lava/gzz/storm/headers/*.java lava/gzz/storm/impl/*.java)
Index: gzz/doc/pp/coords.rst
diff -u gzz/doc/pp/coords.rst:1.4 gzz/doc/pp/coords.rst:1.5
--- gzz/doc/pp/coords.rst:1.4   Thu Jan  2 05:04:53 2003
+++ gzz/doc/pp/coords.rst       Fri Jan  3 02:16:56 2003
@@ -113,6 +113,8 @@
 
     class frame "orthoBoxCS"
        vobtransformsub - mainCtr
+       fields
+           key: "frame"
 
     class contentToMain "orthoCS"
        vobsubmatch mainCtr
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.33 
gzz/gzz/modules/pp/PPView2.java:1.34
--- gzz/gzz/modules/pp/PPView2.java:1.33        Thu Jan  2 05:22:27 2003
+++ gzz/gzz/modules/pp/PPView2.java     Fri Jan  3 02:16:56 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.33 2003/01/02 
10:22:27 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.34 2003/01/03 
07:16:56 tjl Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -508,30 +508,27 @@
            int i=0;
            for(float y = 1.5f*leftPanelObjectHeight; p != null; 
                y += leftPanelObjectHeight) {
-               int ctr, fr; 
+               int fr; 
                if (i==0) { 
-                   ctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 100,
+                   int ctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 100,
                                                                   x, y, 1, 0, 
0, 1);
                    fr = vs.orthoBoxCS(ctr, "frame", 100, 
                                       -leftPanelRealWidth/2, 
-leftPanelRealHeight/2,
                                       1, 1, leftPanelRealWidth, 
leftPanelRealHeight);
                }
                else {
-                   ctr = cs_gen.getNextCS(0);
-                   fr = cs_gen.getNextCS(1);
-                   vs.matcher.add(ctr, fr, "frame");
+                   fr = cs_gen.getNextCS();
                }
 
 
-               //vs.matcher.add(ctr, new Pair(p, null));
-               vs.matcher.add(ctr, new Pair(p, p));
+               vs.matcher.add(fr, p);
                vs.activate(fr);
                ev_handler.onClick(fr, "Shortcut link", new Object[]{p});
 
 
                int c2f = vs.coords.ortho(0, 11, 0, 0, 
                                          leftPanelZoom, leftPanelZoom);
-               vs.matcher.add(ctr, c2f, "C2F");
+               vs.matcher.add(fr, c2f, "C2F");
 
                buoy_vc.setAccursed(p);
                buoy_singlePlane.render(vs, fr, c2f);
Index: gzz/gzz/modules/pp/vob/VobCSGenerator.java
diff -u gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.8 
gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.9
--- gzz/gzz/modules/pp/vob/VobCSGenerator.java:1.8      Wed Jan  1 05:33:28 2003
+++ gzz/gzz/modules/pp/vob/VobCSGenerator.java  Fri Jan  3 02:16:56 2003
@@ -27,7 +27,7 @@
 import gzz.gfx.gl.*;
 
 public class VobCSGenerator {
-public static final String rcsid = "$Id: VobCSGenerator.java,v 1.8 2003/01/01 
10:33:28 mudyc Exp $";
+public static final String rcsid = "$Id: VobCSGenerator.java,v 1.9 2003/01/03 
07:16:56 tjl Exp $";
     static public boolean dbg=false;
     static public void p(String s) { System.out.print(s); }
     static public void pa(String s) { System.out.println(s); }
@@ -40,7 +40,7 @@
     public float smallest_percent = 0.2f;
 
 
-    private int vob_cs[][];
+    private int vob_cs[];
 
 
 
@@ -123,7 +123,7 @@
            sum += rations[i];
        }
 
-       vob_cs = new int[vob_count][2];
+       vob_cs = new int[vob_count];
 
        float real_ratio = y_diff/sum;
 
@@ -138,12 +138,13 @@
 
            float y_d = y - y_tmp;
 
-           vob_cs[i][0] = ((GLVobCoorder)vs.coords).affineCoordsys(0, 0,
+           int ctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 0,
                                                                    x_center, 
y_tmp + muutos/2,  
                                                                    1, 0, 0, 1);
-           vob_cs[i][1] = vs.coords.orthoBox(vob_cs[i][0], 10, 
-                                             -vob_width/2, -y_d/2, 1,1,
-                                             vob_width, y_d);
+
+           vob_cs[i] = vs.coords.orthoBox(ctr, 10, 
+                         -vob_width/2, -y_d/2, 1,1,
+                         vob_width, y_d);
 
            if (dbg) {
                if (i == focus_index) pa("y_tmp: "+ y_tmp +" y_cent: " 
+(y-muutos/2) +
@@ -159,14 +160,10 @@
     private int index = 0;
     /** get the Coordinate System one by one.
      */
-    public int getNextCS(int which) {
+    public int getNextCS() {
        int i = index;
        if (i < 0 || i >= vob_cs.length) throw new Error("index: "+index+ " out 
of vob_cs.length");
-       switch(which) {
-       case 0: return vob_cs[index][which];
-       case 1: return vob_cs[index++][which];
-       }
-       throw new Error("asked unknown CS: " + i);
+       return vob_cs[index++];
     }
 
     /** Easy algorithm