[Gzz-commits] libvob org/nongnu/libvob/buoy/buoymanager.py or...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/27 02:51:17

Modified files:
        org/nongnu/libvob/buoy: buoymanager.py 
        org/nongnu/libvob/putil: demo.py reloader.py 
        src/jni        : jnivobs.hxx 
Added files:
        include/vob    : FisheyePrimitives.hxx 

Log message:
        Fisheye, reloader improvements

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/include/vob/FisheyePrimitives.hxx?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/buoy/buoymanager.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/putil/demo.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/putil/reloader.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/src/jni/jnivobs.hxx.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/buoy/buoymanager.py
diff -u libvob/org/nongnu/libvob/buoy/buoymanager.py:1.1 
libvob/org/nongnu/libvob/buoy/buoymanager.py:1.2
--- libvob/org/nongnu/libvob/buoy/buoymanager.py:1.1    Tue Mar 25 07:04:10 2003
+++ libvob/org/nongnu/libvob/buoy/buoymanager.py        Thu Mar 27 02:51:17 2003
@@ -24,29 +24,23 @@
 from __future__ import nested_scopes
 import jarray
 
-from gfx.util.misc import *
-import gfx
-from gfx.libutil import saveanim
-
-import gzz
-from gzz.view.buoy import zzNodes
-from gzz.view.buoy import pagespanNodes
-from gzz.view.buoy import BuoyLinkListener, ScrollblockCellLinker
-from gzz.view.buoy import BuoyAdaptor
+import org.nongnu.libvob as vob
+
+from org.nongnu.libvob.putil.misc import *
 
 # Slow animation for the demo.
-gzz.client.AbstractUpdateManager.defaultAnimationTime = 1500
-gzz.client.AbstractUpdateManager.fractCalc = 
gzz.client.AbstractUpdateManager.LinearCalculator(0)
+vob.AbstractUpdateManager.defaultAnimationTime = 1500
+vob.AbstractUpdateManager.fractCalc = 
vob.AbstractUpdateManager.LinearCalculator(0)
 
 
 print "LOADING BUOYMANAGER"
 
-lineconn = GLRen.createLineConnector(.5, .5, .5, .5, 0, 0, 0, 0, 0, 1)
+lineconn = GLRen.createLineConnector(.5, .5, .5, .5)
 #lineconn = GLRen.createSqFilletConnection(30, 1, .125, 6)
 
 size = jarray.zeros(2, 'f')
 
-class RealBuoyManager(BuoyLinkListener):
+class RealBuoyManager(vob.buoy.BuoyLinkListener):
     """Manage buoys through the new APIs
 
     This is a demo "scene"
Index: libvob/org/nongnu/libvob/putil/demo.py
diff -u libvob/org/nongnu/libvob/putil/demo.py:1.2 
libvob/org/nongnu/libvob/putil/demo.py:1.3
--- libvob/org/nongnu/libvob/putil/demo.py:1.2  Tue Mar 25 13:23:46 2003
+++ libvob/org/nongnu/libvob/putil/demo.py      Thu Mar 27 02:51:17 2003
@@ -34,6 +34,7 @@
 #
 # The demos should make an effort to adapt to any window size.
 
+__do_not_delete__ = 1
 
 import sys
 import os
@@ -115,6 +116,8 @@
        else:
            print "No file found, trying module.",scenefile
            exec """
+import sys
+print sys.modules
 import %(scenefile)s
 theModule = %(scenefile)s
                """%globals() in globals(), globals()
Index: libvob/org/nongnu/libvob/putil/reloader.py
diff -u libvob/org/nongnu/libvob/putil/reloader.py:1.1 
libvob/org/nongnu/libvob/putil/reloader.py:1.2
--- libvob/org/nongnu/libvob/putil/reloader.py:1.1      Tue Mar 25 07:04:10 2003
+++ libvob/org/nongnu/libvob/putil/reloader.py  Thu Mar 27 02:51:17 2003
@@ -36,22 +36,37 @@
     # so we check for a "__do_not_delete__" directive.
     # Note: such modules must reload dependencies themselves
     
-    for modname in mods:
-       mod = sys.modules[modname]
-       if hasattr(mod, "__do_not_delete__"):
-           print "Reloading", modname
-           try:
-               reload(mod)
-           except:
-               print "Warning: reload failed"
+#    for modname in mods:
+#      mod = sys.modules[modname]
+#      if hasattr(mod, "__do_not_delete__"):
+#          print "Reloading", modname
+#          try:
+#              reload(mod)
+#          except:
+#              print "Warning: reload failed"
            
     for modname in mods:
        mod = sys.modules[modname]
        if not hasattr(mod, "__do_not_delete__"):
            # if modname[:4] == "gfx." and hasattr(mod, "__file__"):
            if hasattr(mod, "__file__"):
+               # Special problem: putil only contains python classes
+               # and deleting them makes them nonreloadable.
+               if (modname == "org.nongnu.libvob.putil" or
+                   modname == "org.nongnu.libvob" or
+                   modname == "org.nongnu" or
+                   modname == "org.fenfire" or
+                   modname == "org.fenfire.view" or
+                   modname == "org.fenfire.view.buoy" or
+                   modname == "org"):
+                   continue
                print "Deleting", modname
                del sys.modules[modname]
+
+
+    print sys.modules
+
+#    del sys.modules["org.nongnu.libvob.putil"]
 
     # XXX: need to reload twice so that "from foo import bar"
     # in a reloaded module can get the newer version even if
Index: libvob/src/jni/jnivobs.hxx
diff -u libvob/src/jni/jnivobs.hxx:1.2 libvob/src/jni/jnivobs.hxx:1.3
--- libvob/src/jni/jnivobs.hxx:1.2      Wed Mar 26 09:00:42 2003
+++ libvob/src/jni/jnivobs.hxx  Thu Mar 27 02:51:17 2003
@@ -17,3 +17,4 @@
 #include <vob/LinearPrimitives.hxx>
 #include <vob/FunctionalPrimitives.hxx>
 #include <vob/DisablablePrimitives.hxx>
+#include <vob/FisheyePrimitives.hxx>