Added input for instruments and fixed scroll buttons

Author: ProfessorAtomicManiac

Algorithms/Sorting.py

@@ -57,11 +57,13 @@ def quick_sort_method(arr, event, begin, end):
                 arr.swap(i, low)
                 low += 1
             if (event.is_set()):
-                return
+                return -1
 
         arr.swap(low, pivot)
-        quick_sort_method(arr, event, begin, low)
-        quick_sort_method(arr, event, low+1, end)
+        if (quick_sort_method(arr, event, begin, low) == -1):
+            return -1
+        if (quick_sort_method(arr, event, low+1, end) == -1):
+            return -1
 
 ''' Merge Sort - O(nlogn)
     The array will be split into two even parts (not exactly even if the array has an odd number of elements)
@@ -77,8 +79,10 @@ def merge_sort(arr, event, aux = None):
 def merge_sort_method(arr, event, begin, end):
     if (begin+1 < end):
         mid = begin + ((end-begin)+1)//2
-        merge_sort_method(arr, event, begin, mid)
-        merge_sort_method(arr, event, mid, end)
+        if (merge_sort_method(arr, event, begin, mid) == -1):
+            return -1
+        if (merge_sort_method(arr, event, mid, end) == -1):
+            return -1
         arrL = arr.list[begin:mid]
         arrR = arr.list[mid:end]
         i = j = 0
@@ -91,21 +95,21 @@ def merge_sort_method(arr, event, begin, end):
                 arr.replace(k, arrR[j])
                 j += 1
             if (event.is_set()):
-                return
+                return -1
             k += 1
 
         while i < len(arrL):
             arr.replace(k, arrL[i])
             i += 1
             k += 1
             if (event.is_set()):
-                return
+                return -1
         while j < len(arrR):
             arr.replace(k, arrR[j])
             j += 1
             k += 1
             if (event.is_set()):
-                return
+                return -1
 
 ''' Heap Sort (nlogn) - Also the implementation of the Priority Queue using the Heap Data Structure
     All elements of the array will be inserted into what is known as a "Heap".

UI/UI.py

@@ -171,7 +171,8 @@ def update(self):
         # self.scroll_bar[1] = sort scroll
         # Glitch where it will click the button behind it
         #print(len(self.list))
-        if (self.scroll_bar != []):
+        if (len(self.scroll_bar) == 2):
+            #print(self.scroll_bar[0].can_press)
             if (self.window.display and self.handled != 1):
                 #print("options extended")
                 self.scroll_bar[0].set_unpressable()
@@ -196,7 +197,7 @@ def update(self):
                 self.generate.set_unpressable()
                 self.advanced.set_unpressable()
                 self.handled = 3
-            elif (self.handled != 0):
+            elif (not self.window.display and not self.scroll_bar[0].extended and not self.scroll_bar[1].extended and self.handled != 0):
                 #print("nothing extended")
 
                 self.scroll_bar[0].set_pressable()
@@ -300,7 +301,7 @@ def toggle_aux_array(self):
     def show_advanced(self):
         # Constants
         OPTIONS_WIDTH = 300
-        OPTIONS_HEIGHT = 300
+        OPTIONS_HEIGHT = 400
 
         # Switch on options
         self.window.display = True
@@ -325,15 +326,19 @@ def show_advanced(self):
         self.options_group.add(Wrapper.Text(Wrapper.DefaultText.text("Array Size", Wrapper.FontSizes.SUB_TITLE_SIZE), (self.window.window.get_size()[0]/2, text_start + 100), self.window, False, Wrapper.Screen.NONE))
         self.size_textbox = Wrapper.TextBox(Wrapper.TextArgs(str(self.array.size), Wrapper.Fonts(Wrapper.FontSizes.BUTTON_SIZE).UBUNTU_FONT, True, "#000000"), (self.window.window.get_size()[0]/2, text_start + 150), (200, 50), lambda a : self.array.change_size(a), self.window, "", 1)
 
+        self.options_group.add(Wrapper.Text(Wrapper.DefaultText.text("Instrument", Wrapper.FontSizes.SUB_TITLE_SIZE), (self.window.window.get_size()[0]/2, text_start + 200), self.window, False, Wrapper.Screen.NONE))
+        self.instrument_textbox = Wrapper.TextBox(Wrapper.TextArgs(str(self.midi.instrument), Wrapper.Fonts(Wrapper.FontSizes.BUTTON_SIZE).UBUNTU_FONT, True, "#000000"), (self.window.window.get_size()[0]/2, text_start + 250), (200, 50), lambda a : self.midi.change_instrument(a), self.window, "", 1)
         self.text_box_group.add(self.delay_textbox)
         self.text_box_group.add(self.size_textbox)
+        self.text_box_group.add(self.instrument_textbox)
 
     # Input (specifically buttons)
 
     '''@args = options_group'''
     def close_window(self):
         self.delay_textbox.do_func()
         self.size_textbox.do_func()
+        self.instrument_textbox.do_func()
         self.array_length = self.array.size
         self.options_group.empty()
         self.text_box_group.empty()

UI/Wrapper.py

@@ -196,13 +196,12 @@ def set_unpressable(self):
 
     def update(self):
         self.player_input()
-        #print(self.can_press_timer)
-        if (self.can_press_timer != 0):
+        if (self.can_press_timer > 0):
             self.can_press_timer += 0.1
         if (self.can_press_timer > 2):
             self.can_press = True
             self.timer_is_handled = True
-            self.can_press_timer = 0
+            self.can_press_timer = -10
 
 class Text(Slide):
     ''' Creates text
@@ -727,11 +726,14 @@ class Midi():
     def __init__(self):
         port = pygame.midi.get_default_output_id()
         self.player = pygame.midi.Output(port, 0)
-        self.player.set_instrument(13) # Grand_piano
+        self.instrument = 13
+        self.player.set_instrument(self.instrument) # xylophone
 
+        '''
         self.notes = []
         for i in range(1, 128):
             self.notes.append(False)
+        '''
         # Constants
         self.brief = .5
         self.MAX = 127
@@ -742,6 +744,22 @@ def play(self, note, volume = MAX, length = brief):
         self.queue.put((note, volume))
 
     def update(self):
-        if (not self.queue.empty()):
-           pop = self.queue.get()
-           self.player.note_off(pop[0], pop[1])
+        while (not self.queue.empty()):
+            #print(self.queue.qsize())
+            pop = self.queue.get()
+            self.player.note_off(pop[0], pop[1])
+
+    def change_instrument(self, instrument):
+        #print("Bruh")
+        try:
+            instrument = int(instrument)
+        except ValueError:
+            print("Invalid Input")
+        if (instrument >= 0 and instrument <= self.MAX):
+            self.instrument = instrument
+            self.player.set_instrument(instrument)
+        else:
+            self.instrument = 13
+            self.player.set_instrument(instrument)
+        #print(self.instrument)
+        return self.instrument