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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/12 08:37:56

Modified files:
        gfx/demo       : buoyoing.py 
        gzz/modules/pp2: SinglePaper.java 
Added files:
        gzz/view       : CoordinatePlaneMultiView.java 

Log message:
        PageSpan and TextSpan in a same buoy, yep..

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/SinglePaper.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CoordinatePlaneMultiView.java?rev=1.1

Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.20 gzz/gfx/demo/buoyoing.py:1.21
--- gzz/gfx/demo/buoyoing.py:1.20       Wed Feb 12 07:47:06 2003
+++ gzz/gfx/demo/buoyoing.py    Wed Feb 12 08:37:56 2003
@@ -65,10 +65,12 @@
     paper = space.getHomeCell().h(d.d1, 1).N(d.d1)
     paper.setText('New paper')
     note = paper.N(d.contains)
-    note.setText(comment)
     setPan(note, 0,0)
     space.getCellTexter().setEnfilade(
            note, pagespanNodes.makeEnf(span))
+    note = note.N(d.contains)
+    note.setText(comment)
+    setPan(note, -20,-30)
 
 xulinks = 1
 
Index: gzz/gzz/modules/pp2/SinglePaper.java
diff -u gzz/gzz/modules/pp2/SinglePaper.java:1.7 
gzz/gzz/modules/pp2/SinglePaper.java:1.8
--- gzz/gzz/modules/pp2/SinglePaper.java:1.7    Wed Feb 12 06:04:07 2003
+++ gzz/gzz/modules/pp2/SinglePaper.java        Wed Feb 12 08:37:56 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.7 2003/02/12 
11:04:07 mudyc Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.8 2003/02/12 
13:37:56 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -66,7 +66,7 @@
        this.space = space;
        this.context.setAccursed(current);
        this.d = d;
-       this.coordinatePlaneView = new CoordinatePlaneView(d.contains, d.pan);
+       this.coordinatePlaneView = new CoordinatePlaneMultiView(d.contains, 
d.pan);
        this.window = win;
     }
 
@@ -101,7 +101,7 @@
 
 
     private Vob black = GLCache.getCallList("Color 0 0 0\n");
-    private CoordinatePlaneView coordinatePlaneView;
+    private CoordinatePlaneMultiView coordinatePlaneView;
     private GraphicsAPI.Window window;
 
 
@@ -124,18 +124,11 @@
      */
     void render(final VobScene vs, final int frameCS, final int panZoom,
                    CellPlacementHook hook) {
-       if(hook != null) 
-           
-           if (space.getCellTexter() == null)
-               context.setCellView(new CellViewPlugin(cellview, hook));
-           else
-               context.setCellView(
-                  new CellViewPlugin(new PageSpanCellView(), hook));
-       else
-           if (space.getCellTexter() == null)
-               context.setCellView(cellview);
-           else
-               context.setCellView(new PageSpanCellView());
+       final CellPlacementHook hook_final = hook;
+
+       // don't want to move this away from here..
+       // rest are set in CoordinatePlaneMultiView
+       context.setCellView(cellview);
 
        final GLVobCoorder glc = (GLVobCoorder)vs.coords;
        float[] sqs = new float[2];
@@ -189,7 +182,7 @@
                    bg.put(vs, frameUnit, bg2screen);
                    vs.map.put(black);
                    coordinatePlaneView.render(vs, paper2screen_shifted,
-                                              context, frameCS);
+                                              context, frameCS, space, 
hook_final);
                }};
 
        if(useStencil)