[Gzz-commits] gzz/gzz/modules/pp BUGS PPView2.java demotest.py

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/10 11:11:29

Modified files:
        gzz/modules/pp : BUGS PPView2.java demotest.py 

Log message:
        1-n issue

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/BUGS.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.59&tr2=1.60&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/BUGS
diff -u gzz/gzz/modules/pp/BUGS:1.1 gzz/gzz/modules/pp/BUGS:1.2
--- gzz/gzz/modules/pp/BUGS:1.1 Wed Jan  8 01:40:07 2003
+++ gzz/gzz/modules/pp/BUGS     Fri Jan 10 11:11:29 2003
@@ -5,6 +5,12 @@
 
 Minor:
 
+Something to do with LinebrokenCellContentViews things:
+-some times it's really strange - adds a \n after space or something.
+-maybe it's feature
+
+
+[Obsolete - issue solved]
 -When you click shortcut paper - shortcuts animate.
 -When you click link paper - shortcuts don't animate.
    Both uses the same code: "context.setAccursed((Cell)obs[0]);" <g>
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.51 
gzz/gzz/modules/pp/PPView2.java:1.52
--- gzz/gzz/modules/pp/PPView2.java:1.51        Fri Jan 10 08:10:58 2003
+++ gzz/gzz/modules/pp/PPView2.java     Fri Jan 10 11:11:29 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.51 2003/01/10 
13:10:58 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.52 2003/01/10 
16:11:29 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -287,7 +287,7 @@
                centerX(vs), buoyCenterY, buoyRadius,
                centerX(vs) - dir * buoyRadius, buoyCenterY);
        }
-       public void buoy(final int anchor, final Cell c, Cell connectedFrom) {
+       public void buoy(final int anchor, final Cell c, Cell connectedFrom, 
int count) {
            Object key ; 
            if(dir > 0) 
                key = new Pair(connectedFrom, c);
@@ -295,8 +295,16 @@
                key = new Pair(c, connectedFrom);
            final int anchorUnit = vs.unitSqCS(anchor, "AUSQ"); 
            int actr = vs.translateCS(anchorUnit, "TR12", .5f, .5f);
-           int buoycs = floater.buoyCoordsys(actr, key);
 
+           // 1-N kludge
+           pa("count: "+count+", even? "+ count %2);
+           if (count %2 == 0) {
+               count--;
+           } else count *= -1;
+           actr = vs.translateCS(actr, "SHIFT_"+count, 0, count*2);
+           //actr = vs.translateCS(actr, "SHIFT_"+count, 0,5);
+
+           int buoycs = floater.buoyCoordsys(actr, key);
 
            // Nadir CS
            final int nadir_point_cs;
@@ -308,7 +316,6 @@
                ((GLVobCoorder)vs.coords).nadirOrigin(buoycs, nadir_point_cs);
            vs.matcher.add(nadir_buoy, "NADIR"+c.toString() );
 
-           //final int frameCS = vs.orthoBoxCS(buoycs, "frame", 0, 
            final int frameCS = vs.orthoBoxCS(nadir_buoy, "frame", 0, 
                    -buoyVPWidth/2, -buoyVPHeight/2, 1, 1, 
                    buoyVPWidth, buoyVPHeight);
@@ -380,6 +387,8 @@
        AbstractViewContext main_vc = new AbstractViewContext();
        main_vc.setAccursed(context.getAccursed());
        main_vc.setCursorOffset(context.getCursorOffset(context.getAccursed()));
+
+       // reddish
        ((ImageCell)cellview).setAccursedCell(context.getAccursed());
 
        if(showLinkbuoys)
@@ -401,16 +410,10 @@
        int frameCS = vs.orthoBoxCS(mainctr, "MAINVP", 10, 
                (-mainWidth)/2, -mainHeight/2, 1, 1, 
                mainWidth, mainHeight);
-       /*
-       int frameCS = vs.orthoBoxCS(mainctr, "MAINVP", 10, 
-               0, 0, 1,1, 
-               mainWidth/2, mainHeight/2);
-       */
        vs.activate(frameCS);
 
        // cell to frame CS
        int c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
-       //int c2fCS = vs.coords.ortho(0, -5,-5,0, 20,20);
        vs.matcher.add(frameCS, c2fCS, "C2F");
 
        MAIN_CS = frameCS;
@@ -436,8 +439,8 @@
            panx = coords[0];
            pany = coords[1];
            if (viewMode == TEXT_EDITING) {
-               panx += TE_SIFT_X;
-               pany += TE_SIFT_Y;
+               panx += TE_SIFT_X /zoom;
+               pany += TE_SIFT_Y /zoom;
            }
        }
        setZoomPan(vs);
@@ -549,7 +552,8 @@
            int paper_count=0;
            int accursed_paper_count=0;
            for (; p!=null; paper_count++) {
-               if (p.h(d.contains)==accursed_p.h(d.contains)) 
accursed_paper_count = paper_count;
+               if (p.h(d.contains) == accursed_p.h(d.contains))
+                   accursed_paper_count = paper_count;
                p = p.s(d.d1);
            }
 
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.59 gzz/gzz/modules/pp/demotest.py:1.60
--- gzz/gzz/modules/pp/demotest.py:1.59 Fri Jan 10 08:10:58 2003
+++ gzz/gzz/modules/pp/demotest.py      Fri Jan 10 11:11:29 2003
@@ -291,7 +291,14 @@
                 self.ppactions.deleteText(c.getId(), offs, offs+1)
             
     def scene(self, vs):
-       vs.map.put(background((0.4,0.5,0.8)))
+        m = self.ppv.viewMode
+        if m == self.ppv.JUST_BROWSING:
+            vs.map.put(background((0.4,0.5,0.8)))
+        elif m == self.ppv.TEXT_EDITING:
+            vs.map.put(background((0.7,0.5,0.9)))
+        elif m == self.ppv.LINK_KILLING:
+            vs.map.put(background((0.6,0.7,0.9)))
+            
        vs.map.put(getDListNocoords("""
            PolygonMode FRONT_AND_BACK %s
        """ % (self.poly[0],)))