[pypy-svn] r7426 - pypy/trunk/src/pypy/translator/tool/pygame

[bob at codespeak.net]

Author: bob
Date: Fri Nov 19 12:18:53 2004
New Revision: 7426

Modified:
   pypy/trunk/src/pypy/translator/tool/pygame/drawgraph.py
   pypy/trunk/src/pypy/translator/tool/pygame/flowviewer.py
   pypy/trunk/src/pypy/translator/tool/pygame/graphdisplay.py
Log:
clean up the key bindings slightly
use absolute imports so it works with autopath if you run one as __main__



Modified: pypy/trunk/src/pypy/translator/tool/pygame/drawgraph.py
==============================================================================
--- pypy/trunk/src/pypy/translator/tool/pygame/drawgraph.py	(original)
+++ pypy/trunk/src/pypy/translator/tool/pygame/drawgraph.py	Fri Nov 19 12:18:53 2004
@@ -65,7 +65,7 @@
         self.links = {}
 
     def display(self):
-        from graphdisplay import GraphDisplay
+        from pypy.tool.translator.pygame.graphdisplay import GraphDisplay
         GraphDisplay(self).run()
 
 class Node:

Modified: pypy/trunk/src/pypy/translator/tool/pygame/flowviewer.py
==============================================================================
--- pypy/trunk/src/pypy/translator/tool/pygame/flowviewer.py	(original)
+++ pypy/trunk/src/pypy/translator/tool/pygame/flowviewer.py	Fri Nov 19 12:18:53 2004
@@ -1,6 +1,6 @@
 import autopath
 import inspect
-from drawgraph import GraphLayout
+from pypy.translator.tool.pygame.drawgraph import GraphLayout
 from pypy.translator.tool.make_dot import DotGen
 from pypy.interpreter.pycode import CO_VARARGS, CO_VARKEYWORDS
 from pypy.annotation import model, factory
@@ -234,7 +234,7 @@
 if __name__ == '__main__':
     from pypy.translator.translator import Translator
     from pypy.translator.test import snippet
-    from graphdisplay import GraphDisplay
+    from pypy.translator.tool.pygame.graphdisplay import GraphDisplay
     
     t = Translator(snippet.powerset)
     #t.simplify()

Modified: pypy/trunk/src/pypy/translator/tool/pygame/graphdisplay.py
==============================================================================
--- pypy/trunk/src/pypy/translator/tool/pygame/graphdisplay.py	(original)
+++ pypy/trunk/src/pypy/translator/tool/pygame/graphdisplay.py	Fri Nov 19 12:18:53 2004
@@ -3,7 +3,7 @@
 import os, time, sys
 import pygame
 from pygame.locals import *
-from drawgraph import GraphRenderer
+from pypy.translator.tool.pygame.drawgraph import GraphRenderer
 
 
 METAKEYS = dict([
@@ -24,8 +24,8 @@
     for ident in dir(pygame.locals) if ident.startswith('K_')
 ])
 
-KEYS['plus'] = ('=', '+')
-KEYS['quit'] = ('q', 'f4')
+KEYS['plus'] = ('=', '+', '.')
+KEYS['quit'] = ('q', 'f4', 'escape')
 
 def GET_KEY(key):
     k = KEYS.get(key)
@@ -75,15 +75,12 @@
              '-' : ('zoom', 0.5),
         'meta plus' : ('zoom', 2.0),
              'plus' : ('zoom', 2.0),
-        'meta .' : ('zoom', 2.0),    # '+' is shift-1 on my keyboard
-             '.' : ('zoom', 2.0),
         'meta 0' : 'zoom_actual_size',
              '0' : 'zoom_actual_size',
         'meta 1' : 'zoom_to_fit',
              '1' : 'zoom_to_fit',
         'meta quit' : 'quit',
              'quit' : 'quit',
-        'escape' : 'quit',
         'meta right' : 'layout_forward',
         'meta left': 'layout_back',
         'p' : 'layout_back',