[Gzz-commits] gzz ./TODO gfx/demo/buoyoing.py gzz/modules/pp2...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/14 14:23:38

Modified files:
        .              : TODO 
        gfx/demo       : buoyoing.py 
        gzz/modules/pp2: PPCanvasCursor.java 
        gzz/view       : CoordinatePlaneMultiView.java 

Log message:
        better

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.585&tr2=1.586&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CoordinatePlaneMultiView.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gzz/TODO
diff -u gzz/TODO:1.585 gzz/TODO:1.586
--- gzz/TODO:1.585      Fri Feb 14 08:32:18 2003
+++ gzz/TODO    Fri Feb 14 14:23:38 2003
@@ -16,6 +16,9 @@
 HT03 deadline:
     tjl:
        - the great buoy redesign
+           - buoy comes too early through the new main frame when animateing.
+             Eli poiju napsahtaa liian aikaisin esiin, tätä on tietysti vaikea 
korjata, 
+              koska kyse on lineaarisesta interpolaatiosta?
            - painting the squares with mouse and send coords to console 
              to help with building the screenshots scene.
                - can make structure directly... with little help.
@@ -35,8 +38,7 @@
                        - xanalogical structure
        - buoy geom fig 
         - can you write the abstract section to xupdf article?
-           - if still here
-               
+           - if still here             
     jvk:
        - buoys are too small
            - buoyManager and the buoy nodes' getSize methods control
@@ -148,6 +150,7 @@
 
        - suggest books to be ordered (hypertext)
     tjl:
+       - rename the classes of buoy view
        - move lots of stuff to lava and basalt
 
 0.8alpha5: saving, loading etc. with mediaserver useful; tests
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.24 gzz/gfx/demo/buoyoing.py:1.25
--- gzz/gfx/demo/buoyoing.py:1.24       Fri Feb 14 12:43:34 2003
+++ gzz/gfx/demo/buoyoing.py    Fri Feb 14 14:23:38 2003
@@ -56,22 +56,39 @@
 vs.put(background((.8, .4, .9)))
 w.renderStill(vs, 0)
 
+
+papers = ['urn:urn-5:LpyTF-IpdyXzNrsw3EsW0o05Slrb',
+          'urn:urn-5:Jl9wZ+Y9Y0UjMKEVM1fJ5dQxVFeB',
+          'urn:urn-5:7UfI0Sa1Khv1HD05KfxQBGrsNLYt',
+          'urn:urn-5:Ozjyv51bS-YEWt3YDcJsP3AyrM02',
+          'urn:urn-5:LgsTIYuVpwrJn1rgvVCNIS+fbJCe',
+          'urn:urn-5:FO2EBHSeUUAxHRaIoQHe8EcLw6X+',
+          'urn:urn-5:cKTtl2-4vXEC-T3gMMDG5f5XEite',
+          'urn:urn-5:8sZTg96TyFprP+E0c1e0mZxoWeAd']
+
 def setPan(cell, x, y):
     cx = cell.N(d.pan)
     cx.setText(str(x))
     cy = cx.N(d.pan)
     cy.setText(str(y))
 
-def newNote(span, comment, transX=-150, transY=-100, commentY=30):
-    paper = space.getHomeCell().h(d.d1, 1).N(d.d1)
+def newPaper():
+    rotatelist(papers)
+    paper = space.getCell(papers[0])
+    #paper = space.getHomeCell().h(d.d1,1).N(d.d1)
     paper.setText('New paper')
-    note = paper.N(d.contains)
-    setPan(note, transX,transY)
-    space.getCellTexter().setEnfilade(
-           note, pagespanNodes.makeEnf(span))
-    note = note.N(d.contains)
+    return paper
+
+def addNote(paper, comment, x=50,y=150):
+    note = paper.h(d.contains,1).N(d.contains)
     note.setText(comment)
-    setPan(note, transX, commentY)
+    setPan(note, x, y)
+
+def addTrans(span, paper, transX=0, transY=0,):
+    trans = paper.N(d.contains)
+    setPan(trans, transX,transY)
+    space.getCellTexter().setEnfilade(
+           trans, pagespanNodes.makeEnf(span))
 
 xulinks = 1
 
@@ -86,7 +103,8 @@
     #"01E1682758ABF63E7833692653A5DE46EA53A6F8AA")),
     gzz.media.impl.PageImageScroll(None, gzz.mediaserver.Mediaserver.Id(
     
#"0000000008000000E9573F40460004592C0AC2038D1250E0ED08F865D8C9148654B87A7AA82CC6")),
-    "010DA2A88F8C71B76061AA8F1418C0CC77C3C3200D")),
+    #"010DA2A88F8C71B76061AA8F1418C0CC77C3C3200D")),
+    "01E941CB556ACB221B3909F6203E1763B7CA9A74B4")),
     gzz.media.impl.PageImageScroll(None, gzz.mediaserver.Mediaserver.Id(
     
#"0000000008000000E9573F38AE000410A88E08C0C3AB6E45E102B9921BBE71DC74E1A7492D70AE")),
     "010D41691A3EC1332F7D7BC81686F80A6D1362EBE9")),
@@ -109,8 +127,14 @@
     pg0 = pagescrolls[0]
     wholepage = pg0.getCurrent().subSpan(0,1)
     span = wholepage.subArea(50, 50, 400, 150)
-    newNote(span, 'Give a good comment\nover here')
-
+    paper = newPaper()
+    addTrans(span, paper)
+    addNote(paper, 'Foobar', -30, 50)
+
+    paper2 = newPaper()
+    span = wholepage.subArea(150, 150, 400, 250)
+    addTrans(span, paper2)
+    addNote(paper2, 'BarFoo')
 
     scrollblockLinker.xuIndex = xuindexer
     scrollblockLinker.xulinkPageSpanNodeType = 
pagespanNodes.AnchorPageSpanNodeType(scrollblockLinker)
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.16 
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.17
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.16        Fri Feb 14 08:41:31 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java     Fri Feb 14 14:23:38 2003
@@ -32,6 +32,10 @@
 import gzz.client.*;
 import gzz.gfx.gl.*;
 
+import gzz.media.*;
+import gzz.media.impl.*;
+import gzz.impl.*;
+
 import java.awt.event.*;
 
 
@@ -41,7 +45,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.16 
2003/02/14 13:41:31 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.17 
2003/02/14 19:23:38 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor:"+s); }
 
@@ -137,6 +141,20 @@
        this.hook = hook;
        this.d = d;
        this.window = w;
+
+       SimpleVStreamTexter sct = (SimpleVStreamTexter)space.getCellTexter();
+       Enfilade1DImpl enf = (Enfilade1DImpl)sct.getEnfilade(c, null);
+       java.util.List enfList= enf.getList();
+       Span1D span = (Span1D) enfList.get(0);
+       CellView cv;
+       if (span instanceof TextSpan)
+           cv = new TextCellContentView();
+       else
+           cv = new PageSpanCellView();
+        float [] bs = new float[3];
+       cv.getSize(c, ((ViewContext)new AbstractViewContext()), bs);
+       panx = bs[0]/2;
+       pany = bs[1]/2;
     }
 
 
Index: gzz/gzz/view/CoordinatePlaneMultiView.java
diff -u gzz/gzz/view/CoordinatePlaneMultiView.java:1.8 
gzz/gzz/view/CoordinatePlaneMultiView.java:1.9
--- gzz/gzz/view/CoordinatePlaneMultiView.java:1.8      Fri Feb 14 08:25:15 2003
+++ gzz/gzz/view/CoordinatePlaneMultiView.java  Fri Feb 14 14:23:38 2003
@@ -42,8 +42,8 @@
  */
 
 public class CoordinatePlaneMultiView {
-public static final String rcsid = "$Id: CoordinatePlaneMultiView.java,v 1.8 
2003/02/14 13:25:15 jvk Exp $";
-    public static boolean dbg = true;
+public static final String rcsid = "$Id: CoordinatePlaneMultiView.java,v 1.9 
2003/02/14 19:23:38 mudyc Exp $";
+    public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("CoordinatePlaneMultiView"+s); }
 
     private Dim d_rank;