[Gzz-commits] gzz Gzz.py

[Vesa Kaihlavirta]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Vesa Kaihlavirta <address@hidden>       02/09/25 05:14:52

Modified files:
        .              : Gzz.py 

Log message:
        Everything's in the class Gzz now. Again, nothing apparently broke, but
        a lot of things moved; be wary.

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

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.30 gzz/Gzz.py:1.31
*** gzz/Gzz.py:1.30     Mon Sep 23 11:10:12 2002
--- gzz/Gzz.py  Wed Sep 25 05:14:52 2002
***************
*** 7,15 ****
--- 7,17 ----
  
  # java imports
  import java.lang
+ import java.io
  
  # Gzz imports
  import gzz
+ import gzz.util.dbg
  import gzz.util
  import gzz.gfx.gl
  import gzz.control
***************
*** 28,185 ****
  class Gzz(java.lang.Runnable):
      """The main Gzz client class."""
  
      def run(self):
          # if System.getProperty("gzzclient") == "gl":
          #   import gzz.gfx.gl.debugswitches
          #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
!         views = [gzz.view.VobVanishingClient(), gzz.view.RowColView(0), 
gzz.view.RowColView(1)]
!         gzz.client.Fallback(space.getHomeCell(), dimensions, views, filers)
          gzz.client.AbstractUpdateManager.chg()
  
  
  
! 
! if __name__ == '__main__':
!     # everything (if sensible) 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"):
!             gzz.control.commander.AwtCommander(globals())
!         if o in gzz.util.dbg.all:
!             gzz.util.dbg.option(o,a)
!         if o in ("-t", "--transient"):
!             transient = 1
! 
! 
! 
!     # {(Vegai) This moved to the top.
!     # Nothing apparently broke (even the GraphicsAPI dispatch
!     # was unharmed), but if your mileage varies,
!     # I left the code in comments for easier reverting.}
!     #
!     # Read arguments before importing stuff, since
!     # we have to call setProperty *BEFORE* that in order
!     # to choose the right GraphicsAPI.instance
! 
!     # 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 = java.lang.System.getProperty("gzz.spanType")
!     spaceType = java.lang.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 = gzz.impl.SimpleObsTrigger();
!     cellManager = gzz.impl.PlainCellManager()
!     identityManager = gzz.impl.DummyIdentityManager()
!     slicer = gzz.impl.SingleSlicer("gzz_fallback_slice")
! 
!     if spanType == None or spanType == "scroll":
!         spanMaker = gzz.media.impl.ScrollSpanMaker();
!     elif spanType == "transient":
!         spanMaker = gzz.media.impl.FakeSpanMaker()
!     else:
!         assert 1==0, "Invalid spanType "+spanType;
! 
!     enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
! 
!     cacheStorer = None
!     if transient:
!         storer = gzz.mediaserver.storage.TransientStorer()
!     else:
!         dir = java.io.File(args[0])
!         storer = gzz.mediaserver.storage.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 = gzz.mediaserver.storage.TransientStorer()
!         cacheStorer.setProperty("simplemediaserver.poolname",
!     #                            Mediaserver.CACHE_POOL_NAME)
!     # ??? Not in CVS
!                                 "cache")
! 
!     pool = gzz.mediaserver.SimpleMediaserver(storer)
!     cachePool = gzz.mediaserver.SimpleMediaserver(cacheStorer)
!     mediaserver = gzz.mediaserver.MultiplexingMediaserver(pool, [], 
[cachePool]);
!     filers = gzz.mediaserver.MediaserverFiler.Group(
!         gzz.slices.SliceVersion.EMPTY_VERSION, mediaserver,
!         gzz.slices.YAMLVersionFormatter.YAMLVersionFormat(mediaserver, 
enfMaker));
! 
!     if spaceType == None or spaceType == "ModularSpace":
!         enfAligner = gzz.fuzzy.enfiladealigner.JythonEnfiladeAligner()
!         cellTexter = gzz.impl.SimpleVStreamTexter(spanMaker, enfMaker, 
enfAligner)
!         dimManager = gzz.impl.SimpleDim.SimpleDimManager()
!         version = filers.getFiler("gzz_fallback_slice").load()
!         space = gzz.impl.ModularSpace(version, cellTexter, cellManager, 
dimManager,
!                 identityManager, slicer, obsTrigger)
!         dimensions = [
!         gzz.client.Fallback.FallbackDim(s, space.getDim(id)) for (s, id)
!             in  (("d.1", gzz.zzutil.Ids.d_1), ("d.2", gzz.zzutil.Ids.d_2),
!                  ("d.3", gzz.zzutil.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 = gzz.client.GraphicsAPI.getInstance()
! 
! 
!     # this stays outside the class, however
      if java.lang.System.getProperty("gzzclient") == "gl":
          print "Running GL..."
!         graphicsAPI.startUpdateManager(Gzz())
      else:
          print "Running AWT..."
!         graphicsAPI.startUpdateManager(None)
!         Gzz().run()
--- 30,140 ----
  class Gzz(java.lang.Runnable):
      """The main Gzz client class."""
  
+     transient = 0
+ 
      def run(self):
          # if System.getProperty("gzzclient") == "gl":
          #   import gzz.gfx.gl.debugswitches
          #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
!         self.views = [gzz.view.VobVanishingClient(), gzz.view.RowColView(0), 
gzz.view.RowColView(1)]
!         gzz.client.Fallback(self.space.getHomeCell(), self.dimensions, 
self.views, self.filers)
          gzz.client.AbstractUpdateManager.chg()
  
  
+     def parse_params(self):
+         for o,a in self.opts:
+             if o in ("-C", "--commander"):
+                 gzz.control.commander.AwtCommander(globals())
+             if o in gzz.util.dbg.all:
+                 gzz.util.dbg.option(o,a)
+             if o in ("-t", "--transient"):
+                 self.transient = 1
+ 
+         if (not self.transient) and (not self.args):
+             print ""
+             print "Please give at least one directory to read data from"
+             print "or specify the -t or --transient option."
+             sys.exit(1)
+ 
+ 
+     def set_defaults(self):
+         self.spanType = java.lang.System.getProperty("gzz.spanType")
+         self.spaceType = java.lang.System.getProperty("gzz.spaceType")
+         self.obsTrigger = gzz.impl.SimpleObsTrigger();
+         self.cellManager = gzz.impl.PlainCellManager()
+         self.identityManager = gzz.impl.DummyIdentityManager()
+         self.slicer = gzz.impl.SingleSlicer("gzz_fallback_slice")
+         self.enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
+         self.cacheStorer = None
+ 
+         if self.spanType == None or self.spanType == "scroll":
+             self.spanMaker = gzz.media.impl.ScrollSpanMaker();
+         elif self.spanType == "transient":
+             self.spanMaker = gzz.media.impl.FakeSpanMaker()
+         else:
+             assert 1==0, "Invalid spanType "+self.spanType;
+         if self.transient:
+             self.storer = gzz.mediaserver.storage.TransientStorer()
+         else:
+             self.dir = java.io.File(args[0])
+             self.storer = gzz.mediaserver.storage.DirStorer(dir)
+ 
+         if not self.cacheStorer:
+             self.cacheStorer = gzz.mediaserver.storage.TransientStorer()
+             self.cacheStorer.setProperty("simplemediaserver.poolname",
+         #                            Mediaserver.CACHE_POOL_NAME)
+         # ??? Not in CVS
+                                     "cache")
+ 
+         self.pool = gzz.mediaserver.SimpleMediaserver(self.storer)
+         self.cachePool = gzz.mediaserver.SimpleMediaserver(self.cacheStorer)
+         self.mediaserver = gzz.mediaserver.MultiplexingMediaserver(self.pool, 
[], [self.cachePool])
+         self.filers = gzz.mediaserver.MediaserverFiler.Group(
+             gzz.slices.SliceVersion.EMPTY_VERSION, self.mediaserver,
+             
gzz.slices.YAMLVersionFormatter.YAMLVersionFormat(self.mediaserver, 
self.enfMaker))
+ 
+         if self.spaceType == None or self.spaceType == "ModularSpace":
+             self.enfAligner = 
gzz.fuzzy.enfiladealigner.JythonEnfiladeAligner()
+             self.cellTexter = gzz.impl.SimpleVStreamTexter(self.spanMaker, 
self.enfMaker, self.enfAligner)
+             self.dimManager = gzz.impl.SimpleDim.SimpleDimManager()
+             self.version = self.filers.getFiler("gzz_fallback_slice").load()
+             self.space = gzz.impl.ModularSpace(self.version, self.cellTexter, 
self.cellManager, 
+                     self.dimManager, self.identityManager, self.slicer, 
self.obsTrigger)
+             self.dimensions = [
+             gzz.client.Fallback.FallbackDim(s, self.space.getDim(id)) for (s, 
id)
+                 in  (("d.1", gzz.zzutil.Ids.d_1), ("d.2", gzz.zzutil.Ids.d_2),
+                      ("d.3", gzz.zzutil.Ids.d_3))]
+         else:
+             assert 1==0, "Invalid spacetype "+self.spacetype;
+ 
+         self.dims = {}
+         for d in self.dimensions:
+             self.dims[d.name] = d.d
+         self.home = self.space.getHomeCell()
+         self.d1, self.d2, self.d3 = [d.d for d in self.dimensions]
+         self.graphicsAPI = gzz.client.GraphicsAPI.getInstance()
  
!     def dumpVersion(self, file):
          sli = space.getSlicer()
          try:
              YAMLVersionFormat(pool, enfMaker).writeVersion(
                  FileOutputStream(File(file)),
                  sli.export(sli.getSlice0()))
          except TypeError, t:
              print t
  
+     def __init__(self):
+         self.opts, self.args = getopt.getopt(sys.argv[1:], 
"Ct"+gzz.util.dbg.short,
+             ["--commander"]+gzz.util.dbg.long)
+         self.parse_params()
+         self.set_defaults()
  
! if __name__ == '__main__':
!     g = Gzz()
      if java.lang.System.getProperty("gzzclient") == "gl":
          print "Running GL..."
!         g.graphicsAPI.startUpdateManager(g)
      else:
          print "Running AWT..."
!         g.graphicsAPI.startUpdateManager(None)
!         g.run()