eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-15 12:50:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve WJ ui a little bit - re-add sleep cos it really does improve responsiveness

Browse Source
This commit is contained in:
Tristan Rowley
2020-03-02 00:30:33 +00:00
parent 99006a2cd7
commit 3da90825d7
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/WJSendPlugin.py
View File

@@ -126,26 +126,30 @@ class WJSendPlugin(ActionsPlugin, SequencePlugin, DisplayPlugin, ModulationRecei
display.display_text.insert(END, "WJSendPlugin status\n\n") display.display_text.insert(END, "WJSendPlugin status\n\n")
for queue, last in sorted(self.last_modulated.items()): for queue, last in sorted(self.last_modulated.items()):
display.display_text.insert(END, "%s:\t%s\t%s\n" % (queue,self.last.get(queue)[1],self.last_modulated.get(queue)[1])) is_selected = queue == self.commands[self.selected_command_name].get('queue')
indicator = " " if not is_selected else "<"
display.display_text.insert(END, "%s%s:\t%s\t%s" % (indicator,queue,self.last.get(queue)[1],self.last_modulated.get(queue)[1]))
if is_selected:
display.display_text.insert(END, ">") # add indicator of the selected queue for param jobbies
display.display_text.insert(END, "\n")
#display.display_text.insert(END, "%s\n" % (self.selected_command_name))
cmd = self.commands[self.selected_command_name] cmd = self.commands[self.selected_command_name]
display.display_text.insert(END, "%s : %s\n" % (self.selected_command_name, cmd['name'])) output = "\nModulation for " + "%s : %s\n" % (self.selected_command_name, cmd['name'])
output = "\nModulation:\n"
bar = u"_\u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588" bar = u"_\u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588"
#for arg_name,value in [ cmd['arg_names'][y] for y in cmd['arg_names'] ]:
for arg_name in cmd['arg_names']: for arg_name in cmd['arg_names']:
indicator = " " if cmd['arg_names'].index(arg_name)!=self.selected_argument_index else ">" is_selected = cmd['arg_names'].index(arg_name)==self.selected_argument_index
indicator = " " if not is_selected else "["
output += "%s%s: "%(indicator,arg_name) output += "%s%s: "%(indicator,arg_name)
for slot,mods in enumerate(cmd.setdefault('modulation',[{},{},{},{}])): for slot,mods in enumerate(cmd.setdefault('modulation',[{},{},{},{}])):
#if arg_name in mods: #if arg_name in mods:
v = mods.get(arg_name,0.0) v = mods.get(arg_name,0.0)
g = '%s'%bar[int(v*(len(bar)-1))] g = '%s'%bar[int(v*(len(bar)-1))]
output += "{}:{}|".format('ABCD'[slot],g) output += "{}:{}|".format('ABCD'[slot],g)
if is_selected:
output+="]"
output += "\n" output += "\n"
display.display_text.insert(END, output+"\n") display.display_text.insert(END, output+"\n")
def get_display_modes(self): def get_display_modes(self):
return ["WJMXSEND","NAV_WJMX"] return ["WJMXSEND","NAV_WJMX"]
@@ -184,8 +188,8 @@ class WJSendPlugin(ActionsPlugin, SequencePlugin, DisplayPlugin, ModulationRecei
#with self.serial_lock: #with self.serial_lock:
self.ser.write(output) #.encode()) self.ser.write(output) #.encode())
# TODO: sleeping here seems to help serial response lag problem? # TODO: sleeping here seems to help serial response lag problem?
#import time import time
#time.sleep(0.02) time.sleep(0.02)
#yield from self.ser.drain() #yield from self.ser.drain()
if self.DEBUG: if self.DEBUG:
print("send_serial_string: sent string '%s'" % output) #.encode('ascii')) print("send_serial_string: sent string '%s'" % output) #.encode('ascii'))