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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/07 03:29:10

Modified files:
        gzz/modules/pp2: PPCanvasCursor.java PPCanvasNode.java 
                         realppview.py 

Log message:
        fixes, fixes, fixes.. -not much done but buoy(s) show now.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/realppview.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.3 
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.4
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.3 Wed Feb  5 09:46:08 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java     Fri Feb  7 03:29:10 2003
@@ -40,9 +40,9 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-    private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.3 
2003/02/05 14:46:08 mudyc Exp $";  
+    private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.4 
2003/02/07 08:29:10 mudyc Exp $";  
     public static boolean dbg = false;
-    private static void pa(String s) { System.out.println("BuoyAdaptor:"+s); }
+    private static void pa(String s) { 
System.out.println("PPCanvasCursor:"+s); }
 
     // Geometry
 
@@ -121,11 +121,18 @@
 
 
     private Cell current;
+    private Object content;
+    private CellPlacementHook hook;
+
     private AbstractViewContext avc;
     private PPDims d;
     private GraphicsAPI.Window window;
-    public PPCanvasCursor(Cell c, AbstractViewContext avc, PPDims d, 
GraphicsAPI.Window w) {
+
+    public PPCanvasCursor(Cell c, Object content, CellPlacementHook hook,
+                         AbstractViewContext avc, PPDims d, GraphicsAPI.Window 
w) {
        this.current = c;
+       this.content = content;
+       this.hook = hook;
        this.avc = avc;
        this.d = d;
        this.window = w;
@@ -145,6 +152,7 @@
        int c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
        vs.matcher.add(frameCS, c2fCS, "C2F");
        SinglePaper.i(avc, d, window).render(vs, frameCS, c2fCS);
+       hook.placed(current, vs, into, (ViewContext)avc);
     }
 
     public void keystroke(String s) {
@@ -153,10 +161,9 @@
 
 
     public boolean mouse(MouseEvent e, VobScene oldVobScene) {
-       return false;
-    }
-
-
+       pa("mouse e"+e);
 
+       return true;
+    }
 }
 
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.6 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.7
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.6   Thu Feb  6 07:41:13 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Fri Feb  7 03:29:10 2003
@@ -33,7 +33,7 @@
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.6 2003/02/06 
12:41:13 tjl Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.7 2003/02/07 
08:29:10 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -91,7 +91,9 @@
     }
 
     public BuoyViewMainNode createMainNode(Cell c, Object content, 
CellPlacementHook hook) {
-       return new PPCanvasCursor(c, avc, d, win);
+       pa("Do new main viewpoint of "+c+" cont: "+content);
+       avc.setAccursed(c);
+       return new PPCanvasCursor(c, content, hook, avc, d, win);
     }
 
     private int[] getCoords(Cell c) {
@@ -99,5 +101,4 @@
        if(firstCoord == null) return null;
        return gzz.client.Params.getInts(firstCoord, d.pan, 2, null);
     }
-
 }
Index: gzz/gzz/modules/pp2/realppview.py
diff -u gzz/gzz/modules/pp2/realppview.py:1.5 
gzz/gzz/modules/pp2/realppview.py:1.6
--- gzz/gzz/modules/pp2/realppview.py:1.5       Wed Feb  5 08:34:43 2003
+++ gzz/gzz/modules/pp2/realppview.py   Fri Feb  7 03:29:10 2003
@@ -111,7 +111,7 @@
         # Create the view..
         self.adaptor = BuoyAdaptor()
         self.adaptor.cellNodes = [PPCanvasNode(self.d, self.space, self.avc, 
w)]
-        self.adaptor.cellLinkers = [PPLinker(self.d.clone, self.d.association)]
+        self.adaptor.cellLinkers = [PPLinker(self.d.clone, self.d.association, 
self.d.contains)]
         
         self.b_mngr = gzz.view.buoy.buoymanager.RealBuoyManager.__init__(self, 
self.adaptor, None, self.avc.getAccursed())
         print 'bar'
@@ -124,3 +124,7 @@
 
 
 currentScene = RealPPBuoyViewManager()
+
+
+# debugs
+gzz.view.buoy.BuoyAdaptor.dbg = 1