[Gzz-commits] gzz Gzz.py

[Vesa Kaihlavirta]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Vesa Kaihlavirta <address@hidden>       02/09/20 10:00:53

Modified files:
        .              : Gzz.py 

Log message:
        Objectifying Gzz.py to faciliate testing.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.27 gzz/Gzz.py:1.28
*** gzz/Gzz.py:1.27     Tue Sep  3 17:11:17 2002
--- gzz/Gzz.py  Fri Sep 20 10:00:53 2002
***************
*** 6,161 ****
  from gzz.gfx.gl import GZZGL
  import re
  
  # Read arguments before importing stuff, since
  # we have to call setProperty *BEFORE* that in order
  # to choose the right GraphicsAPI.instance
  
- opts, args = getopt.getopt(sys.argv[1:], "Ct"+gzz.util.dbg.short, 
-       ["--commander"]+gzz.util.dbg.long)
  
! transient = 0
  
  
- for o,a in opts:
-     if o in ("-C", "--commander"):
-       from gzz.control import commander
-       commander.AwtCommander(globals())
-     if o in gzz.util.dbg.all:
-       gzz.util.dbg.option(o,a)
-     if o in ("-t", "--transient"):
-         transient = 1
  
  
  
- sys.path.insert(0, ".")
- 
- from gzz import *
- from gzz.impl import *
- from gzz.media import *
- from gzz.media.impl import *
- from gzz.mediaserver import *
- from gzz.mediaserver.storage import *
- from gzz.slices import *
- from gzz.slices import SliceVersion
- from gzz.slices.YAMLVersionFormatter import YAMLVersionFormat
- from gzz.diff import *
- from gzz.client import *
- from gzz.control import *
- from gzz.view import *
- from gzz.zzutil import Ids
  
  
- from java.lang import Runnable
- from java.util import HashSet, HashMap
- import java.io.File
  
  
  
  
! if (not transient) and (not args):
!     print ""
!     print "Please give at least one directory to read data from"
!     print "or specify the -t or --transient option."
!     sys.exit(1)
! 
! spanType = System.getProperty("gzz.spanType")
! spaceType = System.getProperty("gzz.spaceType")
! 
! # it's important to put all these in the global scope:
! # that way we can access them all from the console!
! 
! obsTrigger = SimpleObsTrigger();
! cellManager = PlainCellManager()
! identityManager = DummyIdentityManager()
! slicer = SingleSlicer("gzz_fallback_slice")
! 
! if spanType == None or spanType == "scroll":
!     spanMaker = ScrollSpanMaker();
! elif spanType == "transient":
!     spanMaker = FakeSpanMaker()
! else:
!     assert 1==0, "Invalid spanType "+spanType;
! 
! enfMaker = Enfilade1DImpl.Enfilade1DImplMaker()
! 
! cacheStorer = None
! if transient:
!     storer = TransientStorer()
! else:
!     dir = java.io.File(args[0])
!     storer = DirStorer(dir)
! 
! #    if java.io.File(dir, "cache").exists():
! #        cacheStorer = DirStorer(java.io.File(dir, "cache"))
! #        if cacheStorer.getProperty("simplemediaserver.poolname") != \
! #           Mediaserver.CACHE_POOL_NAME:
! #            print "cache/ directory doesn't have correct pool name"
! #            print ""
! #            sys.exit(1)
! 
! if not cacheStorer:
!     cacheStorer = TransientStorer()
!     cacheStorer.setProperty("simplemediaserver.poolname",
! #                            Mediaserver.CACHE_POOL_NAME)
! # ??? Not in CVS
!                             "cache")
! 
! pool = SimpleMediaserver(storer)
! cachePool = SimpleMediaserver(cacheStorer)
! mediaserver = MultiplexingMediaserver(pool, [], [cachePool]);
! filers = MediaserverFiler.Group(
!     SliceVersion.EMPTY_VERSION, mediaserver,
!     YAMLVersionFormat(mediaserver, enfMaker));
! 
! if spaceType == None or spaceType == "ModularSpace":
!     enfAligner = gzz.fuzzy.enfiladealigner.JythonEnfiladeAligner()
!     cellTexter = SimpleVStreamTexter(spanMaker, enfMaker, enfAligner)
!     dimManager = SimpleDim.SimpleDimManager()
!     version = filers.getFiler("gzz_fallback_slice").load()
!     space = ModularSpace(version, cellTexter, cellManager, dimManager,
!             identityManager, slicer, obsTrigger)
!     dimensions = [
!     Fallback.FallbackDim(s, space.getDim(id)) for (s, id)
!         in  (("d.1", Ids.d_1), ("d.2", Ids.d_2),
!              ("d.3", Ids.d_3))]
! else:
!     assert 1==0, "Invalid spacetype "+spacetype;
! 
! dims = {}
! for d in dimensions:
!     dims[d.name] = d.d
! home = space.getHomeCell()
! d1,d2,d3 = [d.d for d in dimensions]
! 
! def dumpVersion(file):
!     sli = space.getSlicer()
!     try:
!         from java.io import File, FileOutputStream
!         YAMLVersionFormat(pool, enfMaker).writeVersion(
!             FileOutputStream(File(file)),
!             sli.export(sli.getSlice0()))
!     except TypeError, t:
!         print t
! 
! 
! graphicsAPI = GraphicsAPI.getInstance()
! 
! # For OpenGL, VobVanishingClient and windows have to be created
! # in the updatemanager thread.
! class Starter(Runnable):
!     def run(self):
!       # if System.getProperty("gzzclient") == "gl":
!       #   import gzz.gfx.gl.debugswitches
!       #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
!       views = [VobVanishingClient(), RowColView(0), RowColView(1)]
!       Fallback(space.getHomeCell(), dimensions, views, filers)
!       AbstractUpdateManager.chg()
! 
! if System.getProperty("gzzclient") == "gl":
!     graphicsAPI.startUpdateManager(Starter())
! else:
!     graphicsAPI.startUpdateManager(None)
!     Starter().run()
  
  
  
--- 6,171 ----
  from gzz.gfx.gl import GZZGL
  import re
  
+ from java.lang import Runnable
+ from java.util import HashSet, HashMap
+ import java.io.File
+ 
+ 
+ 
  # Read arguments before importing stuff, since
  # we have to call setProperty *BEFORE* that in order
  # to choose the right GraphicsAPI.instance
  
  
! class Gzz(Runnable):
  
+     def run(self):
+         # if System.getProperty("gzzclient") == "gl":
+         #   import gzz.gfx.gl.debugswitches
+         #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
+         views = [VobVanishingClient(), RowColView(0), RowColView(1)]
+         Fallback(space.getHomeCell(), dimensions, views, filers)
+         AbstractUpdateManager.chg()
  
  
  
  
  
+ if __name__ == '__main__':
+     # everything below will move to class GZZ...
+     opts, args = getopt.getopt(sys.argv[1:], "Ct"+gzz.util.dbg.short, 
+         ["--commander"]+gzz.util.dbg.long)
+ 
+     transient = 0
+ 
+ 
+     for o,a in opts:
+         if o in ("-C", "--commander"):
+             from gzz.control import commander
+             commander.AwtCommander(globals())
+         if o in gzz.util.dbg.all:
+             gzz.util.dbg.option(o,a)
+         if o in ("-t", "--transient"):
+             transient = 1
+ 
+ 
+ 
+     sys.path.insert(0, ".")
+ 
+     from gzz import *
+     from gzz.impl import *
+     from gzz.media import *
+     from gzz.media.impl import *
+     from gzz.mediaserver import *
+     from gzz.mediaserver.storage import *
+     from gzz.slices import *
+     from gzz.slices import SliceVersion
+     from gzz.slices.YAMLVersionFormatter import YAMLVersionFormat
+     from gzz.diff import *
+     from gzz.client import *
+     from gzz.control import *
+     from gzz.view import *
+     from gzz.zzutil import Ids
  
  
  
  
  
!     if (not transient) and (not args):
!         print ""
!         print "Please give at least one directory to read data from"
!         print "or specify the -t or --transient option."
!         sys.exit(1)
! 
!     spanType = System.getProperty("gzz.spanType")
!     spaceType = System.getProperty("gzz.spaceType")
! 
!     # it's important to put all these in the global scope:
!     # that way we can access them all from the console!
! 
!     obsTrigger = SimpleObsTrigger();
!     cellManager = PlainCellManager()
!     identityManager = DummyIdentityManager()
!     slicer = SingleSlicer("gzz_fallback_slice")
! 
!     if spanType == None or spanType == "scroll":
!         spanMaker = ScrollSpanMaker();
!     elif spanType == "transient":
!         spanMaker = FakeSpanMaker()
!     else:
!         assert 1==0, "Invalid spanType "+spanType;
! 
!     enfMaker = Enfilade1DImpl.Enfilade1DImplMaker()
! 
!     cacheStorer = None
!     if transient:
!         storer = TransientStorer()
!     else:
!         dir = java.io.File(args[0])
!         storer = DirStorer(dir)
! 
!     #    if java.io.File(dir, "cache").exists():
!     #        cacheStorer = DirStorer(java.io.File(dir, "cache"))
!     #        if cacheStorer.getProperty("simplemediaserver.poolname") != \
!     #           Mediaserver.CACHE_POOL_NAME:
!     #            print "cache/ directory doesn't have correct pool name"
!     #            print ""
!     #            sys.exit(1)
! 
!     if not cacheStorer:
!         cacheStorer = TransientStorer()
!         cacheStorer.setProperty("simplemediaserver.poolname",
!     #                            Mediaserver.CACHE_POOL_NAME)
!     # ??? Not in CVS
!                                 "cache")
! 
!     pool = SimpleMediaserver(storer)
!     cachePool = SimpleMediaserver(cacheStorer)
!     mediaserver = MultiplexingMediaserver(pool, [], [cachePool]);
!     filers = MediaserverFiler.Group(
!         SliceVersion.EMPTY_VERSION, mediaserver,
!         YAMLVersionFormat(mediaserver, enfMaker));
! 
!     if spaceType == None or spaceType == "ModularSpace":
!         enfAligner = gzz.fuzzy.enfiladealigner.JythonEnfiladeAligner()
!         cellTexter = SimpleVStreamTexter(spanMaker, enfMaker, enfAligner)
!         dimManager = SimpleDim.SimpleDimManager()
!         version = filers.getFiler("gzz_fallback_slice").load()
!         space = ModularSpace(version, cellTexter, cellManager, dimManager,
!                 identityManager, slicer, obsTrigger)
!         dimensions = [
!         Fallback.FallbackDim(s, space.getDim(id)) for (s, id)
!             in  (("d.1", Ids.d_1), ("d.2", Ids.d_2),
!                  ("d.3", Ids.d_3))]
!     else:
!         assert 1==0, "Invalid spacetype "+spacetype;
! 
!     dims = {}
!     for d in dimensions:
!         dims[d.name] = d.d
!     home = space.getHomeCell()
!     d1,d2,d3 = [d.d for d in dimensions]
! 
!     def dumpVersion(file):
!         sli = space.getSlicer()
!         try:
!             from java.io import File, FileOutputStream
!             YAMLVersionFormat(pool, enfMaker).writeVersion(
!                 FileOutputStream(File(file)),
!                 sli.export(sli.getSlice0()))
!         except TypeError, t:
!             print t
! 
! 
!     graphicsAPI = GraphicsAPI.getInstance()
! 
! 
!     # this stays outside the class, however
!     if System.getProperty("gzzclient") == "gl":
!         graphicsAPI.startUpdateManager(Gzz())
!     else:
!         graphicsAPI.startUpdateManager(None)
!         Gzz().run()