[Gzz-commits] gzz ./TODO gfx/demo/keymap-test.py gzz/modules/...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/13 03:01:18

Modified files:
        .              : TODO 
        gfx/demo       : keymap-test.py 
        gzz/modules/pp : PPView2.java demotest.py 
        gzz/modules/pp/example: pp.gz 
        gzz/vob/vobs   : TextVob.java 
Added files:
        gzz/modules/pp : PPCellView.java 

Log message:
        fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.507&tr2=1.508&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/keymap-test.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPCellView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/example/pp.gz.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/vobs/TextVob.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.507 gzz/TODO:1.508
--- gzz/TODO:1.507      Sun Jan 12 06:43:54 2003
+++ gzz/TODO    Mon Jan 13 03:01:17 2003
@@ -94,12 +94,11 @@
     mudyc:
        - [PP03] 
             - test which shows a buggy paper interpolation
+           - left-side buttons
+               + geometry
             - Make PP more user friendly
-                - paper, text and link killing
                 - modes:
                      -link killing, see draft.rst
-           - left-side buttons
-               + geometry
            - buoys 1-N:
                 - try to make it work
            - interpolation:
Index: gzz/gfx/demo/keymap-test.py
diff -u gzz/gfx/demo/keymap-test.py:1.5 gzz/gfx/demo/keymap-test.py:1.6
--- gzz/gfx/demo/keymap-test.py:1.5     Thu Jan  9 04:42:25 2003
+++ gzz/gfx/demo/keymap-test.py Mon Jan 13 03:01:17 2003
@@ -3,6 +3,8 @@
 
 from java.awt.event import *
 
+from gzz.gfx.gl import IrregularFrame
+
 class ViewScene:
     def __init__(self):
         self.a = 150
@@ -29,7 +31,7 @@
 
         # Second is nadir
         # text cs
-       cs_text = vs.coords.affineCoordsys(0, 10, 50, self.a, tscale, 0, 0, 
tscale)
+       cs_text = vs.coords.affineCoordsys(0, 50, 50, self.a, tscale, 0, 0, 
tscale)
         vs.matcher.add(cs_text, "TEXT")
         # nadir point
         nadir_point = vs.coords.ortho(0,0, self.x,self.y, 1,1)
@@ -38,7 +40,9 @@
         cs_nadir = vs.coords.nadirOrigin(cs_text, nadir_point)
         vs.matcher.add(cs_nadir, "nadir")
 
-        putText(vs, cs_nadir, 'Text Vob', color=(0,0,0), h=4, y = 3)
+        #putText(vs, cs_nadir, 'Text Vob', color=(0,0,0), h=4, y = 3)
+        f = IrregularFrame.create(-16000,-16000,16000,16000,50, 150, 2)
+        vs.map.put(f.getBlank())
 
         self.NEW = cs_text
        # Note how we map the OLD cs2 to the NEW cs1
@@ -54,7 +58,7 @@
 
     def key(self, k):
         print 'simsalapim!'
-        self.vs.matcher.keymapSingleCoordsys(self.cs1, self.cs2)
+        #self.vs.matcher.keymapSingleCoordsys(self.cs1, self.cs2)
         self.a = self.a + 5
 
     def mouse(self, ev):
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.57 
gzz/gzz/modules/pp/PPView2.java:1.58
--- gzz/gzz/modules/pp/PPView2.java:1.57        Sat Jan 11 12:35:33 2003
+++ gzz/gzz/modules/pp/PPView2.java     Mon Jan 13 03:01:17 2003
@@ -36,8 +36,8 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.57 2003/01/11 
17:35:33 mudyc Exp $";
-    public static boolean dbg = true;
+public static final String rcsid = "$Id: PPView2.java,v 1.58 2003/01/13 
08:01:17 mudyc Exp $";
+    public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
     public static Object NEWPAPERKEY = new Object();
@@ -192,7 +192,7 @@
            float[] sqs = new float[2];
            glc.getSqSize(frameCS, sqs);
            if (sqs[1] < 5) return;
-           pa("Sqs frame: "+sqs[0]+" "+sqs[1]);
+           if (dbg) pa("Sqs frame: "+sqs[0]+" "+sqs[1]);
 
            // CS from center of frameCS to screen
            int framecenterCS = vs.translateCS(frameCS, "FCTR", sqs[0]/2, 
sqs[1]/2);
@@ -367,7 +367,9 @@
 
     TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 0, 20);
     //CellView cellview = new ImageCell(new TextCellContentView(style));
-    CellView cellview = new ImageCell(new LinebrokenCellContentView(style));
+    //CellView cellview = new ImageCell(new LinebrokenCellContentView(style));
+    CellView cellview = new ImageCell(new PPCellView(style,
+        "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
 
     // public so can be replaced from jython
     public Vob filletState = GLCache.getCallList(
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.64 gzz/gzz/modules/pp/demotest.py:1.65
--- gzz/gzz/modules/pp/demotest.py:1.64 Sat Jan 11 12:35:33 2003
+++ gzz/gzz/modules/pp/demotest.py      Mon Jan 13 03:01:17 2003
@@ -112,7 +112,7 @@
     def setDefaultViewMode(self):
         # set default settings
         self.ppv.showLinkbuoys = 0
-        self.ppvlastViewMode = self.ppv.viewMode
+        self.ppv.lastViewMode = self.ppv.viewMode
         self.ppv.viewMode = self.ppv.JUST_BROWSING
 
     def key(self, key):
@@ -252,7 +252,7 @@
            offs = self.avc.getCursorOffset(c)
            print "OFss:", offs
 
-            if self.lastViewMode == self.ppv.viewMode:
+            if self.ppv.lastViewMode == self.ppv.viewMode:
                 AbstractUpdateManager.setNoAnimation()
             if len(key) == 1:
                 self.ppactions.insertText(c.getId(), offs, key)
@@ -264,6 +264,17 @@
                 if offs != 0:
                     self.ppactions.deleteText(c.getId(), offs-1, offs)
                     self.avc.setCursorOffset(offs-1)
+                if c.t() == None or c.t() == '':
+                    d = self.ppv.d
+                    print 'Cell empty!'
+                    if c.h(d.clone).s(d.clone) == None:
+                        paper = c.h(d.contains)
+                        print '...so delete the note.'
+                        self.ppv.ppactions.deleteNote(c.getId())
+                        self.avc.setAccursed(paper)
+                        self.ppv.showLinkbuoys = 0
+                        self.ppv.viewMode = self.ppv.JUST_BROWSING
+                    
             if key == "Delete":
                 print 'Untested! Doesn\'t check the length'
                 self.ppactions.deleteText(c.getId(), offs, offs+1)
Index: gzz/gzz/modules/pp/example/pp.gz
Index: gzz/gzz/vob/vobs/TextVob.java
diff -u gzz/gzz/vob/vobs/TextVob.java:1.11 gzz/gzz/vob/vobs/TextVob.java:1.12
--- gzz/gzz/vob/vobs/TextVob.java:1.11  Sun Jan 12 06:41:47 2003
+++ gzz/gzz/vob/vobs/TextVob.java       Mon Jan 13 03:01:18 2003
@@ -48,7 +48,7 @@
  * XXX Diagram!
  */
 public class TextVob extends HBox.VobHBox {
-String rcsid = "$Id: TextVob.java,v 1.11 2003/01/12 11:41:47 tjl Exp $";
+String rcsid = "$Id: TextVob.java,v 1.12 2003/01/13 08:01:18 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -180,7 +180,7 @@
     }
     static public Vob getStopCode() {
        if(stop == null) {
-           stop = GLCache.getCallList("PopAttrib");
+           stop = GLCache.getCallList("Color 0 0 0 \n PopAttrib");
        }
        return stop;
     }