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

[Matti Katila]

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

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

Log message:
        small steps

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasCursor.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/realppview.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CoordinatePlaneView.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp2/PPCanvasCursor.java
diff -u gzz/gzz/modules/pp2/PPCanvasCursor.java:1.1 
gzz/gzz/modules/pp2/PPCanvasCursor.java:1.2
--- gzz/gzz/modules/pp2/PPCanvasCursor.java:1.1 Wed Feb  5 06:45:42 2003
+++ gzz/gzz/modules/pp2/PPCanvasCursor.java     Wed Feb  5 08:34:43 2003
@@ -40,7 +40,7 @@
 /** XXX
  */
 public class PPCanvasCursor implements BuoyViewMainNode {
-    private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.1 
2003/02/05 11:45:42 mudyc Exp $";  
+    private static final String rcsid = "$Id: PPCanvasCursor.java,v 1.2 
2003/02/05 13:34:43 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("BuoyAdaptor:"+s); }
 
@@ -154,8 +154,12 @@
        this.avc = avc;
        this.d = d;
        this.window = w;
+       this.coordinatePlaneView = new CoordinatePlaneView(d.contains, d.pan);
     }
 
+    TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 0, 20);
+    CellView cellview = new ImageCell(new PPCellView(style,
+        "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"));
 
     public void renderMain(VobScene vs, int into) {
        int mainctr = vs.translateCS(0, "MAINVPCTR",
@@ -172,6 +176,7 @@
        
        SinglePlane plane = new SinglePlane();
        plane.context = avc;
+       ((AbstractViewContext)plane.context).setCellView(cellview);
        plane.render(vs, frameCS, c2fCS);
            
     }
Index: gzz/gzz/modules/pp2/realppview.py
diff -u gzz/gzz/modules/pp2/realppview.py:1.4 
gzz/gzz/modules/pp2/realppview.py:1.5
--- gzz/gzz/modules/pp2/realppview.py:1.4       Wed Feb  5 06:45:42 2003
+++ gzz/gzz/modules/pp2/realppview.py   Wed Feb  5 08:34:43 2003
@@ -28,6 +28,9 @@
 
 from gzz.view import *
 from gzz.view.buoy import *
+from gzz.view.buoy import BuoyAdaptor
+from gzz.view.buoy import PPLinker
+from gzz.view.buoy import buoymanager
 
 # probably not needed
 #import math
@@ -71,15 +74,7 @@
 firstTime = 0
 
 
-#foos:
-mainY = 200
-mainX = 200
-mainHeihgt = 300
-mainWidth = 200
-
-
-
-class RealPPBuoyViewManager:
+class RealPPBuoyViewManager(buoymanager.RealBuoyManager):
     def __init__(self):
        w.setLocation(0,0,1024,768)
         return_data()
@@ -109,23 +104,22 @@
 
         else:
             print 'NOT WORK!!!!'
-            #System.exit(1)
+            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'
+        self.b_mngr = gzz.view.buoy.buoymanager.RealBuoyManager.__init__(self, 
self.adaptor, None, self.avc.getAccursed())
+        print 'bar'
         
 
-    def scene(self, vs):
-        mainNode = self.adaptor.createMainNode(None, self.avc.getAccursed(), 
self.ppv)
-        mainNode.renderMain(vs, 0)
+#    def scene(self, vs):
+#        mainNode = self.adaptor.createMainNode(None, self.avc.getAccursed(), 
self.ppv)
+#        mainNode.renderMain(vs, 0)
 
 
 
Index: gzz/gzz/view/CoordinatePlaneView.java
diff -u gzz/gzz/view/CoordinatePlaneView.java:1.10 
gzz/gzz/view/CoordinatePlaneView.java:1.11
--- gzz/gzz/view/CoordinatePlaneView.java:1.10  Mon Jan 27 00:48:33 2003
+++ gzz/gzz/view/CoordinatePlaneView.java       Wed Feb  5 08:34:43 2003
@@ -37,7 +37,7 @@
  */
 
 public class CoordinatePlaneView implements View {
-public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.10 
2003/01/27 05:48:33 mudyc Exp $";
+public static final String rcsid = "$Id: CoordinatePlaneView.java,v 1.11 
2003/02/05 13:34:43 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -73,6 +73,7 @@
            if(dbg) pa("CPV: "+item+" "+firstCoord);
            if(firstCoord != null) {
                int[] place = gzz.client.Params.getInts(firstCoord, d_coords, 
2, null);
+               if (cv == null) throw new Error("No CellViewContext defined");
                cv.getSize(item, context, bs);
 
                if(dbg) pa("CPV PLACE: "+place[0]+" "+place[1]+" "+