瀏覽代碼

fix: Fixture-Editor -IMPORT -USER -GLOBA look's good

micha 1 年之前
父節點
當前提交
51d7583abf
共有 2 個文件被更改,包括 15 次插入23 次删除
  1. 0 4
      fixtures/JB-Lighting_Sparx7_27ch-3sub.json
  2. 15 19
      tkgui/GUI.py

+ 0 - 4
fixtures/JB-Lighting_Sparx7_27ch-3sub.json

@@ -1,4 +0,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}

+ 15 - 19
tkgui/GUI.py

@@ -1084,7 +1084,7 @@ class GUI_FixtureEditor():
 
         def cb(event=None,args={}):
             print("open_fixture_list")
-            #print("   ",args)
+            print("   ",args)
             if self.pw:
                 self.pw.w.tk.destroy()
             data = args["data"]
@@ -1100,24 +1100,20 @@ class GUI_FixtureEditor():
                 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("a  -", row[1])
-                    for xf in row[1]["ATTRIBUT"]:
-                        print("a  ",xf)
-                        if xf.startswith("_"):
-                            continue
-                        a.append(xf)
-                        m.append("F")
-                        break
-                    break
-                except Exception as e:
-                    print(e)
+                    print("a    :",k,str(v)[:120],"...")
+                    print("a    ::",type(k),":",type(v))
+                    if "ATTRIBUT" in v:
+                        for at in v["ATTRIBUT"]:
+                            if at.startswith("_"):
+                                 continue
+                            a.append(at)
+                            if at.endswith("-FINE"):
+                                m.append("-")
+                            elif at in ["PAN","TILT","DIM","RED","GREEN","BLUE","CYAN","YELLOW","MAGENTA","FOCUS","ZOOM","FROST"]:
+                                m.append("F")
+                            else:
+                                m.append("S")
+                            #m.append("F")
 
             self._load_fix(None,a,m)
             self.close_fixture_list()