micha преди 5 дни
родител
ревизия
9e07561d79
променени са 2 файла, в които са добавени 5 реда и са изтрити 12 реда
  1. 3 8
      _LibreLightDesk.py
  2. 2 4
      lib/execlib.py

+ 3 - 8
_LibreLightDesk.py

@@ -1508,15 +1508,8 @@ class MASTER():
             xfade = cfg["FADE"]
         if ptfade is None:
             ptfade = cfg["FADE"]
-        #vcmd = reshape_exec( rdata ,value,[],xfade=xfade,fx=1) 
-        #cprint(rdata,color="red")
-        vcmd = execlib.reshape_exec( rdata ,value,xfade=xfade,ptfade=ptfade,DELAY=xdelay) 
-        #for row in data:
-        #    #cprint("reshape_exec in:",row)
-        #    line = {}
-        #    line["DELAY"]=delay
 
-        
+        vcmd = execlib.reshape_exec( rdata ,value,xfade=xfade,ptfade=ptfade,DELAY=xdelay) 
 
         execlib.calc_align_delay(meta,xdelay,xfade,vcmd)
 
@@ -1530,8 +1523,10 @@ class MASTER():
             
             if "VALUE" in vcmd[i] and type(vcmd[i]["VALUE"]) is type(float):
                 vcmd[i]["VALUE"] = round(vcmd[i]["VALUE"],3)
+
             if value is not None:
                 vcmd[i]["VALUE"] = value 
+
             if value == "off":
                 if "FX2" in vcmd:
                     vcmd[i]["FX2"]["TYPE"] = value

+ 2 - 4
lib/execlib.py

@@ -72,8 +72,6 @@ def reshape_exec(data ,value=None,xfade=0,flash=0,ptfade=0,DELAY=None):
             line["FADE"] = f
 
         out.append(line)
-        if DELAY is not None:
-            delay+=DELAY #0.02
 
     return out
 
@@ -133,11 +131,11 @@ def calc_align_delay(meta,_xdelay,xfade,vcmd):
             _xd += xdelay
             FIX[i]["DELAY"] = round(_xd,3)
     elif _align == "rnd":
-        _rnd = list(range(len(FIX)))
+        _rnd = list(range(len(XX)))
         import random
         random.shuffle(_rnd)
         for j in _rnd:
-            i = FIX[j]
+            i = XX[j]
             FIX[i]["DELAY"] = round(_xd,3)
             _xd += xdelay