Changeset 1106

Timestamp:

11/10/08 14:57:18 (2 months ago)

Author:

bhimebau

Message:

context sensitive selection working

Files:

• analog/pyeac/trunk/eeepc/controlpanel.py (modified) (2 diffs)
• analog/pyeac/trunk/eeepc/controlpanel.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/eac_physical.py (modified) (1 diff)
• analog/pyeac/trunk/eeepc/eac_physical.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/__init__.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/__init__.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/app.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/area.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/basic.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/button.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/const.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/container.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/deprecated.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/dialog.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/document.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/form.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/group.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/input.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/keysym.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/layout.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/menus.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/misc.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/select.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/slider.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/style.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/surface.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/table.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/theme.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pgu/gui/widget.pyc (modified) (previous)
• analog/pyeac/trunk/eeepc/pyeac.py (modified) (5 diffs)
• analog/pyeac/trunk/eeepc/visualizer.pyc (modified) (previous)

analog/pyeac/trunk/eeepc/controlpanel.py

@@ -19 +19 @@
-       
-        self.tr()
-g
-g
-g
-g
+self.type_selector
+self.type_selector
+self.type_selector
+self.type_selector
-
-        self.tr()
-        self.td(gui.Label("",color=fg),align=0,width=50)
-e
-e
-
-e
-e
+self.current_slider
+self.current_slider
+
+self.lla_function_input
+self.lla_function_input
-        
-class EacPanel(gui.Table):
@@ -96 +96 @@
-            self.ledofff()
-            
+class Context_Sensitive_Panel(gui.Table):
+    
+    def __init__(self, pin_grid, active_cell, **params):
+        gui.Table.__init__(self,**params)
+
+#         self.cc = CellControl(pin="1,1")
+        fg = (255,255,255)
+        self.id_label = gui.Label("%d,%d"%(active_cell),color=fg)
+        self.voltage_label = gui.Label("%4.3f"%(0.000),color=fg)
+        self.input_current_label = gui.Label("%4.3f" % (0.0),color=fg)
+        self.output_current_label = gui.Label("%4.3f" % (0.0),color=fg)
+        self.cell_type = gui.Select(value="voltage",name="cell_type")
+        self.cell_type.add("Voltage","voltage")
+        self.cell_type.add("Current","current")
+        self.cell_type.add("LLA","lla")
+        self.current_slider = gui.HSlider(0,-200,200,size=8,width=150,height=20,name="cslider")
+        self.current_input = gui.Input(value="0",name="ctext_box",size=10)
+        self.lla_function_input = gui.Input(value="1",name="lla_f_select",size=10,align=0)
+    
+        if active_cell != (0,0):
+            gui.Table.__init__(self,**params)
+            self.tr()
+            self.td(gui.Label("Edit Cell = ",color=fg),align=-1)
+            self.td(self.id_label,align=-1)
+            self.tr()
+            self.td(gui.Label("Voltage = ",color=fg),align=-1)
+            self.td(self.voltage_label,align=-1)
+            self.tr()
+            self.td(gui.Label("Mode = ",color=fg),align=-1)
+            self.td(self.cell_type,align=-1)
+            self.tr()
+            self.td(gui.Label("Input Current = ",color=fg),align=-1)
+            self.td(self.input_current_label,align=-1)
+            self.tr()
+            self.td(gui.Label("Output Current = ",color=fg),align=-1)
+            self.td(self.output_current_label,align=-1)
+            self.tr()
+            self.td(gui.Label("Current Source/Sink = ",color=fg),align=-1)
+            self.td(self.current_slider,align=-1)
+            self.td(self.current_input,align=0)
+            self.tr()
+            self.td(gui.Label("LLA Function = ",color=fg),align=-1)
+            self.td(self.lla_function_input,align=-1)
+
+    def set_controls (self, pg, active_cell):
+        self.id_label.value = "%d,%d"%(active_cell)
+        (ax,ay) = active_cell
+
+        self.voltage_label.value = "%4.3f"%(float(pg.grid[ay-1][ax-1].voltage))
+
+        if pg.grid[ay-1][ax-1].mode == "V":
+            self.input_current_label.value = "%d"%(0)
+            self.output_current_label.value = "%d"%(0)
+        
+        elif pg.grid[ay-1][ax-1].mode == "S":
+            self.input_current_label.value = "%d"%(0)
+            if pg.grid[ay-1][ax-1].current_output != None:
+                self.output_current_label.value = "%d"%(int(pg.grid[ay-1][ax-1].current_output))
+            else:
+                self.output_current_label.value = "%d"%(0)
+
+        elif pg.grid[ay-1][ax-1].mode == "L":
+            value = pg.lla_dict[pg.grid[ay-1][ax-1].lla_tag].input_current                        
+            if value != None:
+                self.input_current_label.value = "%d"%(int(value))            
+            value = pg.lla_dict[pg.grid[ay-1][ax-1].lla_tag].output_current            
+
+            if value != None:
+                self.output_current_label.value = "%d"%(int(value))            
+
+#         if pg.grid[ay-1][ax-1].current_input != None:
+#             self.input_current_label.value = "%d"%(int(pg.grid[ay-1][ax-1].current_input))
+#         else:
+#             self.input_current_label.value = "%d"%(0)
+# 
+#         if pg.grid[ay-1][ax-1].current_output != None:
+#             self.output_current_label.value = "%d"%(int(pg.grid[ay-1][ax-1].current_output))
+#         else:
+#             self.output_current_label.value = "%d"%(0)
+
+     
+    def update_selector_text(self, pg, active_cell):
+        (ax,ay) = active_cell
+        if pg.grid[ay-1][ax-1].mode == "V":
+            self.cell_type.value = "voltage"
+            self.current_slider.value = "0"
+            self.lla_function_input.value = "1"
+        elif pg.grid[ay-1][ax-1].mode == "S":
+            self.cell_type.value = "current"
+            self.current_slider.value = int(pg.grid[ay-1][ax-1].current_output)
+            self.lla_function_input.value = "1"
+        elif pg.grid[ay-1][ax-1].mode == "L":
+            self.cell_type.value = "lla"
+            self.current_slider.value = "0"
+            value = pg.lla_dict[pg.grid[ay-1][ax-1].lla_tag].function
+            self.lla_function_input.value = value
+
-if __name__ == '__main__':
-    screen = pygame.display.set_mode((1024,600))

analog/pyeac/trunk/eeepc/eac_physical.py

@@ -193 +193 @@
-        self.ueac.lon()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-       
-

analog/pyeac/trunk/eeepc/pyeac.py

@@ -22 +22 @@
-        return(None)
-
+def get_grid_square(pos):
+    (gbx,gby) = (315,0)
+    (gsx,gsy) = (60,60)
+    (posx,posy) = pos
+
+    posnx = posx - gbx
+    posny = posy - gby
+    
+    if posnx < 0 or posny < 0:
+        sq = (0,0)
+    elif posnx >= 300 or posny >= 300:
+        sq = (0,0)
+    else:
+        sq = (int(posnx/gsx) + 1, int(posny/gsy) + 1)
+    return sq
+    
+def get_highlighted_square(grid_sq, color):
+    (gx,gy) = grid_sq
+    rx = (gx-1) * 60
+    ry = (gy-1) * 60
+    hlsurf = pygame.Surface((300,300))
+    hlsurf.set_colorkey((0,0,0))
+    hlsurf.fill((0,0,0))
+    pygame.draw.rect(hlsurf, color, Rect(rx,ry,60,60), 3)
+    return hlsurf
+
-if __name__ == '__main__':
-    from visualizer import Visualizer
@@ -31 +57 @@
-    import sys; sys.path.insert(0, ".") 
-    from pgu import gui
-
+, Context_Sensitive_Panel
-    from raw_display import RawDisplay
-
@@ -49 +75 @@
-    form = gui.Form()
-    app = gui.App()
-
+#
-    bcc = ButtonPanel(pg.reset, pg.lon, pg.lof)
-
-    c = gui.Container(align=-1,valign=-1)
-
+
+
+
+
+
+
-    c.add(bcc,650,100)
-
@@ -62 +93 @@
-    
-    clock = pygame.time.Clock()
+    mousepos = (315,0)
+    mouseb1pressed = False
+
+    chl_grid = (3,3)
+    operating_grid = (3,3)
+    highlighted_surface = get_highlighted_square((3,3), (255,255,255))
+    selected_square_surface = get_highlighted_square((3,3), (255,0,0))
+    active_cell = (3,3)
+    loop_counter = 0
+
-    while True:
-        _form_last = _form
-        _form = form.results()
-        changes = diff_dict(_form_last,_form)
+
-        if changes != None:
-changes,_form
+_form,active_cell
-
-        for event in pygame.event.get():
-            if event.type == QUIT:
-                exit()
+            if event.type == MOUSEMOTION:
+                active_grid = get_grid_square(event.pos)
+                if active_grid != (0,0) and active_grid != chl_grid:
+                    chl_grid = active_grid
+                    highlighted_surface = get_highlighted_square(active_grid, (255,255,255))
+               
+            if event.type == MOUSEBUTTONDOWN:
+                if event.button == 1:
+                    selected_grid = get_grid_square(event.pos)
+                    if selected_grid != (0,0):
+                        selected_square_surface = get_highlighted_square(selected_grid, (255,0,0))
+                        active_cell = selected_grid
+                        csp.update_selector_text(pg, active_cell)
-            app.event(event)
-
@@ -77 +132 @@
-        phyeac_vis.update(pg)
-        phyeac_raw.update(pg)
+        csp.set_controls(pg, active_cell)
-
-        screen.fill((0,0,0))
-        screen.blit(phyeac_vis.surface,(0,0))
-        screen.blit(phyeac_raw.master_surface,(315,0))
+        screen.blit(highlighted_surface,(315,0))
+        if selected_square_surface != None:
+            screen.blit(selected_square_surface,(315,0))
+            
-
-        app.paint(screen)