release: FixtureEditor !

_LibreLightDesk.py

@@ -2661,8 +2661,8 @@ class MASTER():
                     _buff["abg"] = "grey"
 
                 if "FX2" not in row: # insert FX2 excetption
-                    row["FX2"] = OrderedDict()
-                print("row",fix,row)    
+                    row["FX2"] = {} #OrderedDict()
+                #print("row",fix,row)    
                 if row["FX"]:
                     _buff["fg"] = "blue"
                 elif row["FX2"]:
@@ -3400,6 +3400,20 @@ class Fixtures():
 
             self.fixtures[str(i)] = sdata
         #PRESETS.label_presets = l
+        keys = list(self.fixtures.keys())
+        keys2=[]
+        for k in keys:
+            #k = "{:0>5}".format(k)
+            k = int(k)
+            keys2.append(k)
+        keys2.sort()
+        fixtures2 = OrderedDict()
+        for k in keys2:
+            k = str(k)
+            fixtures2[k] = self.fixtures[k]
+
+
+        self.fixtures = fixtures2
         self.fx_off("all")
 
     def backup_patch(self,save_as=""):

tkgui/GUI.py

@@ -611,7 +611,10 @@ class GUI_PATCH():
             b = tk.Button(xframe,bg=rgb, text="TEST",width=4)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
-            b = tk.Button(xframe,bg=rgb, text="DMX Collision!",width=12)
+            b = tk.Button(xframe,bg=rgb, text="DMX Collision!",width=15)
+            b.grid(row=r, column=c, sticky=tk.W+tk.E)
+            c+=1
+            b = tk.Button(xframe,bg="orange", text="DELETE",width=15)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
 
@@ -768,11 +771,26 @@ class GUI_PATCH():
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             b["activebackground"] = bg
 
+            c+=1
+            def x_del(fix):
+                def xx():
+                    print( "DELETE FIXTURE !!!",fix)
+                    if str(fix) in FIXTURES.fixtures:
+                        del FIXTURES.fixtures[fix]
+                return xx
+
+
+            b = tk.Button(xframe,bg="orange",fg="#000", text="DELETE",width=12,anchor="w")
+            b["command"] = x_del(fix)
+            myTip = Hovertip(b,'DELETE FIXTURE')
+            b.grid(row=r, column=c, sticky=tk.W+tk.E)
+
             c=0
             r+=1
 
 
 
+
 def GUI_LOAD_FIXTURE_LIST(frame,data={"EMPTY":"None"},cb=None,bg="black"):
     #print("__func__",__func__)
     print("#",sys._getframe().f_code.co_name)
@@ -924,7 +942,7 @@ class GUI_FixtureEditor():
         self.b.grid(row=r,column=c) #,expand=1)
 
         r+=1
-        self.b = tk.Button(self.frame,bg="lightblue",text="MAC-500", width=13)
+        self.b = tk.Button(self.frame,bg="lightblue",text="FixName", width=13)
         self.name=self.b
         self.b["command"] = self.set_name
         self.b.grid(row=r,column=c)