bugfix: ESC/clear and PAN/TITL FX not working !

lib/fxlib.py

@@ -2,6 +2,10 @@
 
 import random
 
+import sys
+sys.path.insert(0,"/opt/LibreLight/Xdesk/")
+import lib.fixlib as fixlib
+
 def cprint(*args):
     print(args)
 
@@ -72,10 +76,12 @@ def process_effect(wing_buffer,fx_prm,fx_prm_move,modes,jclient_send,master,FIXT
                 jdata["WING"] = wi
                 jdata["VALUE"]    = None
                 jdata["FIX"]      = fix
-                dmx               = FIXTURES.get_dmx(fix,attr)
+                #dmx               = FIXTURES.get_dmx(fix,attr)
+                dmx               = fixlib.get_dmx(FIXTURES.fixtures,fix,attr)
                 jdata["DMX"]      = dmx
 
-                dmx_fine = FIXTURES.get_dmx(fix,attr+"-FINE")
+                #dmx_fine = FIXTURES.get_dmx(fix,attr+"-FINE")
+                dmx_fine = fixlib.get_dmx(FIXTURES.fixtures,fix,attr+"-FINE")
                 if dmx_fine != jdata["DMX"] and dmx > 0:
                     jdata["DMX-FINE"] = dmx_fine
 

lib/libtk.py

@@ -15,6 +15,7 @@ from lib.cprint import cprint
 import lib.libwin as libwin
 import lib.showlib as showlib
 import lib.libconfig as libconfig
+import lib.fixlib as fixlib
 
 import tkgui.dialog  as dialoglib
 dialog = dialoglib.Dialog()
@@ -529,7 +530,8 @@ class WindowContainer():
 
         if "keysym" in dir(event):
             if "Escape" == event.keysym:
-                MAIN.FIXTURES.clear()
+                #MAIN.FIXTURES.clear()
+                fixlib.clear(MAIN.FIXTURES.fixtures)
                 MAIN.modes.val("ESC",1)
                 MAIN.master.refresh_fix()
             elif event.keysym in ["Shift_L","Shift_R"]: