fix: Fixture-Editor ..

_LibreLightDesk.py

@@ -1999,18 +1999,18 @@ class Element():
 
 def _fixture_decode_sav_line(line):
     out = None
+    out = [0,"none",{}]
 
     if line.count("\t") < 2:
         cprint("Error line.count('\\t') < 2  (is:{})".format(line.count("\t")),color="red",end=" ")
-        cprint("file:{}".format(xfname),color="red")
+        cprint("file:{}".format(line),color="red")
     else:
         key,label,rdata = line.split("\t",2)
         jdata = json.loads(rdata,object_pairs_hook=OrderedDict)
-        #out = [key,label,rdata]
         key = int(key)
-
+        #label += " dsav"
+        #label = label.replace(" dsav","")
         out = [key,label,jdata]
-        #print(line)
 
     #if not out:
     #print(line)
@@ -2109,16 +2109,11 @@ def _read_sav_file(xfname):
     i=0
     for line in lines:
         r = _fixture_decode_sav_line(line)
-        #print("  r",r)
-        if not r:
-            continue
-
-        key,label,jdata = r
-
-        _fixture_repair_nr0(jdata)
-
-        data[key]   = jdata
-        labels[key] = label
+        if r:
+            key,label,jdata = r
+            _fixture_repair_nr0(jdata)
+            data[key]   = jdata
+            labels[key] = label
         
     return data,labels
 
@@ -3158,24 +3153,26 @@ def index_fixtures():
     p="/opt/LibreLight/Xdesk/fixtures/"
     ls = os.listdir(p )
     ls.sort()
+    blist = []
+    
     for l in ls:
         b = _parse_fixture_name(l)
         b.append(p)
         b.insert(0,"base")
         blist.append(b)
-
+    return blist
 
 def _fixture_load_list(path):
     blist = []
     try:
         ls = os.listdir(path)
         ls.sort()
-        print(path)
+        print("fll",path)
         for fn in ls:
             b = _parse_fixture_name(fn)
             b["xpath"] = path 
             b["xfname"] = fn.replace(path,"")
-            print("  ",b)
+            print("fll ",b)
             blist.append(b)
     except Exception as e:
         cprint("Exce 877 ",e)
@@ -3255,8 +3252,8 @@ def _load_fixture_list(mode="None"):
     elif mode == "IMPORT":
         _r=_fixture_load_import_list()
         blist.extend( _r )
-    for i in blist:
-        print(" -",i)
+    #for i in blist:
+    #    print(" -",i)
     return blist
 
 

fixtures/JB-Lighting_Sparx7_27ch-3sub.json

@@ -1,36 +1,4 @@
-50101	50101	{"DMX": 1, "UNIVERS": 1, "NAME": "SPX__50101", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": {
-"PAN": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 139.74, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "PAN-FINE": {"NR": 2, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "TILT": {"NR": 3, "MASTER": "0", "MODE": "S", "VALUE": 119.19, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "TILT-FINE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "SHUTTER": {"NR": 6, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "DIM": {"NR": 7, "MASTER": "0", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "ZOOM": {"NR": 8, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "GOBO": {"NR": 9, "MASTER": "0", "MODE": "S", "VALUE": 41.1, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "GOBO2": {"NR": 11, "MASTER": "0", "MODE": "S", "VALUE": 36.99, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "G-ROT": {"NR": 12, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "PRISMA": {"NR": 14, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "P-ROT": {"NR": 15, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-}, "ACTIVE": 0}
-
-50102	50102	{"DMX": 21, "UNIVERS": 1, "NAME": "SPX__50102", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": 
-{"RED": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "GREEN": {"NR": 2, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "BLUE": {"NR": 3, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "WHITE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-}, "ACTIVE": 0}
-
-50103	50103	{"DMX": 25, "UNIVERS": 1, "NAME": "SPX__50103", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": 
-{"RED": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 63, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "GREEN": {"NR": 2, "MASTER": "0", "MODE": "F", "VALUE": 255, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "BLUE": {"NR": 3, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "WHITE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-}, "ACTIVE": 0}
-
-50104	50104	{"DMX": 29, "UNIVERS": 1, "NAME": "SPX__50104", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": 
-{"RED": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 255, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "GREEN": {"NR": 2, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "BLUE": {"NR": 3, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-, "WHITE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}
-}, "ACTIVE": 0}
-
+50101	50101	{"DMX": 1, "UNIVERS": 1, "NAME": "SPX__50101", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": {"PAN": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 139.74, "ACTIVE": 0, "FX": "", "FX2": {}}, "PAN-FINE": {"NR": 2, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "TILT": {"NR": 3, "MASTER": "0", "MODE": "S", "VALUE": 119.19, "ACTIVE": 0, "FX": "", "FX2": {}}, "TILT-FINE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "SHUTTER": {"NR": 6, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "DIM": {"NR": 7, "MASTER": "0", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": "", "FX2": {}}, "ZOOM": {"NR": 8, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "GOBO": {"NR": 9, "MASTER": "0", "MODE": "S", "VALUE": 41.1, "ACTIVE": 0, "FX": "", "FX2": {}}, "GOBO2": {"NR": 11, "MASTER": "0", "MODE": "S", "VALUE": 36.99, "ACTIVE": 0, "FX": "", "FX2": {}}, "G-ROT": {"NR": 12, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "PRISMA": {"NR": 14, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "P-ROT": {"NR": 15, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}}, "ACTIVE": 0}
+50102	50102	{"DMX": 21, "UNIVERS": 1, "NAME": "SPX__50102", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": {"RED": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "GREEN": {"NR": 2, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "BLUE": {"NR": 3, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "WHITE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}}, "ACTIVE": 0}
+50103	50103	{"DMX": 25, "UNIVERS": 1, "NAME": "SPX__50103", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": {"RED": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 63, "ACTIVE": 0, "FX": "", "FX2": {}}, "GREEN": {"NR": 2, "MASTER": "0", "MODE": "F", "VALUE": 255, "ACTIVE": 0, "FX": "", "FX2": {}}, "BLUE": {"NR": 3, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "WHITE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}}, "ACTIVE": 0}
+50104	50104	{"DMX": 29, "UNIVERS": 1, "NAME": "SPX__50104", "TYPE": "MOVER", "VENDOR": "JB", "ATTRIBUT": {"RED": {"NR": 1, "MASTER": "0", "MODE": "F", "VALUE": 255, "ACTIVE": 0, "FX": "", "FX2": {}}, "GREEN": {"NR": 2, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "BLUE": {"NR": 3, "MASTER": "0", "MODE": "F", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}, "WHITE": {"NR": 4, "MASTER": "0", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": "", "FX2": {}}}, "ACTIVE": 0}

tkgui/GUI.py

@@ -774,16 +774,19 @@ class GUI_PATCH():
 
 
 def GUI_LOAD_FIXTURE_LIST(frame,data={"EMPTY":"None"},cb=None,bg="black"):
+    #print("__func__",__func__)
+    print("#",sys._getframe().f_code.co_name)
     blist = data
     blist = blist[:10]
 
     frame.configure(bg=bg)
 
     # table header
+    c=0
     for r,row in enumerate(blist):
         bg="lightgrey"
         dbg="grey"
-        c=1
+        #c+=1
         #b = tk.Label(frame,bg="grey",text=str(r+1))
         #b = tk.Button(frame,text=r+1,anchor="w",bg=dbg,relief="sunken")
         #b.grid(row=r, column=c, sticky=tk.W) #+tk.E)
@@ -819,7 +822,7 @@ def GUI_LOAD_FIXTURE_LIST(frame,data={"EMPTY":"None"},cb=None,bg="black"):
                 _cb2 = _M.BaseCallback(cb=cb,args={"key":k,"val":v,"data":row}).cb
                 b = tk.Button(frame,text=v,anchor="w",height=1,bg=bg,command=_cb2)
             else: 
-                b = tk.Button(frame,text=v,anchor="w",bg=dbg,relief="sunken")
+                b = tk.Button(frame,text=v,anchor="w",bg=dbg,relief="flat")
                 b.config(activebackground=dbg)
             b.grid(row=r+1, column=c, sticky=tk.W+tk.E)
             c+=1
@@ -1093,22 +1096,25 @@ class GUI_FixtureEditor():
             a = []
             m = []
             for row in fdata:
-                print(row.keys())
-                print()
-                for k in row.keys():
-                    v = row[k]
-                    print("  :",k,v)
+                print("row:  ",row.keys())
+                print("a-")
+                for k,v in row.items():#keys():
+                    #v = row[k]
+                    print("a  :",k,str(v)[:120],"...")
+                    print("a  ::",type(k),":",type(v))
+                    break
+
                 if not row:
                     continue
                 try:
-                    print("1-", row[1])
+                    print("a  -", row[1])
                     for xf in row[1]["ATTRIBUT"]:
-                        print("  ",xf)
+                        print("a  ",xf)
                         if xf.startswith("_"):
                             continue
                         a.append(xf)
                         m.append("F")
-                        #break
+                        break
                     break
                 except Exception as e:
                     print(e)