Changeset 1082

Timestamp:

10/31/08 08:56:20 (2 months ago)

Author:

bhimebau

Message:

interconnection between visualizer and the control panel still needed

Files:

• analog/pyeac/branches/pyeac_pygame/controlpanel.py (modified) (4 diffs)
• analog/pyeac/branches/pyeac_pygame/main.py (modified) (3 diffs)
• analog/pyeac/branches/pyeac_pygame/visualizer.py (modified) (1 diff)

analog/pyeac/branches/pyeac_pygame/controlpanel.py

@@ -11 +11 @@
-from pgu import gui
-
-screen = pygame.display.set_mode((1024,600),SWSURFACE)
-form = gui.Form()
-
-
-class CellControl(gui.Table):
-    def __init__(self,**params):
@@ -21 +17 @@
-       
-        self.tr()
--
+,
-        self.td(gui.Radio(g,value='V'))
-        self.td(gui.Radio(g,value='I'))
@@ -28 +24 @@
-        self.tr()
-        self.td(gui.Label("",color=fg),align=0,width=50)
--
+,
-        self.td(e)
-        
--
+,
-        self.td(e)
-        
@@ -38 +34 @@
-        gui.Table.__init__(self,**params)
-        self.tr()
-_
-_
-_
-_
-_
+,
+,
+,
+,
+,
-
-        self.tr()
-_
-_
-_
-_
-_
+,
+,
+,
+,
+,
-
-        self.tr()
-_
-_
-_
-_
-_
+,
+,
+,
+,
+,
-
-        self.tr()
-_
-_
-_
-_
-_
+,
+,
+,
+,
+,
-
-        self.tr()
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-_form = form.results()
-_quit = 0
-while not _quit:
-    _form = form.results()
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+

analog/pyeac/branches/pyeac_pygame/main.py

@@ -8 +8 @@
-__license__ = "GPL v3"
-
+
+def diff_dict(before,after):
+    changed = 0
+    diff_dict = {}
+    bkeys = before.keys()
+    for key in bkeys:
+        if before[key] != after[key]:
+            diff_dict[key] = after[key]
+            changed = 1
+    if changed:
+        return(diff_dict)
+    else:
+        return(None)
+
-if __name__ == '__main__':
-    from visualizer import Visualizer
@@ -15 +29 @@
-    import random
-    from pygame.locals import *    
+    from pgu import gui
+    from controlpanel import EacPanel, TableBorder
+
-
-    phyeac = ueac(ueac_device='/dev/ttyUSB0')  # Connect to the uEAC device
@@ -30 +47 @@
-        
-    pygame.init()
-window_size = (1024,600
- = pygame.display.set_mode(window_size,RESIZABLE,32
+screen = pygame.display.set_mode((1000,550)
+.set_colorkey((0,0,0)
-    pygame.display.set_caption("EAC Framework")
-    pygame.display.set_icon(pygame.image.load('uEAC_icon.png'))
-
+
-    phyeac_vis = Visualizer((0,0,100))
+    phyeac_vis.update(phyeac.voltage_values)
+
-    simeac_vis = Visualizer()
+    simeac_vis.update(simeac.evaluate())
-
+    form = gui.Form()
+    app = gui.App()
+    ecc = EacPanel()
+    c = gui.Container(align=-1,valign=-1)
+    c.add(ecc,0,325)
+    app.init(c)
+
+    _form = form.results()
+    _quit = 0
+    
+    tb = TableBorder()
+
+    clock = pygame.time.Clock()
-    while True:
+        _form_last = _form
+        _form = form.results()
+        changes = diff_dict(_form_last,_form)
+        if changes != None:
+            print changes
+            simeac_vis.update(simeac.evaluate())
+
-        for event in pygame.event.get():
-            if event.type == QUIT:
-                exit()
-
-
-
+
-
-        screen.blit(phyeac_vis.surface,(0,0))
-        screen.blit(simeac_vis.surface,(524,0))
-        
-        simeac_vis.update(simeac.evaluate())
-        phyeac.read_v()
-        phyeac_vis.update(phyeac.voltage_values)
-
-
+
+
+
+
-
-
+
+
-
-

analog/pyeac/branches/pyeac_pygame/visualizer.py

@@ -11 +11 @@
-    def __init__(self, fill_color=(100,0,0)):
-        self.fill_color = fill_color
-500,5
-100,10
+300,3
+60,6
-        for y in range(5):
-            for x in range(5):
-                self.surface.fill(fill_color,fill_window)
-10
-500,10
+6
+300,6
-    
-    def set_block(self, pos, color):
-100,pos[1]*100),(100,10
+60,pos[1]*60),(60,6
-        self.surface.fill(color,fill_window)
-                
-    def set_all(self,color):
-500,5
+300,3
-        self.surface.fill(color,fill_window)
-