Skip to content

Commit 135a36c

Browse files
committed
Update Midi-Project
Fix Save Values button bug Fix #22: Separate files error
1 parent 317ea53 commit 135a36c

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

Main/Midi-Project/Midi-Project.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# @author: https://github.com/Alperencode
22
# @date: 01 Aug 2022
3-
# @last update: 13 Oct 2022
3+
# @last update: 22 Oct 2022
44

55
# Importing midi directory
66
from midi import *
@@ -78,7 +78,7 @@ def __init__(self,note_name,octave=5,velocity=64,output=None, app=None):
7878

7979
self.__entry_box = Entry(self.app, width=5)
8080
self.__entry_box.place(x=50, y= 10 + (NoteButton.label_counter * 20))
81-
self.__entry_box.bind('<Return>', lambda event: self.set_saved_pitch(self.__entry_box.get()))
81+
self.__entry_box.bind('<Return>', lambda event: (self.set_saved_pitch(self.__entry_box.get()), self.update_local_pitch()))
8282
else:
8383
NoteButton.label_counter += 1.5
8484

@@ -87,7 +87,7 @@ def __init__(self,note_name,octave=5,velocity=64,output=None, app=None):
8787

8888
self.__entry_box = Entry(self.app, width=5)
8989
self.__entry_box.place(x=130, y= 10 + (NoteButton.label_counter * 20))
90-
self.__entry_box.bind('<Return>', lambda event: self.set_saved_pitch(self.__entry_box.get()))
90+
self.__entry_box.bind('<Return>', lambda event: (self.set_saved_pitch(self.__entry_box.get()), self.update_local_pitch()))
9191

9292
# Placing button in the GUI
9393
button.place(x=NoteButton.placement[NoteButton.counter], y=300)
@@ -185,16 +185,22 @@ def send_note_on(self):
185185
Label(self.app, text=f"Sending {self.get_note_name()} octave {self.get_octave()} with \n{self.__pitch_value} pitch and {self.get_velocity()} velocity",font=("Arial",12,"bold")).place(x=200, y=40)
186186

187187
# Sending midi signal
188-
self.output.send( mido.Message('note_on', note=note_to_number(self.get_note_name(), self.get_octave()), velocity=self.get_velocity()) )
189-
188+
try:
189+
self.output.send( mido.Message('note_on', note=note_to_number(self.get_note_name(), self.get_octave()), velocity=self.get_velocity()) )
190+
except:
191+
print("\aInvalid note")
192+
190193
def send_pitch_wheel(self):
191194
"""Sending converted pitch value to the midi device"""
192195
sending_value = converter(self.get_pitch(), False)
193196
self.output.send( mido.Message('pitchwheel', pitch=sending_value) )
194197

195198
def send_note_off(self):
196199
"""Sending note_off message to the midi device"""
197-
self.output.send( mido.Message('note_off', note=note_to_number(self.get_note_name(), self.get_octave()), velocity=self.get_velocity()) )
200+
try:
201+
self.output.send( mido.Message('note_off', note=note_to_number(self.get_note_name(), self.get_octave()), velocity=self.get_velocity()) )
202+
except:
203+
print("\aInvalid note")
198204
self.output.send( NoteButton.control_change )
199205

200206
@staticmethod

Main/Midi-Project/midi/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
from midi.modules import *
2-
from midi.global_variables import *
3-
from midi.basic_functions import *
1+
from midi.functions_modules_variables import *
Binary file not shown.

Main/Midi-Project/midi/basic_functions.py renamed to Main/Midi-Project/midi/functions_modules_variables.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
from tkinter import *
2+
from music21 import *
3+
from tkinter import ttk,messagebox
4+
import mido,time,threading,json,math,os,mido.backends.rtmidi
5+
6+
NOTES = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B']
7+
PURE_NOTES = ['C', 'D', 'E', 'F', 'G', 'A', 'B']
8+
OTHER_NOTES = ['C#', 'D#', 'F#', 'G#', 'A#']
9+
MESSAGE_TYPES = ['note_on','note_off','pitchwheel','control_change']
10+
OCTAVES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
11+
112
def note_to_number(note: str, octave: int):
213
"""Converting passed note name and octave to Midi note number"""
314
note = NOTES.index(note) + 4

Main/Midi-Project/midi/global_variables.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

Main/Midi-Project/midi/modules.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)