[Gzz-commits] gzz gfx/demo/buoyoing.py gzz/gfx/gl/GLSpanner.j...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/11 14:15:38

Modified files:
        gfx/demo       : buoyoing.py 
        gzz/gfx/gl     : GLSpanner.java 
        gzz/modules/pp2: PPCanvasNode.java realppview.py 
        gzz/view/buoy  : buoymanager.py 

Log message:
        foo - nothing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/buoyoing.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/gfx/gl/GLSpanner.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/PPCanvasNode.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp2/realppview.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gzz/gfx/demo/buoyoing.py
diff -u gzz/gfx/demo/buoyoing.py:1.13 gzz/gfx/demo/buoyoing.py:1.14
--- gzz/gfx/demo/buoyoing.py:1.13       Tue Feb 11 13:05:43 2003
+++ gzz/gfx/demo/buoyoing.py    Tue Feb 11 14:15:37 2003
@@ -65,9 +65,10 @@
     y.setText("0")
     space.getCellTexter().setEnfilade(
            paper, pagespanNodes.makeEnf(span))
-    return
+    return paper
 
-xulinks = 1
+gzz.gfx.gl.GLSpanner.lowEndMachine = 0
+xulinks = 0
 
 if xulinks:
     xuspace = gzz.impl.ModularSpace(*test.tools.tools.spaceArgList())
@@ -102,7 +103,7 @@
     pg0 = pagescrolls[0]
     wholepage = pg0.getCurrent().subSpan(0,1)
     span = wholepage.subArea(1, 1, 40, 40)
-    newNote(span, 'Foobar')
+    #newNote(span, 'Foobar')
 
 
     scrollblockLinker.xuIndex = xuindexer
Index: gzz/gzz/gfx/gl/GLSpanner.java
diff -u gzz/gzz/gfx/gl/GLSpanner.java:1.10 gzz/gzz/gfx/gl/GLSpanner.java:1.11
--- gzz/gzz/gfx/gl/GLSpanner.java:1.10  Tue Jan 28 13:42:11 2003
+++ gzz/gzz/gfx/gl/GLSpanner.java       Tue Feb 11 14:15:37 2003
@@ -20,7 +20,14 @@
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
-    static MemoryPartitioner pool = new MemoryPartitioner(80 * 1024 * 1024);
+       
+    static MemoryPartitioner pool;
+    {
+       String mem_str = System.getProperty("GFX_MEM", "10");
+       int mem = Integer.parseInt(mem_str);
+       if (mem < 0) throw new Error("Negative memory! "+ mem);
+       pool = new MemoryPartitioner(mem * 1024 * 1024);
+    }
 
     private static class SpanSB {
        PageImageScroll sb;
Index: gzz/gzz/modules/pp2/PPCanvasNode.java
diff -u gzz/gzz/modules/pp2/PPCanvasNode.java:1.11 
gzz/gzz/modules/pp2/PPCanvasNode.java:1.12
--- gzz/gzz/modules/pp2/PPCanvasNode.java:1.11  Tue Feb 11 07:07:27 2003
+++ gzz/gzz/modules/pp2/PPCanvasNode.java       Tue Feb 11 14:15:38 2003
@@ -33,7 +33,7 @@
 /** XXX
  */
 public class PPCanvasNode implements CellBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.11 2003/02/11 
12:07:27 tjl Exp $";  
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.12 2003/02/11 
19:15:38 mudyc Exp $";  
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPCanvasNode:"+s); }
 
@@ -66,6 +66,7 @@
 
 
     public boolean ownsCell(Cell c) {
+       pa("Someone try to get me to do the work! "+ c);
 
        // If it's a note, there must be a cell in 
        // a negative dir which is canvas or another note.
Index: gzz/gzz/modules/pp2/realppview.py
diff -u gzz/gzz/modules/pp2/realppview.py:1.7 
gzz/gzz/modules/pp2/realppview.py:1.8
--- gzz/gzz/modules/pp2/realppview.py:1.7       Sun Feb  9 09:21:22 2003
+++ gzz/gzz/modules/pp2/realppview.py   Tue Feb 11 14:15:38 2003
@@ -53,7 +53,7 @@
 identityManager = DummyIdentityManager()
 slicer = SingleSlicer("foo")
 
-usingNormalBindings = 0
+usingNormalBindings = 1
 
 PPDIR=os.getcwd()+'/gzz/modules/pp/example/'
 def clean_data(args=''):
@@ -116,15 +116,6 @@
         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)
-
-
-
 currentScene = RealPPBuoyViewManager()
 
 
-# debugs
-gzz.view.buoy.BuoyAdaptor.dbg = 1
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.23 
gzz/gzz/view/buoy/buoymanager.py:1.24
--- gzz/gzz/view/buoy/buoymanager.py:1.23       Tue Feb 11 13:05:43 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Tue Feb 11 14:15:38 2003
@@ -10,7 +10,7 @@
 from gzz.view.buoy import BuoyAdaptor
 
 # Slow animation for the demo.
-gzz.client.AbstractUpdateManager.defaultAnimationTime = 2000
+gzz.client.AbstractUpdateManager.defaultAnimationTime = 3500
 gzz.client.AbstractUpdateManager.fractCalc = 
gzz.client.AbstractUpdateManager.LinearCalculator()
 
 
@@ -66,8 +66,8 @@
         # Interpolation : old buoy -> to new main vp
         if hasattr(self, "animationCS_buoy") and \
                self.animationCS_buoy != None:
-            print 'Do MAIN Animation'
             self.vs.matcher.keymapSingleCoordsys(main, 
self.animationCS_buoy[0][3])
+            #self.vs.matcher.keymapSingleCoordsys(main, self.animBuoy)
             old_vs = self.animationCS_buoy[1]
             old_vs.matcher.dumpByParent(self.animationCS_buoy[0][3])
 
@@ -98,7 +98,7 @@
        w = 150
        h = 150
        sca = .5
-       into = self.vs.orthoBoxCS(buoy, "V", -100, -w*sca/2, -h*sca/20, 
+       into = self.vs.orthoBoxCS(buoy, "V"+str(linkId), -100, -w*sca/2, 
-h*sca/20, 
                                                    .5, .5, w, h)
        if 1:
            dbg1 = self.vs.unitSqCS(into, "U")
@@ -128,8 +128,8 @@
         if hasattr(self, "animationCS_main") and \
                self.animationCS_main != None and \
                linkId == self.animationCS_main[1][1]:
-            print 'Main to Buoy interpolation..'
             
self.vs.matcher.keymapSingleCoordsys(otherAnchorCS,self.animationCS_main[0])
+            #self.vs.matcher.keymapSingleCoordsys(into,self.animMain)
 
             old_vs = self.animationCS_main[2]
             old_vs.matcher.dumpByParent(self.animationCS_main[0])
@@ -155,10 +155,12 @@
             if ev.getID() != ev.MOUSE_CLICKED:
                 return
 
-           self.mainNode = link[0].createMainNode(link[1], link[2], self)
-
             self.animationCS_buoy = [link, self.vs]
             self.animationCS_main = [self.mainCS, link, self.vs]
 
+            self.animMain = self.vs.orthoBoxCS(0, "fooooo", 10,20,20, 10,10, 
50,30)
+            self.animBuoy = self.vs.orthoBoxCS(0, "baaaar", 10,50,500, 10,10, 
50,30)
+
+           self.mainNode = link[0].createMainNode(link[1], link[2], self)
            gzz.client.AbstractUpdateManager.chg()