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

[Matti Katila]

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

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

Log message:
        added lastviewMode

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/ImageCell.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.58&tr2=1.59&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/ImageCell.java
diff -u gzz/gzz/modules/pp/ImageCell.java:1.6 
gzz/gzz/modules/pp/ImageCell.java:1.7
--- gzz/gzz/modules/pp/ImageCell.java:1.6       Fri Jan 10 04:58:41 2003
+++ gzz/gzz/modules/pp/ImageCell.java   Fri Jan 10 08:10:58 2003
@@ -85,7 +85,7 @@
        Im r = get(c);
        if(r == null) {
            if (c == accursed)
-               ((LinebrokenCellContentView)def).place(c, vs, box, context, 
"Color 1 0 0");
+               ((LinebrokenCellContentView)def).place(c, vs, box, context, 
"Color 0.6 0 0");
            else
                def.place(c, vs, box, context);
            return;
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.50 
gzz/gzz/modules/pp/PPView2.java:1.51
--- gzz/gzz/modules/pp/PPView2.java:1.50        Fri Jan 10 04:58:41 2003
+++ gzz/gzz/modules/pp/PPView2.java     Fri Jan 10 08:10:58 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.50 2003/01/10 
09:58:41 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.51 2003/01/10 
13:10:58 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -216,7 +216,7 @@
            final BgVob bg = BgVob.create(plane, window);
 
            final IrregularFrame f = 
IrregularFrame.create(-16000,-16000,16000,16000,
-                                       irreguBorder, irreguRipple);
+                                       irreguBorder, irreguRipple, 2);
 
            final int frameUnit = vs.unitSqCS(frameCS, "USQ");
 
@@ -401,10 +401,16 @@
        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;
@@ -543,7 +549,7 @@
            int paper_count=0;
            int accursed_paper_count=0;
            for (; p!=null; paper_count++) {
-               if (p==accursed_p) 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);
            }
 
@@ -586,8 +592,7 @@
                int c2f = vs.coords.ortho(0, 11, 0, 0, 
                                          leftPanelZoom, leftPanelZoom);
                vs.matcher.add(fr, c2f, "C2F");
-
-               ev_handler.onClick(fr, "Shortcut link", new Object[]{p, new 
Integer(MAIN_CS), new Integer(ctr)});
+               ev_handler.onClick(fr, "Shortcut link", new Object[]{p, new 
Integer(MAIN_CS), new Integer(fr)});
                /*
                if (interps.get("shortcut") != null) {
                    
((DefaultVobMatcher)vs.matcher).keymapSingleCoordsys(MAIN_CS, 
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.58 gzz/gzz/modules/pp/demotest.py:1.59
--- gzz/gzz/modules/pp/demotest.py:1.58 Fri Jan 10 05:35:04 2003
+++ gzz/gzz/modules/pp/demotest.py      Fri Jan 10 08:10:58 2003
@@ -108,10 +108,12 @@
         self.ppv.bgscale = 500
         self.poly = ["FILL", "LINE"]
         self.map = None
+        self.lastViewMode = 0
 
     def setDefaultViewMode(self):
         # set default settings
         self.ppv.showLinkbuoys = 0
+        self.lastViewMode = self.ppv.viewMode
         self.ppv.viewMode = self.ppv.JUST_BROWSING
 
     def key(self, key):
@@ -197,7 +199,8 @@
 
            offs = self.avc.getCursorOffset(c)
            print "OFss:", offs
-           AbstractUpdateManager.setNoAnimation()
+            if self.lastViewMode == self.ppv.viewMode:
+                AbstractUpdateManager.setNoAnimation()
             if key == "Left":
                 if offs != 0:
                     self.avc.setCursorOffset(offs-1)
@@ -271,7 +274,8 @@
            offs = self.avc.getCursorOffset(c)
            print "OFss:", offs
 
-           AbstractUpdateManager.setNoAnimation()
+            if self.lastViewMode == self.ppv.viewMode:
+                AbstractUpdateManager.setNoAnimation()
             if len(key) == 1:
                 self.ppactions.insertText(c.getId(), offs, key)
                 self.avc.setCursorOffset(offs+1)