Merge branch 'master' of https://github.com/ProfessorAtomicManiac/AlgorithmVisualizer

Author: CoolSpy3

AlgoVisual.py

@@ -17,6 +17,7 @@ def main(fps):
     midi = Wrapper.Midi()
 
     screen_group = pygame.sprite.Group()
+    options_real_group = pygame.sprite.Group()
     options_screen_group = pygame.sprite.Group()
     sorting_group = pygame.sprite.Group()
     aux_sorting_group = pygame.sprite.Group()
@@ -27,7 +28,7 @@ def main(fps):
     scroll_bar = []
     sorting_actions = None
 
-    UI.MainMenuActions.display_main_menu(window, True, screen_group, options_screen_group)
+    UI.MainMenuActions.display_main_menu(window, True, screen_group, options_screen_group, midi)
 
     while True:
         # General Events should be placed here
@@ -46,10 +47,10 @@ def main(fps):
         # apparentally python has no switch cases?
         # This should only have logic for what to do when its on screen x or something like that
         if (window.screen == Wrapper.Screen.MAIN_MENU and window.window_size_change):
-            UI.MainMenuActions.display_main_menu(window, False, screen_group, options_screen_group)
+            options_real_group = UI.MainMenuActions.display_main_menu(window, False, screen_group, options_screen_group, midi)
             window.window_size_change = False
         elif (window.screen == Wrapper.Screen.MAIN_MENU and window.screen_change):
-            UI.MainMenuActions.display_main_menu(window, True, screen_group, options_screen_group)
+            options_real_group = UI.MainMenuActions.display_main_menu(window, True, screen_group, options_screen_group, midi)
             window.screen_change = False
         elif (window.screen == Wrapper.Screen.SORTING_SCREEN and window.screen_change):
             sorting_actions = UI.SortingActions(window, screen_group, sorting_group, aux_sorting_group, [scroll_group_1, scroll_group_2], options_screen_group, text_box_group, midi)
@@ -101,6 +102,7 @@ def main(fps):
         options_screen_group.update()
         text_box_group.draw(window.window)
         text_box_group.update(events_list)
+        options_real_group.update()
 
         # Must have to update
         pygame.display.update()

Algorithms/Sorting.py

@@ -58,11 +58,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)
@@ -79,8 +81,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
@@ -93,21 +97,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".