[Gzz-commits] gzz/gzz/modules/pp PPView2.java vob/VobCSGenera...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   02/11/29 13:31:04

Modified files:
        gzz/modules/pp : PPView2.java 
Added files:
        gzz/modules/pp/vob: VobCSGenerator.java 

Log message:
        Added sc generator for fast-link papers.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/vob/VobCSGenerator.java?rev=1.1

Patches:
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.19 
gzz/gzz/modules/pp/PPView2.java:1.20
--- gzz/gzz/modules/pp/PPView2.java:1.19        Tue Nov 26 02:48:49 2002
+++ gzz/gzz/modules/pp/PPView2.java     Fri Nov 29 13:31:04 2002
@@ -401,18 +401,49 @@
            vs.map.put(new_button, button_cs);
 
 
+           // count papers
            Cell p = main_vc.getAccursed().h(d.contains).h(d.d1).s(d.d1);
+           Cell accursed_p = main_vc.getAccursed();
+           int paper_count=0;
+           int accursed_paper_count=0;
+           for (; p!=null; paper_count++) {
+               if (p==accursed_p) accursed_paper_count = paper_count;
+               p = p.s(d.d1);
+           }
+
+           // subtraction because of the home-paper
+           if (paper_count > 0) { paper_count--; accursed_paper_count--; }
+           
+           float home_paper_bottom = 210;
+           int papers_sq = vs.orthoCS(0, "empty", 0,
+                                0, home_paper_bottom,
+                                leftPanelWidth, mainHeight - 
home_paper_bottom);
+           VobCSGenerator cs_gen = 
+               new VobCSGenerator(vs, papers_sq, paper_count, 
accursed_paper_count,
+                                  leftPanelRealWidth, leftPanelRealHeight);
+           
+           p = main_vc.getAccursed().h(d.contains).h(d.d1).s(d.d1);
            float x = 0.5f * leftPanelWidth;
 
+           int i=0;
            for(float y = 1.5f*leftPanelObjectHeight; p != null; 
                y += leftPanelObjectHeight) {
-               int ctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 0,
+               int ctr, fr; 
+               if (i==0) { 
+                   ctr = ((GLVobCoorder)vs.coords).affineCoordsys(0, 0,
                                                                   x, y, 1, 0, 
0, 1);
-               vs.matcher.add(ctr, new Pair(p, null));
-
-               int fr = vs.orthoBoxCS(ctr, "frame", 10, 
+                   fr = vs.orthoBoxCS(ctr, "frame", 10, 
                                       -leftPanelRealWidth/2, 
-leftPanelRealHeight/2,
                                       1, 1, leftPanelRealWidth, 
leftPanelRealHeight);
+                   pa("y:"+ y +" x: "+ x);
+               }
+               else {
+                   ctr = cs_gen.getNextCS(0);
+                   fr = cs_gen.getNextCS(1);
+                   pa("ctr: "+ ctr +" fr: "+fr);
+               }
+
+               vs.matcher.add(ctr, new Pair(p, null));
                vs.activate(fr);
 
                int c2f = vs.coords.ortho(0, 0, 0, 0, 
@@ -423,6 +454,7 @@
                buoy_vc.setAccursed(p);
                buoy_singlePlane.render(vs, fr, c2f);
                p = p.s(d.d1);
+               i++;
            }
        }