refactoring: gui

_LibreLightDesk.py

@@ -1466,9 +1466,9 @@ class Xevent():
                 #    gui_fix.draw()
                 self.elem["text"] = "PATCH..."
                 window_manager.top("PATCH")
-                gui_patch.draw()
+                gui_patch.draw(FIXTURES)
                 self.elem["text"] = "FIX..."
-                gui_fix.draw()
+                gui_fix.draw(FIXTURES)
                 window_manager.top("FIXTURES")
                 master._refresh_exec()
                 self.elem["text"] = old_text  
@@ -3744,6 +3744,7 @@ class Refresher():
                 #self.time = time.time()+1
                 self._refresh()
     def _refresh(self):
+        print(self,"refresh()")
         master._refresh_fix()
         master._refresh_exec()
     def loop(self,args={}):
@@ -3918,7 +3919,7 @@ if __run_main:
     #LibreLightDesk
     name="COLORPICKER"
     w = Window(name,master=0,width=600,height=113,left=L1+5,top=TOP+5+HTB*2+H1)
-    draw_colorpicker(master,w.tk)
+    draw_colorpicker(master,w.tk,FIXTURES,master)
     window_manager.new(w,name)
 
     name="TableA"

fix_gen.py

@@ -42,7 +42,7 @@ univ=2
 #for i in range(9*13): # fixtures
 #for i in range(8+1*12+1): # fixtures
 #for i in range((8*2)+1*(12*2)+1): # fixtures
-for i in range(640): # fixtures
+for i in range(96): # fixtures
     print("====================================")
     rdata='{"DMX": 1, "UNIVERS": 2, "NAME": "VPU_01", "TYPE": "MOVER", "VENDOR": "AYERTON", "ATTRIBUT":{}}'
     jdata = json.loads(rdata,object_pairs_hook=OrderedDict)

tkgui/draw.py

@@ -361,11 +361,11 @@ def draw_input(gui):
     b.insert("end","fx:alloff:::")
 
 
-def draw_colorpicker(gui,xframe):
+def draw_colorpicker(gui,xframe,FIXTURES,master):
     import lib.colorpicker as colp
 
     class _CB():
-        def __init__(gui):
+        def __init__(gui,FIXTURES,master):
             gui.old_color = (0,0,0)
         def cb(gui,event,data):
             print("CB.cb",gui,event,data)
@@ -446,7 +446,7 @@ def draw_colorpicker(gui,xframe):
                 master.refresh_fix()
                  
                 print("PICK COLOR:",data["color"])
-    _cb=_CB()
+    _cb=_CB(FIXTURES,master)
     colp.colorpicker(xframe,width=580,height=113, xcb=_cb.cb)
     return 0