|
@@ -683,6 +683,7 @@ DELAY.val(0.2)
|
|
|
|
|
|
fx_prm_main = {}
|
|
|
fx_prm_move = {"SIZE":40,"SPEED":8,"OFFSET":100,"BASE":"0","START":0,"MODE":0,"MO":0,"DIR":1,"INVERT":0,"WING":2,"WIDTH":100}
|
|
|
+fx_prm_3 = {"SIZE":40,"SPEED":8,"OFFSET":100,"BASE":"0","START":0,"MODE":0,"MO":0,"DIR":1,"INVERT":0,"WING":2,"WIDTH":100}
|
|
|
|
|
|
fx_color = {"A":"red","B":"blue"}
|
|
|
fx_prm = {"SIZE":255,"SPEED":10,"OFFSET":100,"BASE":"-","START":0,"MODE":0,"MO":0,"DIR":1,"INVERT":1,"SHUFFLE":0,"WING":2,"WIDTH":25,"2D-X":1,"2D:MODE":0}
|
|
@@ -1079,6 +1080,23 @@ class MASTER():
|
|
|
"FX:CIR","FX:PAN","FX:TILT", "WIDTH:\n100","DIR:\n0","INVERT:\n0","\n",
|
|
|
"SHUFFLE:\n0","SIZE:\n","SPEED:\n","START:\n","OFFSET:\n","\n"
|
|
|
]
|
|
|
+ self.fx_3 = Elem_Container()
|
|
|
+ self.fx_3.commands =[
|
|
|
+ "FX:ATTR","PAN","TILT","ATTR3","ATTR4","\n",
|
|
|
+ "WIDTH:","25","25","25","25","\n",
|
|
|
+ "DIR:","1","1","1","1","\n",
|
|
|
+ "INVERT:","1","1","1","1","\n",
|
|
|
+ "SHUFFLE:","0","0","0","0","\n",
|
|
|
+ "SIZE:","255","255","255","255","\n",
|
|
|
+ "SPEED:","10","10","10","10","\n",
|
|
|
+ "START:","0","0","0","0","\n",
|
|
|
+ "OFFSET:","100","100","100","100","\n",
|
|
|
+ " ","\n",
|
|
|
+ " ","PLAY","STOP","OFF","\n",
|
|
|
+ " ","CIRCL","PAN","TILT","FLAY","\n",
|
|
|
+ " ","RED","GREEN","BLUE","MAGENTA","\n",
|
|
|
+ "\n",
|
|
|
+ ]
|
|
|
#, "FX:SIN","FX:COS","FX:RAMP","FX:RAMP2","FX:FD","FX:ON","BASE:\n-"] #,"FX:RND" ]
|
|
|
|
|
|
self.fx = Elem_Container()
|
|
@@ -2015,27 +2033,31 @@ if __run_main:
|
|
|
data.append({"text":"COLORPICKER","name":"COLOR"})
|
|
|
data.append({"text":"---"})
|
|
|
data.append({"text":"FIXTURE-EDITOR","name":"FIX-EDIT"})
|
|
|
- data.append({"text":"CONFIG"})
|
|
|
data.append({"text":"SDL-MIDI"})
|
|
|
data.append({"text":"CLOCK"})
|
|
|
data.append({"text":"RAY-DMX"})
|
|
|
- data.append({"text":"R-FIX-LIST"})
|
|
|
- data.append({"text":"SDL-DMX"})
|
|
|
data.append({"text":"SDL-VPU"})
|
|
|
- data.append({"text":"SDL-OSZI"})
|
|
|
+ data.append({"text":"---"})
|
|
|
data.append({"text":"Nodescanner","name":"NodeScan"})
|
|
|
data.append({"text":"TK-Ping"})
|
|
|
- data.append({"text":"---"})
|
|
|
+ data.append({"text":"SDL-OSZI"})
|
|
|
data.append({"text":"---"})
|
|
|
data.append({"text":"- DEMO -"})
|
|
|
data.append({"text":"---"})
|
|
|
- data.append({"text":"XWING"})
|
|
|
- #data.append({"text":"TK-EXEC"})
|
|
|
- #data.append({"text":"EXEC-BTN","name":"EXEC-BTN"})
|
|
|
data.append({"text":"SDL-STAGE"})
|
|
|
data.append({"text":"SDL-Shader"})
|
|
|
data.append({"text":"TABLE"})
|
|
|
-
|
|
|
+ data.append({"text":"---"})
|
|
|
+ data.append({"text":"- NEW -"})
|
|
|
+ data.append({"text":"R-FIX-LIST"})
|
|
|
+ data.append({"text":"FX3"})
|
|
|
+ data.append({"text":"XWING"})
|
|
|
+ data.append({"text":"CONFIG"})
|
|
|
+ data.append({"text":"---"})
|
|
|
+ data.append({"text":"- OLD -"})
|
|
|
+ data.append({"text":"SDL-DMX"})
|
|
|
+ #data.append({"text":"TK-EXEC"})
|
|
|
+ #data.append({"text":"EXEC-BTN","name":"EXEC-BTN"})
|
|
|
#data.append({"text":"MASTER-WING"})
|
|
|
|
|
|
name="MAIN"
|
|
@@ -2619,6 +2641,22 @@ if __run_main:
|
|
|
window_manager.top(name)
|
|
|
|
|
|
|
|
|
+ # =======================================================================
|
|
|
+ name="FX3"
|
|
|
+ args = {"title":name,"master":0,"width":364,"height":418+30,"left":L1+10+W1,"top":TOP+302,"resize":1}
|
|
|
+ geo = libwin.split_window_position(pos_list,name)
|
|
|
+ if geo:
|
|
|
+ args.update(geo)
|
|
|
+ cls = draw_fx_3 #(master,w.tk)
|
|
|
+ data = []
|
|
|
+ cb_ok = None
|
|
|
+
|
|
|
+ c = libtk.window_create_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=0)
|
|
|
+ window_manager.new(None,name,wcb=c)
|
|
|
+ if libwin.split_window_show(pos_list,_filter=name):
|
|
|
+ window_manager.top(name)
|
|
|
+
|
|
|
+
|
|
|
# =======================================================================
|
|
|
name="PATCH"
|
|
|
args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP,"foot":1,"head":1}
|