[Gzz-commits] gzz/gzz/modules/pp PPView2.java demotest.py

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/06 06:11:23

Modified files:
        gzz/modules/pp : PPView2.java demotest.py 

Log message:
        Save partially works.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.40 
gzz/gzz/modules/pp/PPView2.java:1.41
--- gzz/gzz/modules/pp/PPView2.java:1.40        Sun Jan  5 06:22:00 2003
+++ gzz/gzz/modules/pp/PPView2.java     Mon Jan  6 06:11:22 2003
@@ -36,15 +36,13 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.40 2003/01/05 
11:22:00 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.41 2003/01/06 
11:11:22 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
     public static Object NEWPAPERKEY = new Object();
 
     private EventHandling ev_handler = EventHandling.i();
-    public PPMouseEvents pp_events;
-    public boolean replaceNewScene = false;
 
     // Geometry
 
@@ -137,6 +135,8 @@
     public boolean useStencil = true;
 
     /* jython publics */
+    public PPMouseEvents pp_events;
+    public boolean replaceNewScene = false;
     public PPActions ppactions;
     public Space space;
     public PPDims d;
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.42 gzz/gzz/modules/pp/demotest.py:1.43
--- gzz/gzz/modules/pp/demotest.py:1.42 Sun Jan  5 06:22:00 2003
+++ gzz/gzz/modules/pp/demotest.py      Mon Jan  6 06:11:22 2003
@@ -79,6 +79,8 @@
        self.map = None
        self.mode = 0
         self.space = space
+        self.d = PPDims(self.space)
+
 
         # Next, the mediaserver we'll save to.
         self.ms = gzz.mediaserver.SimpleMediaserver(
@@ -112,10 +114,16 @@
         if key == "Ctrl-Z":
             print 'Loading scene'
             self.space = gzz.impl.ModularSpace(self.filer.load(), 
*tools.spaceArgList())
+
+            # set space to *everywhere* !
             self.ppv.space = self.space
-            self.avc.setAccursed(self.space.getHomeCell())
+            print 'Does ', n1,' exists?:', self.space.exists(n1)
+            self.avc.setAccursed(self.space.getCell(n1))
+            self.ppv.d = PPDims(self.space)
+            self.d = PPDims(self.space)
             self.ppv.ppactions.initSpace(self.space)
-            
+            gzz.client.AbstractUpdateManager.chg();
+
        if key == "Ctrl-P":
            rotatelist(self.poly)
        if key == "Ctrl-S":
@@ -129,8 +137,8 @@
                return
            c = self.avc.getAccursed()
            print "Acc: ",c
-           if self.avc.getCursorOffset(c) < 0 or c.s(d.contains, -1) == None:
-               c = space.getCell(ppactions.newNote(c.h(d.contains).getId(), 
+           if self.avc.getCursorOffset(c) < 0 or c.s(self.d.contains, -1) == 
None:
+               c = 
self.space.getCell(ppactions.newNote(c.h(self.d.contains).getId(), 
                                    int(self.ppv.panx), int(self.ppv.pany), ""))
                print "NN: ",c
                self.avc.setAccursed(c)
@@ -161,7 +169,7 @@
            PolygonMode FRONT_AND_BACK %s
        """ % (self.poly[0],)))
        self.ppv.render(vs, 0, self.avc)
-       vs.matcher.setKeyMap(self.map)
+       #vs.matcher.setKeyMap(self.map)
        self.vs = vs
 
     def mouse(self, ev):
@@ -184,7 +192,6 @@
 gzz.modules.pp.vob.BgVob.dbg = 0
 gzz.modules.pp.vob.CalendarBg.dbg = 0
 
-# currentScene = PlaneViewScene()
 currentScene = PPView2Scene()
 
 
@@ -263,6 +270,10 @@
                0, -self.scale*self.offset[0]+.5, 
                   -self.scale*self.offset[1]+.5, 
                self.scale, 0, 0, self.scale)
+
+# currentScene = PlaneViewScene()
+
+
 
 def r(sc, filename):
     vs = w.createVobScene()