[Gzz-commits] gzz gfx/util/demo.py gzz/modules/pp/demotest.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/12/19 06:09:36

Modified files:
        gfx/util       : demo.py 
        gzz/modules/pp : demotest.py 

Log message:
        uncomment

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/util/demo.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: gzz/gfx/util/demo.py
diff -u gzz/gfx/util/demo.py:1.5 gzz/gfx/util/demo.py:1.6
--- gzz/gfx/util/demo.py:1.5    Thu Dec 19 04:12:39 2002
+++ gzz/gfx/util/demo.py        Thu Dec 19 06:09:35 2002
@@ -70,33 +70,35 @@
            list.extend(loadSubmodules(a))
     return list
 
+globalSceneMap = { }
+
 def loadScenes():
     print "RELOAD"
+    global globalScenes
+    global globalHelp, globalSceneMap, globalSceneHelp
 
     if 1:
        reloadmod.reloadModules()
     try:
-       if "." not in scenefile:
+       if "." not in scenefile or "/" in scenefile:
            exec open(scenefile) in globals(), globals()
        else:
            print "No file found, trying module."
            exec """
 import %(scenefile)s
 theModule = %(scenefile)s
-       """%globals() in globals(), globals()
+               """%globals() in globals(), globals()
            print theModule
            # Now, due to lazy loading, we can't find out
            # the names of the submodules directly.
            # Have to use this trickery.
            mods = loadSubmodules(theModule)
-           global globalScenes
            globalScenes = []
            for mod in mods:
                if getattr(mod, "Scene", None):
                    globalScenes.append(mod.Scene())
            print globalScenes
 
-           global globalHelp, globalSceneMap, globalSceneHelp
            globalHelp = theModule.__doc__
            globalSceneMap = {
                "F1": GlobalScene()
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.30 gzz/gzz/modules/pp/demotest.py:1.31
--- gzz/gzz/modules/pp/demotest.py:1.30 Wed Dec  4 14:17:16 2002
+++ gzz/gzz/modules/pp/demotest.py      Thu Dec 19 06:09:36 2002
@@ -14,8 +14,8 @@
 from gfx.libutil import saveanim
 
 
-#from test.tools import tools
-#enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
+from test.tools import tools
+enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
 
 
 AbstractUpdateManager.defaultAnimationTime = 3000