|
@@ -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")
|
|
|
|
|
|
|