[Gzz-commits] gzz Gzz.py

[Vesa Kaihlavirta]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Vesa Kaihlavirta <address@hidden>       02/09/23 11:10:12

Modified files:
        .              : Gzz.py 

Log message:
        Moving, reorganizing, preparing for a complete 'classification'.

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

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.29 gzz/Gzz.py:1.30
*** gzz/Gzz.py:1.29     Fri Sep 20 11:00:10 2002
--- gzz/Gzz.py  Mon Sep 23 11:10:12 2002
***************
*** 1,33 ****
  # Running gzz
  import sys
  import getopt
- import gzz.util
- from java.lang import System
- from gzz.gfx.gl import GZZGL
  import re
  
! from java.lang import Runnable
! from java.util import HashSet, HashMap
! import java.io.File
  
  
  
! 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)
  
--- 1,46 ----
  # Running gzz
+ 
+ # python imports
  import sys
  import getopt
  import re
  
! # java imports
! import java.lang
  
+ # Gzz imports
+ import gzz
+ import gzz.util
+ import gzz.gfx.gl
+ import gzz.control
+ import gzz.impl
+ import gzz.media
+ import gzz.media.impl
+ import gzz.mediaserver
+ import gzz.mediaserver.storage
+ import gzz.slices
+ import gzz.diff
+ import gzz.client
+ import gzz.view
+ import gzz.zzutil
  
  
! 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)
  
***************
*** 36,43 ****
  
      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"):
--- 49,55 ----
  
      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"):
***************
*** 45,70 ****
  
  
  
      # 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
  
  
  
--- 57,86 ----
  
  
  
+     # {(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
  
  
  
***************
*** 76,107 ****
          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"))
--- 92,123 ----
          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"))
***************
*** 112,141 ****
      #            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;
  
--- 128,157 ----
      #            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;
  
***************
*** 156,170 ****
              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()
- 
- 
- 
--- 172,185 ----
              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()