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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/12 05:57:44

Modified files:
        gfx/demo       : buoyoing.py 
        gzz/modules/pp2: PPCanvasCursor.java PPCanvasNode.java 
                         SinglePaper.java 
        gzz/view/buoy  : buoymanager.py 

Log message:
        transclusion works.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/SinglePaper.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.17 gzz/gfx/demo/buoyoing.py:1.18
--- gzz/gfx/demo/buoyoing.py:1.17       Tue Feb 11 14:40:13 2003
+++ gzz/gfx/demo/buoyoing.py    Wed Feb 12 05:57:43 2003
@@ -53,16 +53,18 @@
 vs.put(background((.8, .4, .9)))
 w.renderStill(vs, 0)
 
+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):
     paper = space.getHomeCell().h(d.d1, 1).N(d.d1)
     paper.setText('New paper')
     note = paper.N(d.contains)
     note.setText(comment)
-    x = note.N(d.pan)
-    x.setText("0")
-    y = x.N(d.pan)
-    y.setText("0")
+    setPan(note, 0,0)
     space.getCellTexter().setEnfilade(
            note, pagespanNodes.makeEnf(span))
 
@@ -100,8 +102,8 @@
     # try out some notes..
     pg0 = pagescrolls[0]
     wholepage = pg0.getCurrent().subSpan(0,1)
-    span = wholepage.subArea(1, 1, 40, 40)
-    newNote(span, 'Foobar')
+    span = wholepage.subArea(1, 1, 100, 100)
+    newNote(span, 'Give\n a good\n  comment\n   over\n    here')
 
 
     scrollblockLinker.xuIndex = xuindexer
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.10 
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.11
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.10        Tue Feb 11 07:07:27 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java     Wed Feb 12 05:57:44 2003
@@ -41,7 +41,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.10 
2003/02/11 12:07:27 tjl Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.11 
2003/02/12 10:57:44 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor:"+s); }
 
@@ -120,7 +120,7 @@
 
 
 
-
+    private Space space;
     private Cell current;
     private Object content;
     private CellPlacementHook hook;
@@ -128,8 +128,10 @@
     private PPDims d;
     private GraphicsAPI.Window window;
     
-    public PPCanvasCursor(Cell c, Object content, CellPlacementHook hook,
-                         PPDims d, GraphicsAPI.Window w) {
+    public PPCanvasCursor(Space space, Cell c, Object content,
+                         CellPlacementHook hook, PPDims d,
+                         GraphicsAPI.Window w) {
+       this.space = space;
        this.current = c;
        this.content = content;
        this.hook = hook;
@@ -153,7 +155,7 @@
        c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
        vs.matcher.add(into, c2fCS, "C2F");
        setZoomPan(vs, into);
-       SinglePaper.i(d, window, current).render(vs, into, c2fCS, hook);
+       SinglePaper.i(space, d, window, current).render(vs, into, c2fCS, hook);
     }
 
     public void keystroke(String s) {
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.12 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.13
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.12  Tue Feb 11 14:15:38 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Wed Feb 12 05:57:44 2003
@@ -33,7 +33,7 @@
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.12 2003/02/11 
19:15:38 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.13 2003/02/12 
10:57:44 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -66,7 +66,7 @@
 
 
     public boolean ownsCell(Cell c) {
-       pa("Someone try to get me to do the work! "+ c);
+       if (dbg) pa("Someone try to get me to do the work! "+ c);
 
        // If it's a note, there must be a cell in 
        // a negative dir which is canvas or another note.
@@ -91,20 +91,22 @@
 
     public int renderBuoy(VobScene vs, int into, Cell c, Object content,
                            Object cachedSize) {
+       if (dbg) pa("renderBuoyCell:"+c);
+
        // XXX Pan
        int[] pan = getCoords(c);
        final int c2fCS = 
            vs.coords.ortho(0, 0,  -pan[0]*buoyZoom, -pan[1]*buoyZoom, 
buoyZoom, buoyZoom);
        vs.matcher.add(into, c2fCS, "C2F");
 
-       SinglePaper.i(d,win,c).render(vs, into, c2fCS, null);
+       SinglePaper.i(space, d,win,c).render(vs, into, c2fCS, null);
        return into;
     }
 
     public BuoyViewMainNode createMainNode(Cell c, Object content, 
CellPlacementHook hook) {
        pa("Do new main viewpoint of "+c+" cont: "+content);
        avc.setAccursed(c);
-       return new PPCanvasCursor(c, content, hook, d, win);
+       return new PPCanvasCursor(space, c, content, hook, d, win);
     }
 
     private int[] getCoords(Cell c) {
Index: gzz/gzz/modules/pp2/SinglePaper.java
diff -u gzz/gzz/modules/pp2/SinglePaper.java:1.5 
gzz/gzz/modules/pp2/SinglePaper.java:1.6
--- gzz/gzz/modules/pp2/SinglePaper.java:1.5    Tue Feb 11 07:07:27 2003
+++ gzz/gzz/modules/pp2/SinglePaper.java        Wed Feb 12 05:57:44 2003
@@ -37,7 +37,7 @@
  * the background and the vobs inside the plane.
  */
 public class SinglePaper {
-private static final String rcsid = "$Id: SinglePaper.java,v 1.5 2003/02/11 
12:07:27 tjl Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.6 2003/02/12 
10:57:44 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -54,14 +54,16 @@
 
     /** Get instance 
      */
-    public static SinglePaper i(PPDims d, GraphicsAPI.Window win, Cell 
current) {
-       i().set(d, win,current);
+    public static SinglePaper i(Space space, PPDims d,
+                               GraphicsAPI.Window win,Cell current) {
+       i().set(space, d, win,current);
        return i();
     }
 
     /** Set the instance. This is usually made with i() method.
      */
-    public void set(PPDims d, GraphicsAPI.Window win, Cell current) {
+    public void set(Space space, PPDims d, GraphicsAPI.Window win, Cell 
current) {
+       this.space = space;
        this.context.setAccursed(current);
        this.d = d;
        this.coordinatePlaneView = new CoordinatePlaneView(d.contains, d.pan);
@@ -73,6 +75,7 @@
     private CellView cellview = new ImageCell(new PPCellView(style,
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
     private PPDims d;
+    private Space space;
     private AbstractViewContext context = new AbstractViewContext();
 
 
@@ -122,8 +125,12 @@
     void render(final VobScene vs, final int frameCS, final int panZoom,
                    CellPlacementHook hook) {
        if(hook != null) 
-           context.setCellView(
-               new CellViewPlugin(cellview, hook));
+           
+           if (space.getCellTexter() == null)
+               context.setCellView(new CellViewPlugin(cellview, hook));
+           else
+               context.setCellView(
+                  new CellViewPlugin(new PageSpanCellView(), hook));
        else
            context.setCellView(cellview);
        final GLVobCoorder glc = (GLVobCoorder)vs.coords;
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.24 
gzz/gzz/view/buoy/buoymanager.py:1.25
--- gzz/gzz/view/buoy/buoymanager.py:1.24       Tue Feb 11 14:15:38 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Wed Feb 12 05:57:44 2003
@@ -10,7 +10,7 @@
 from gzz.view.buoy import BuoyAdaptor
 
 # Slow animation for the demo.
-gzz.client.AbstractUpdateManager.defaultAnimationTime = 3500
+gzz.client.AbstractUpdateManager.defaultAnimationTime = 1500
 gzz.client.AbstractUpdateManager.fractCalc = 
gzz.client.AbstractUpdateManager.LinearCalculator()
 
 
@@ -69,7 +69,7 @@
             self.vs.matcher.keymapSingleCoordsys(main, 
self.animationCS_buoy[0][3])
             #self.vs.matcher.keymapSingleCoordsys(main, self.animBuoy)
             old_vs = self.animationCS_buoy[1]
-            old_vs.matcher.dumpByParent(self.animationCS_buoy[0][3])
+            #old_vs.matcher.dumpByParent(self.animationCS_buoy[0][3])
 
             self.animationCS_buoy = None
 
@@ -132,7 +132,7 @@
             #self.vs.matcher.keymapSingleCoordsys(into,self.animMain)
 
             old_vs = self.animationCS_main[2]
-            old_vs.matcher.dumpByParent(self.animationCS_main[0])
+            #old_vs.matcher.dumpByParent(self.animationCS_main[0])
             
             self.animationCS_main = None