Эх сурвалжийг харах

bugfix: FX: SIZE: SPEED: ... not working !.. fix:ok

micha 3 сар өмнө
parent
commit
4bb6fccaac
3 өөрчлөгдсөн 25 нэмэгдсэн , 3 устгасан
  1. 4 3
      lib/meta.py
  2. 14 0
      lib/tkevent.py
  3. 7 0
      tkgui/FX3.py

+ 4 - 3
lib/meta.py

@@ -245,7 +245,7 @@ def OptionBuffer_val(data):
     idx= data["idx"]
     return data["options"][idx]
 
-class OptionBuffer():
+class OptionBuffer():# wrap function to object
     def __init__(self,val="",options=[]):
         self.data = OptionBuffer_create_data(val="",options=options)
     def reset(self):
@@ -292,7 +292,7 @@ fx_func_attr = Optionbuffer_create_ATTR("POS")
 fx_func_func = Optionbuffer_create_FX_FUNC()
 
 fx_prm_main = {}
-fx_prm_move = {"SIZE":40,"SPEED":8,"OFFSET":100,"BASE":"0","START":0,"MODE":0,"MO":0,"DIR":1,"INVERT":0,"WING":2,"WIDTH":100}
+fx_prm_move = {"SIZE":40,"SPEED":8,"OFFSET":100,"BASE":"0","START":0,"MODE":0,"MO":0,"DIR":1,"INVERT":0,"SHUFFLE":0,"WING":2,"WIDTH":100}
 
 live_prm = Elem_Container()
 live_prm.labels = ["FADE","DELAY","PAN/TILT\nFADE","PAN/TILT\nDELAY","-","-"]
@@ -350,8 +350,9 @@ for i,f in fx3_grid_cfg.items():
     x.append("\n")
     print(":",x)
     fx3.labels.extend(x)
+fx3.labels.extend([" "," "," "," "," ","\n"])
 fx3.labels.extend(["\n"])
-fx3.labels.extend([" ","PLAY","STOP","OFF","\n"])
+fx3.labels.extend([" ","PLAY","STOP","OFF"," ","\n"])
 fx3.labels.extend(["  ","CIRCL","PAN","TILT","FLAY","\n"])
 fx3.labels.extend([" ","RED","GREEN","BLUE","MAGENTA","\n"])
 

+ 14 - 0
lib/tkevent.py

@@ -501,6 +501,8 @@ class tk_event_fx():
     def command(self,event,mode=""):       
         cprint("tkevent.tk_event_fx.command")
         cprint(" ",self.mode)
+        prm = None
+        ct = None
         if self.mode == "FX":
             prm = MAIN.meta.fx_prm
             ct  = MAIN.meta.fx_cfg
@@ -545,6 +547,7 @@ class tk_event_fx():
             return
 
         if 1:
+            cprint("---", self.attr,"!!",prm ,color="red")
             if self.attr.startswith("SIZE:"):#SIN":
                 #global MAIN.meta.fx_prm
                 k = "SIZE"
@@ -576,6 +579,7 @@ class tk_event_fx():
                     p =5
                 ct.elem[self.attr]["text"] = "SIZE:\n{:0.0f}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("SPEED:"):#SIN":
                 #global prm
                 k = "SPEED"
@@ -617,6 +621,7 @@ class tk_event_fx():
                 else:
                     ct.elem[self.attr]["text"] = "SPEED:\n{:0.02f}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("START:"):#SIN":
                 #global prm
                 k = "START"
@@ -642,6 +647,7 @@ class tk_event_fx():
 
                 ct.elem[self.attr]["text"] = "START:\n{:0.0f}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("WIDTH:"):#SIN":
                 #global prm
                 k = "WIDTH"
@@ -699,6 +705,7 @@ class tk_event_fx():
 
                 ct.elem[self.attr]["text"] = "WIDTH:\n{:0.0f}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("DIR:"):#SIN":
                 #global prm
                 k = "DIR"
@@ -714,6 +721,7 @@ class tk_event_fx():
                 txt = p 
                 ct.elem[self.attr]["text"] = "DIR:\n{}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("SHUFFLE:"):#SIN":
                 #global prm
                 k = "SHUFFLE"
@@ -731,6 +739,7 @@ class tk_event_fx():
                     p =5
                 ct.elem[self.attr]["text"] = k+":\n{}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("INVERT:"):#SIN":
                 #global prm
                 k = "INVERT"
@@ -747,6 +756,7 @@ class tk_event_fx():
                     p =5
                 ct.elem[self.attr]["text"] = k+":\n{}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("2D-X:"):#SIN":
                 #global prm
                 k = "2D-X"
@@ -767,6 +777,7 @@ class tk_event_fx():
                 txt = p 
                 ct.elem[self.attr]["text"] = "2D-X:\n{}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("WING:"):#SIN":
                 #global prm
                 k = "WING"
@@ -787,6 +798,7 @@ class tk_event_fx():
                 txt = p 
                 ct.elem[self.attr]["text"] = "WING:\n{}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("OFFSET:"):#SIN":
                 #global prm
                 k = "OFFSET"
@@ -814,6 +826,7 @@ class tk_event_fx():
 
                 ct.elem[self.attr]["text"] = "OFFSET:\n{:0.0f}".format(p)
                 cprint("  ",prm)
+                prm[k] = p
             elif self.attr.startswith("BASE:"):
                 k = "BASE"
                 p = prm[k]
@@ -826,6 +839,7 @@ class tk_event_fx():
                 elif event.num == 5:
                     p = "0"
                 ct.elem[self.attr]["text"] = "BASE:\n{}".format(p)
+                prm[k] = p
             elif self.attr.startswith("2D:"):#SIN":
                 self.fx(event)
             elif self.attr.startswith("FX:"):#SIN":

+ 7 - 0
tkgui/FX3.py

@@ -189,6 +189,13 @@ def _draw_fx3(frame,c,r,gui,mode="FX"):
                 v=fx_func.val()
                 print(fx_func,v)
                 b["text"] = v
+                if comm.startswith("TYPE:"): 
+                    b["bg"] = "orange"
+                    b.config(activebackground="#dd0")
+                for a in ["SPEED:","SIZE:","START:","OFFSET:"]:
+                    if comm.startswith(a): 
+                        b["bg"] = "lightgreen"
+                        b.config(activebackground="#0d0")
         if comm:
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
         c+=1