[Gzz-commits] gzz/gzz/modules/pp2 PPCanvasNode.java realppvie...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/04 21:27:21

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

Log message:
        few hours of thinking. still needs few more * pii.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPViewNG.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/realppview.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.2 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.3
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.2   Tue Feb  4 09:45:34 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Tue Feb  4 21:27:20 2003
@@ -23,20 +23,39 @@
 
 
 package gzz.modules.pp2;
+import gzz.modules.pp.PPDims;
 import gzz.*;
 import gzz.view.*;
 import gzz.view.buoy.*;
 import gzz.vob.*;
+import gzz.client.*;
 
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-    private static final String rcsid = "$Id: PPCanvasNode.java,v 1.2 
2003/02/04 14:45:34 mudyc Exp $";  
-    private static boolean dbg = false;
+    private static final String rcsid = "$Id: PPCanvasNode.java,v 1.3 
2003/02/05 02:27:20 mudyc Exp $";  
+    public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
+    private PPDims d;
+    private AbstractViewContext avc;
+    private Space space;
+    private GraphicsAPI.Window win;
+    public PPCanvasNode(PPDims d, Space s, AbstractViewContext avc, 
GraphicsAPI.Window w) {
+       this.d = d;
+       this.space = s;
+       this.avc = avc;
+       this.win = w;
+    }
+
+
     public boolean ownsCell(Cell c) {
-       return false;
+       // XXX
+       // how can I check that this is PP cell?
+       
+       pa("Just guessing that this is PP...");
+
+       return true;
     }
 
     public void renderBuoy(VobScene vs, int into, Cell c, Object content) {
@@ -44,7 +63,8 @@
     }
 
     public BuoyViewMainNode createMainNode(Cell c, Object content, 
CellPlacementHook hook) {
-       return null;
+       return new PPCanvasCursor(c, avc, d, win);
     }
+
 
 }
Index: gzz/gzz/modules/pp2/realppview.py
diff -u gzz/gzz/modules/pp2/realppview.py:1.2 
gzz/gzz/modules/pp2/realppview.py:1.3
--- gzz/gzz/modules/pp2/realppview.py:1.2       Tue Feb  4 09:45:34 2003
+++ gzz/gzz/modules/pp2/realppview.py   Tue Feb  4 21:27:20 2003
@@ -6,12 +6,14 @@
 from gzz import *
 from gzz.impl import *
 from gzz.modules.pp2 import *
+from gzz.modules.pp import PPDims
 from java.io import File
 from gzz.media.impl import *
 
+from gzz.view import *
+from gzz.view.buoy import *
+
 # probably not needed
-#
-#from gzz.view import *
 #import math
 #from java.lang import Math
 #from java.awt.event import MouseEvent
@@ -89,28 +91,26 @@
             self.d = PPDims(self.space)
             self.avc.setAccursed(self.space.getHomeCell().s(self.d.d1))
 
+        else:
+            print 'NOT WORK!!!!'
+            #System.exit(1)
+
+        print 'fooo'
+        self.ppv = None #PPViewNG(self.space, self.ppactions)
+        print 'bar'
+
+        # 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)]
+        
+        print 'foo'
+        
 
-        # make first render by giving a frame into buoy..
-        mainctr = vs.translateCS(0, "MAINVPCTR",
-                                 centerX(vs), mainY + mainHeight/2);
-
-       frameCS = vs.orthoBoxCS(mainctr, "MAINVP", 10, 
-                                (-mainWidth)/2, -mainHeight/2, 1, 1, 
-                                mainWidth, mainHeight);
-       vs.activate(frameCS);
-
-       # cell to frame CS
-       int c2fCS = vs.coords.ortho(0, 0, 0, 0, 10, 10);
-       vs.matcher.add(frameCS, c2fCS, "C2F");
-
-        # make a PPCanvasNode
-        pp_mainvp = PPCanvasNode()
+    def scene(self, vs):
+        mainNode = self.adaptor.createMainNode(None, self.avc.getAccursed(), 
self.ppv)
+        mainNode.renderMain(vs, 0)
 
-        # and call it with cs.
-        pp_mainvp.renderBuoy(vs, frameCS, self.avc.getAccursed(), null)
 
-    def centerX(self, vs):
-        return vs.size.width()/2
-        
 
 currentScene = RealPPBuoyViewManager()