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-12 03:10:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature_plugins

Browse Source
This commit is contained in:
Tristan Rowley
2020-02-29 13:18:54 +00:00
parent fd738b060d 00aacd5360
commit 07d2972d1a
15 changed files with 303 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
user_input/numpad_input.py
View File

@@ -16,6 +16,7 @@ class NumpadInput(object):
def bind_actions(self):
self.display.display_text.bind("<KeyPress>", self.on_key_press)
self.display.display_text.bind("<KeyRelease>", self.on_key_release)
self.display.display_text.bind("<Motion>", self.on_mouse_move)
def on_key_press(self, event):
numpad = list(string.ascii_lowercase[0:19])
@@ -34,7 +35,19 @@ class NumpadInput(object):
if event.char in numpad:
self.check_key_release_settings(event.char)
def run_action_for_mapped_key(self, key):
def on_mouse_move(self, event):
if self.data.settings['user_input']['MOUSE_INPUT']['value'] != 'enabled':
return
if event.x > 480 or event.y > 320:
return
width = 480
height = 320 # hard coded since display is fixed , and reading screen is more work
self.root.after(0, self.run_action_for_mapped_key, 'x_m', event.x / width)
self.root.after(0, self.run_action_for_mapped_key, 'y_m', event.y / height)
#self.run_action_for_mapped_key(event.char)
def run_action_for_mapped_key(self, key, value=-1):
this_mapping = self.key_mappings[key]
if self.data.control_mode in this_mapping:
mode = self.data.control_mode
@@ -42,17 +55,21 @@ class NumpadInput(object):
mode = 'DEFAULT'
if self.data.function_on and len(this_mapping[mode]) > 1:
print('the action being called is {}'.format(this_mapping[mode][1]))
#getattr(self.actions, this_mapping[mode][1])()
self.actions.call_method_name(this_mapping[mode][1])
if self.data.settings['sampler']['FUNC_GATED']['value'] == 'off':
self.data.function_on = False
is_function = 1
else:
print('the action being called is {}'.format(this_mapping[mode][0]))
#getattr(self.actions, this_mapping[mode][0])()
self.actions.call_method_name(this_mapping[mode][0])
self.display.refresh_display()
is_function = 0
print('the numpad action being called is {} (mode is {})'.format(this_mapping[mode][is_function], mode))
if value != -1:
self.actions.call_method_name(this_mapping[mode][is_function], value)
else:
self.actions.call_method_name(this_mapping[mode][is_function])
if is_function and self.data.settings['sampler']['FUNC_GATED']['value'] == 'off':
self.data.function_on = False
if not value:
self.display.refresh_display()