Browse Source

bugfix: exec DELAY minus; bug:start-glitch !

micha 3 months ago
parent
commit
0fc8a42d91
4 changed files with 17 additions and 19 deletions
  1. 4 6
      lib/execlib.py
  2. 3 3
      lib/libtk.py
  3. 4 4
      lib/meta.py
  4. 6 6
      lib/tkevent.py

+ 4 - 6
lib/execlib.py

@@ -19,11 +19,9 @@ def reshape_exec(data ,value=None,xfade=0,flash=0,ptfade=0,DELAY=None):
     delay=0
     if DELAY is not None:
         if DELAY < 0:
-            print("-"*20+" DELAY is MINUS !!!",DELAY)
-            #DELAY *= -1
-            #delay = len(data)*DELAY/100
-            delay = DELAY*-1
-            print(delay)
+            delay = (DELAY*-1)*len(data)
+            delay += DELAY
+            print("-"*20+" DELAY is MINUS !!!",DELAY,delay)
 
     for row in data:
         #cprint("reshape_exec in:",row)
@@ -85,7 +83,7 @@ def reshape_exec(data ,value=None,xfade=0,flash=0,ptfade=0,DELAY=None):
         #cprint("reshape_exec out:",line)
         out.append(line)
         if DELAY is not None:
-            delay+=DELAY/100 #0.02
+            delay+=DELAY #0.02
     return out
 
 

+ 3 - 3
lib/libtk.py

@@ -416,7 +416,7 @@ def tk_keyboard_callback(event,data={}):#value=255):
             if str(event.keysym) == "s":
                 MAIN.save_show()
 
-                e = MAIN.master.setup.elem["SAVE\nSHOW"]
+                e = MAIN.meta.setup.elem["SAVE\nSHOW"]
                 b = BLINKI(e)
                 b.blink()
             if str(event.keysym) == "c":
@@ -491,9 +491,9 @@ def tk_keyboard_callback(event,data={}):#value=255):
             cprint("numbersign !!")
             MAIN.save_show()
 
-            for e in MAIN.master.setup.labels:
+            for e in MAIN.meta.setup.labels:
                 cprint(e)
-            e =  MAIN.master.setup.elem["SAVE\nSHOW"]
+            e =  MAIN.meta.setup.elem["SAVE\nSHOW"]
             cprint(e)
             b = BLINKI(e)
             b.blink()

+ 4 - 4
lib/meta.py

@@ -4,8 +4,8 @@ class ValueBuffer():
     def __init__(self,val=2,_min=0,_max=255,_inc=1):
         self._value = val
         self._init_value = val
-        self._on = _inc
-        self._inc = 0.1
+        self._on = 1
+        self._inc = _inc
         self._min=_min
         self._max=_max
         print(self,val)
@@ -60,8 +60,8 @@ class ValueBuffer():
             return 1
         return 0
 
-FADE = ValueBuffer(val=2)  #2 #0.1 #1.13
-DELAY = ValueBuffer(val=0.2,_min=-10,_max=10,_inc=0.1)  
+FADE = ValueBuffer(val=2,_min=0,_max=10,_inc=0.1)  #2 #0.1 #1.13
+DELAY = ValueBuffer(val=0.04,_min=-1,_max=1,_inc=0.01)  
 DELAY.off()
 
 FADE_move = ValueBuffer(val=4.0)  #2 #0.1 #1.13

+ 6 - 6
lib/tkevent.py

@@ -189,11 +189,11 @@ class tk_event():
                     b["bg"] = "green"
                     b.config(activebackground="lightgreen")
             elif event.num == 2:
-                if "DELAY" in self.attr:
-                    v = ct.val()
-                    ct.val(v*-1)
-                else:
-                    ct.reset()
+                #if "DELAY" in self.attr:
+                v = ct.val()
+                ct.val(v*-1) # invert
+            elif event.num == 3:
+                ct.reset()
             elif event.num == 4:
                 ct.inc() 
             elif event.num == 5:
@@ -205,7 +205,7 @@ class tk_event():
             if self.attr == "FADE":
                 b["text"] = "FADE:\n{:0.2f}".format(value)
             elif self.attr == "DELAY":
-                b["text"] = "DELAY:\n{:0.3f}".format(value)
+                b["text"] = "DELAY:\n{:0.2f}".format(value)
             elif "PAN/TILT\nFADE" in self.attr:
                 b["text"] = "PAN/TILT\nFADE:{:0.2f}".format(value)
             elif "PAN/TILT\nDELAY" in self.attr: