[Gzz-commits] gzz/gzz/modules/pp2 PPCanvasCursor.java PPCanva...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/11 07:07:28

Modified files:
        gzz/modules/pp2: PPCanvasCursor.java PPCanvasNode.java 
                         SinglePaper.java 

Log message:
        Start righting the wrongs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/SinglePaper.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.9 
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.10
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.9 Mon Feb 10 05:09:27 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java     Tue Feb 11 07:07:27 2003
@@ -41,7 +41,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.9 2003/02/10 
10:09:27 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.10 
2003/02/11 12:07:27 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { 
System.out.println("PPCanvasCursor:"+s); }
 
@@ -125,19 +125,14 @@
     private Object content;
     private CellPlacementHook hook;
 
-    private AbstractViewContext avc;
-    private AbstractViewContext buoy_avc;
     private PPDims d;
     private GraphicsAPI.Window window;
     
     public PPCanvasCursor(Cell c, Object content, CellPlacementHook hook,
-                         AbstractViewContext avc, PPDims d, GraphicsAPI.Window 
w) {
+                         PPDims d, GraphicsAPI.Window w) {
        this.current = c;
        this.content = content;
        this.hook = hook;
-       this.avc = avc;
-       this.buoy_avc = new AbstractViewContext();
-       this.buoy_avc.setAccursed(avc.getAccursed());
        this.d = d;
        this.window = w;
     }
@@ -158,14 +153,7 @@
        c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
        vs.matcher.add(into, c2fCS, "C2F");
        setZoomPan(vs, into);
-       SinglePaper.i(avc, d, window, current).render(vs, into, c2fCS);
-
-       Cell paper = current.h(d.contains);
-       for (Cell c = paper.s(d.contains); c != null; c = c.s(d.contains) ) {
-           if (c == current) continue;
-           buoy_avc.setAccursed(c);
-           hook.placed(c, vs, into, (ViewContext)avc);
-       }
+       SinglePaper.i(d, window, current).render(vs, into, c2fCS, hook);
     }
 
     public void keystroke(String s) {
@@ -208,7 +196,7 @@
            panx = m_state[0] - (e.getX() - m_state[0])/zoom;
            pany = m_state[1] - (e.getY() - m_state[1])/zoom;
            */
-           avc.setAccursed(avc.getAccursed().h(d.contains));   
+           current = current.h(d.contains);   
        }
 
        return true;
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.10 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.11
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.10  Mon Feb 10 05:09:27 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Tue Feb 11 07:07:27 2003
@@ -33,7 +33,7 @@
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.10 2003/02/10 
10:09:27 mudyc Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.11 2003/02/11 
12:07:27 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -96,14 +96,14 @@
            vs.coords.ortho(0, 0,  -pan[0]*buoyZoom, -pan[1]*buoyZoom, 
buoyZoom, buoyZoom);
        vs.matcher.add(into, c2fCS, "C2F");
 
-       SinglePaper.i(avc,d,win,c).render(vs, into, c2fCS);
+       SinglePaper.i(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, avc, d, win);
+       return new PPCanvasCursor(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.4 
gzz/gzz/modules/pp2/SinglePaper.java:1.5
--- gzz/gzz/modules/pp2/SinglePaper.java:1.4    Mon Feb 10 14:52:38 2003
+++ gzz/gzz/modules/pp2/SinglePaper.java        Tue Feb 11 07:07:27 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.4 2003/02/10 
19:52:38 mudyc Exp $";  
+private static final String rcsid = "$Id: SinglePaper.java,v 1.5 2003/02/11 
12:07:27 tjl Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("SinglePaper:"+s); }
 
@@ -54,20 +54,18 @@
 
     /** Get instance 
      */
-    public static SinglePaper i(ViewContext vc, PPDims d, GraphicsAPI.Window 
win, Cell current) {
-       i().set(vc,d, win,current);
+    public static SinglePaper i(PPDims d, GraphicsAPI.Window win, Cell 
current) {
+       i().set(d, win,current);
        return i();
     }
 
     /** Set the instance. This is usually made with i() method.
      */
-    public void set(ViewContext vc, PPDims d, GraphicsAPI.Window win, Cell 
current) {
-       this.context = vc;
-       ((AbstractViewContext)context).setCellView(cellview);
+    public void set(PPDims d, GraphicsAPI.Window win, Cell current) {
+       this.context.setAccursed(current);
        this.d = d;
        this.coordinatePlaneView = new CoordinatePlaneView(d.contains, d.pan);
        this.window = win;
-       this.current = current;
     }
 
 
@@ -75,8 +73,7 @@
     private CellView cellview = new ImageCell(new PPCellView(style,
         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
     private PPDims d;
-    private ViewContext context;
-    private Cell current;
+    private AbstractViewContext context = new AbstractViewContext();
 
 
 
@@ -122,7 +119,13 @@
      *                 will be set to the center of the frameCS, and
      *                 the scale is 1 to 1 pixel.
      */
-    void render(final VobScene vs, final int frameCS, final int panZoom) {
+    void render(final VobScene vs, final int frameCS, final int panZoom,
+                   CellPlacementHook hook) {
+       if(hook != null) 
+           context.setCellView(
+               new CellViewPlugin(cellview, hook));
+       else
+           context.setCellView(cellview);
        final GLVobCoorder glc = (GLVobCoorder)vs.coords;
        float[] sqs = new float[2];
        glc.getSqSize(frameCS, sqs);
@@ -138,7 +141,7 @@
        final int bg2screen = vs.scaleCS(paper2screen, "BGSCA", 
                                         bgscale, bgscale);
    
-       final Cell cursor = current;
+       final Cell cursor = context.getAccursed();
        final Cell plane = cursor.h(d.contains);
 
        // BgVob takes two coordsys: