Browse Source

disable DELAY for encode event

micha 3 months ago
parent
commit
2c192adcd4
3 changed files with 10 additions and 20 deletions
  1. 4 14
      lib/fixlib.py
  2. 1 0
      lib/meta.py
  3. 5 6
      tkgui/draw.py

+ 4 - 14
lib/fixlib.py

@@ -507,19 +507,12 @@ def encoder(fixtures,fix,attr,xval="",xfade=0,xdelay=0,blind=0):
         return x
     out = []
 
-    #cprint("Fixture.Encoder(...)",fix,attr)
     if fix not in fixtures: 
-        #cprint(" activate Fixture in fixture list on encoder click ")
-
         ii =0
         delay=0
         sstart = time.time()
-        #cprint("  encoder fix  <--")
         sub_data = []
         for _fix in fixtures:
-            #print([fix,"_fix",_fix])
-            #print(fixtures)
-            #print(type(fixtures),len(fixtures))
             ii+=1
             data = fixtures[_fix]
             if "-FINE" in attr.upper():
@@ -532,22 +525,20 @@ def encoder(fixtures,fix,attr,xval="",xfade=0,xdelay=0,blind=0):
                     if _fix:
                         sub_data.append([_fix,attr,xval,xfade,delay])
             if MAIN.meta.DELAY._is():
-                delay += MAIN.meta.DELAY.val()/100
+                pass #delay += MAIN.meta.DELAY.val()/100
 
         sub_jdata = []
         for dd in sub_data:
-            #print("---",len(sub_data),end="")
-            #encoder(fix,attr,xval,xfade,delay)
-            _x123 = encoder(fixtures,dd[0],dd[1],dd[2],dd[3],dd[4],blind=1)
+            _x123 = encoder(fixtures,dd[0],dd[1],dd[2],dd[3],dd[4],1)
             sub_jdata.append(_x123)
 
         if sub_jdata:
             cprint("  SEND MASTER ENCODER:",len(sub_data),sub_data[0],"... _blind:",_blind)#,end="")
             if not _blind:
                 MAIN.jclient_send(sub_jdata) 
-
+        #for ia in sub_jdata:
+        #    print("SOND:",ia)
         jdata=[{"MODE":ii}]
-        #cprint("  ENCODER j send <--")
 
         if not _blind:
            MAIN.jclient_send(jdata)
@@ -556,7 +547,6 @@ def encoder(fixtures,fix,attr,xval="",xfade=0,xdelay=0,blind=0):
     data = fixtures[fix]
 
     if xval == "click":
-        #cprint(data)
         return select(fixtures,fix,attr,mode="toggle")
 
 

+ 1 - 0
lib/meta.py

@@ -81,6 +81,7 @@ fx_prm_3 = {"SIZE":40,"SPEED":8,"OFFSET":100,"BASE":"0","START":0,"MODE":0,"MO":
 
 live_prm = Elem_Container()
 live_prm.labels = ["FADE","DELAY","PAN/TILT\nFADE","PAN/TILT\nDELAY","-","-"]
+live_prm.labels = ["FADE","DELAY","PAN/TILT\nFADE","-","-","-"]
 
 #fx_color = {"A":"red","B":"blue"} 
 fx_prm = {"SIZE":255,"SPEED":10,"OFFSET":100,"BASE":"-","START":0,"MODE":0,"MO":0,"DIR":1,"INVERT":1,"SHUFFLE":0,"WING":2,"WIDTH":25,"2D-X":1,"2D:MODE":0}

+ 5 - 6
tkgui/draw.py

@@ -748,10 +748,6 @@ def draw_live(gui,xframe,data):
             continue
         v=0
         b = tk.Button(frame,bg="lightgrey", text=str(comm),width=6,height=2)
-        MAIN.meta.live_prm.elem[comm] = b
-        print("live draw elem",[comm])
-
-        b.bind("<Button>",tkevent.tk_event(fix=0,elem=b,attr=comm,data=gui,mode="LIVE").cb)
 
         if "FADE" == comm:
             b["text"] = "FADE:\n{:0.2}".format(MAIN.meta.FADE.val())
@@ -762,14 +758,17 @@ def draw_live(gui,xframe,data):
         if "PAN/TILT\nDELAY" == comm:
             b["text"] = "PAN/TILT\nD:{:0.2}".format(MAIN.meta.FADE_move_delay.val())
             myTip = Hovertip(b,comm)
-
-
+            
         if "FADE" in comm:
             b["bg"] = "green"
             b.config(activebackground="lightgreen")
         if comm:
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
         
+        MAIN.meta.live_prm.elem[comm] = b
+        print("live draw elem",[comm])
+
+        b.bind("<Button>",tkevent.tk_event(fix=0,elem=b,attr=comm,data=gui,mode="LIVE").cb)
 
         c+=1
         if c >=7: