fix: dim,fix row reset, window size and position

Editor3.py

@@ -20,7 +20,8 @@ along with LibreLight.  If not, see <http://www.gnu.org/licenses/>.
 (c) 2012 micha.rathfelder@gmail.com
 """
 import random
-rnd_id = random.randint(1000,9000)
+rnd_id = str(random.randint(1000,9000))
+rnd_id += " Beta 22.01"
 try:
     xtitle = __file__
 except:
@@ -50,7 +51,7 @@ import lib.motion as motion
 from collections import OrderedDict
 
 show_name = "GloryCamp2021"
-show_name = "GloryCamp2021"
+show_name = "JMS"
 #show_name = "Dimmer"
 
 
@@ -955,7 +956,7 @@ class Fixtures(Base):
             sdata = d[i]
             for attr in sdata["ATTRIBUT"]:
                 sdata["ATTRIBUT"][attr]["ACTIVE"] = 0
-            print("load",filename,sdata)
+            #print("load",filename,sdata)
             #if "CFG" not in sdata:
             #    sdata["CFG"] = OrderedDict()
             self.fixtures[str(i)] = sdata
@@ -1127,7 +1128,7 @@ class GUI_menu():
         for row in data:
             #print(i)
             #row = data[i]
-            self.b = tk.Button(self.frame,bg="lightblue", text=row["text"],width=15,height=3)
+            self.b = tk.Button(self.frame,bg="lightblue", text=row["text"],width=13,height=3)
             self.b.bind("<Button>",BEvent({"NR":i,"text":row["text"]},self.callback).cb)
             self.b.grid(row=r, column=c, sticky=tk.W+tk.E)#,anchor="w")
             r+=1
@@ -1145,8 +1146,10 @@ class GUIWindow():
             self.tk = tkinter.Tk() #Toplevel()
         else:
             self.tk = tkinter.Toplevel()
-
-        self.tk.title(""+str(title)+" "+str(rnd_id)+":"+str(lf_nr))
+        self.tk["bg"] = "black"
+        self.tk.bind("<Button>",self.callback)
+        self.tk.bind("<Key>",self.callback)
+        self.tk.title(""+str(title)+" "+str(lf_nr)+":"+str(rnd_id))
         lf_nr+=1
         #self.tk.geometry("270x600+0+65")
         geo ="{}x{}".format(width,height)
@@ -1167,7 +1170,7 @@ class GUIWindow():
     def mainloop(self):
         self.tk.mainloop()
     def callback(self,event,data={}):
-        print(self,event,data)
+        print("<GUI>",self,event,data)
         
 class WindowManager():
     def __init__(self):
@@ -1201,15 +1204,15 @@ class WindowManager():
 
 window_manager = WindowManager()
 
-w = GUIWindow("MAIN",master=1,width=135,height=500,left=0,top=65)
+w = GUIWindow("MAIN",master=1,width=130,height=450,left=0,top=65)
 data = []
-data.append({"text":"COMMAND"})
+#data.append({"text":"COMMAND"})
 data.append({"text":"EXEC"})
 data.append({"text":"DIMMER"})
 data.append({"text":"FIXTURES"})
 #data.append({"text":"PRESET"})
-data.append({"text":"PATCH"})
-data.append({"text":"ENCODER"})
+#data.append({"text":"PATCH"})
+#data.append({"text":"ENCODER"})
 f = GUI_menu(w.tk,data)
 window_manager.new(w)
 
@@ -1221,7 +1224,7 @@ window_manager.new(w)
 #window_manager.new(w)
 
 name = "COMMAND"
-w = GUIWindow(name,master=0,width=800,height=100,left=100,top=610)
+w = GUIWindow(name,master=0,width=350,height=200,left=950,top=65)
 frame_cmd = w.tk
 window_manager.new(w,name)
 
@@ -1249,7 +1252,7 @@ frame_patch = w1 #w.tk
 window_manager.new(w,name)
 
 name="FX"
-w = GUIWindow(name,master=0,width=800,height=200,left=200,top=610)
+w = GUIWindow(name,master=0,width=350,height=250,left=950,top=305)
 frame_fx = w.tk
 window_manager.new(w,name)
 
@@ -1259,15 +1262,15 @@ window_manager.new(w,name)
 #Xroot.geometry("1024x800+130+65")
 
 name="ENCODER"
-ww = GUIWindow(name,master=0,width=800,height=150,left=135,top=600)
+ww = GUIWindow(name,master=0,width=800,height=50,left=140,top=500)
 Xroot = ww.tk
 w = None
 root = tk.Frame(Xroot,bg="black",width="10px")
-root.pack(fill=tk.BOTH,expand=1, side=tk.LEFT)
+root.pack(fill=tk.BOTH,expand=0, side=tk.LEFT)
 root3 = tk.Frame(Xroot,bg="black",width="20px")
-root3.pack(fill=tk.BOTH,expand=1, side=tk.LEFT)
+root3.pack(fill=tk.BOTH,expand=0, side=tk.LEFT)
 root2 = tk.Frame(Xroot,bg="black",width="1px")
-root2.pack(fill=tk.BOTH,expand=1, side=tk.LEFT)
+root2.pack(fill=tk.BOTH,expand=0, side=tk.LEFT)
 
 #default_font = font.Font(family='Helvetica', size=12, weight='bold')
 Font = font.Font(family='Helvetica', size=9, weight='normal')
@@ -1292,7 +1295,7 @@ class GUI(Base):
                 ,"FX:CIR","FX:PAN","FX:TILT","FX:DIM","\n"
                 ,"SZ:","SP:","ST:","OF:","BS:-","\n"
                 , "FX:SIN","FX:COS","FX:BUM","FX:BUM2","FX:FD","FX:ON","FX:ON2" ]
-        self.commands =["BLIND","CLEAR","STORE","EDIT","MOVE","\n","CFG-BTN","LABEL"
+        self.commands =["\n","BLIND","CLEAR","STORE","EDIT","MOVE","\n","CFG-BTN","LABEL"
                 ,"BACKUP","SET","","","SELECT","ACTIVATE","FLASH","FADE"
                 ]
         self.elem_fx_commands = {}
@@ -1627,6 +1630,7 @@ class GUI(Base):
         i=0
         c=0
         r=0
+        dim_end=0
         for fix in self.FIXTURES.fixtures:
             i+=1
             data = self.FIXTURES.fixtures[fix]
@@ -1635,6 +1639,10 @@ class GUI(Base):
             if(len(data["ATTRIBUT"].keys()) <= 1):
                 c,r=self.draw_dim(fix,data,c=c,r=r,frame=dim_frame)
             else:
+                if not dim_end:
+                    dim_end=1
+                    c=0
+                    r=0
                 #self._draw_fix(fix,data,root=fix_frame)
                 frame = fix_frame
             
@@ -1754,7 +1762,7 @@ class GUI(Base):
             if comm:
                 b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
-            if c >=12:
+            if c >=5:
                 c=0
                 r+=1
     def draw_command(self):
@@ -1804,6 +1812,8 @@ class GUI(Base):
                 b["text"] = "SZ:{:0.0f}".format(fx_prm["SIZE"])
             if comm == "SP:":
                 b["text"] = "SP:{:0.0f}".format(fx_prm["SPEED"])
+            if comm == "FADE":
+                b["text"] = "FADE:{:0.02f}".format(fade)
             if comm == "ST:":
                 b["text"] = "ST:{:0.0f}".format(fx_prm["START"])
             if comm == "OF:":
@@ -1813,7 +1823,7 @@ class GUI(Base):
             if comm:
                 b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
-            if c >=12:
+            if c >=5:
                 c=0
                 r+=1
     def draw_preset(self):

show/GloryCamp2021/patch.sav

@@ -1,12 +1,12 @@
-1	1	{"DMX": 1, "UNIVERS": 0, "NAME": "F1", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 194.3499999999998, "ACTIVE": 0, "FX": ""}}}
-2	2	{"DMX": 2, "UNIVERS": 0, "NAME": "F2", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 197.28000000000023, "ACTIVE": 0, "FX": ""}}}
-3	3	{"DMX": 3, "UNIVERS": 0, "NAME": "F3", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 197.28000000000023, "ACTIVE": 0, "FX": ""}}}
-4	4	{"DMX": 4, "UNIVERS": 0, "NAME": "F4", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 197.28000000000023, "ACTIVE": 0, "FX": ""}}}
-11	11	{"DMX": 11, "UNIVERS": 0, "NAME": "FL", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 135.63000000000002, "ACTIVE": 0, "FX": ""}}}
-24	24	{"DMX": 24, "UNIVERS": 0, "NAME": "P", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 197.28000000000023, "ACTIVE": 0, "FX": ""}}}
+1	1	{"DMX": 1, "UNIVERS": 0, "NAME": "F1", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}}}
+2	2	{"DMX": 2, "UNIVERS": 0, "NAME": "F2", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}}}
+3	3	{"DMX": 3, "UNIVERS": 0, "NAME": "F3", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}}}
+4	4	{"DMX": 4, "UNIVERS": 0, "NAME": "F4", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}}}
+11	11	{"DMX": 11, "UNIVERS": 0, "NAME": "FL", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}}}
+24	24	{"DMX": 24, "UNIVERS": 0, "NAME": "P", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}}}
 43	43	{"DMX": 43, "UNIVERS": 0, "NAME": "D43", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 44	44	{"DMX": 44, "UNIVERS": 0, "NAME": "D44", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
-45	45	{"DMX": 45, "UNIVERS": 0, "NAME": "D45", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 86.31, "ACTIVE": 0, "FX": ""}}}
+45	45	{"DMX": 45, "UNIVERS": 0, "NAME": "D45", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 46	46	{"DMX": 46, "UNIVERS": 0, "NAME": "D46", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 47	47	{"DMX": 47, "UNIVERS": 0, "NAME": "D47", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 48	48	{"DMX": 48, "UNIVERS": 0, "NAME": "D48", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
@@ -39,7 +39,7 @@
 75	75	{"DMX": 75, "UNIVERS": 0, "NAME": "D75", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 76	76	{"DMX": 76, "UNIVERS": 0, "NAME": "D76", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 77	77	{"DMX": 77, "UNIVERS": 0, "NAME": "D77", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
-78	78	{"DMX": 78, "UNIVERS": 0, "NAME": "D78", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 86.31, "ACTIVE": 0, "FX": ""}}}
+78	78	{"DMX": 78, "UNIVERS": 0, "NAME": "D78", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 79	79	{"DMX": 79, "UNIVERS": 0, "NAME": "D79", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 80	80	{"DMX": 80, "UNIVERS": 0, "NAME": "D80", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 81	81	{"DMX": 81, "UNIVERS": 2, "NAME": "D81", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
@@ -51,7 +51,7 @@
 87	87	{"DMX": 87, "UNIVERS": 0, "NAME": "D87", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 88	88	{"DMX": 88, "UNIVERS": 0, "NAME": "D88", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 89	89	{"DMX": 89, "UNIVERS": 0, "NAME": "D89", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
-90	90	{"DMX": 90, "UNIVERS": 0, "NAME": "D90", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 102.75, "ACTIVE": 0, "FX": ""}}}
+90	90	{"DMX": 90, "UNIVERS": 0, "NAME": "D90", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 91	91	{"DMX": 91, "UNIVERS": 0, "NAME": "D91", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 92	92	{"DMX": 92, "UNIVERS": 0, "NAME": "D92", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}
 93	93	{"DMX": 93, "UNIVERS": 0, "NAME": "D93", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 106.86, "ACTIVE": 0, "FX": ""}}}