Added more reset array options

Author: ProfessorAtomicManiac

UI/Arrays.py

@@ -87,6 +87,9 @@ def __init__(self, array_group, dim, coords, beg, end, midi, delay = default_del
         self.midi = midi
         self.size = size
         self.reset()
+
+        self.saved_config = [size, beg, end]
+        self.saved_list = [i for i in range(1, self.end+1)]
 
     def change_delay(self, delay):
         try:
@@ -109,7 +112,11 @@ def change_size(self, size):
         self.reset()
         return self.size
 
-    def change_array(self, beg, end, size, list = None):
+    def save_config(self, config, arr):
+        self.saved_config = config
+        self.saved_list = arr
+
+    def change_array(self, beg, end, size, arr = None):
         try:
             self.size = int(size)
             self.beg = int(beg)
@@ -118,7 +125,24 @@ def change_array(self, beg, end, size, list = None):
             self.size = 256
             self.beg = 1
             self.end = 256
-        self.reset(list)
+        self.save_config([size, beg, end], arr)
+        self.reset(arr)
+
+    def load_config(self):
+        self.array_group.empty()
+
+        self.list = self.saved_list
+        self.visited = []
+        cnt = 0
+        #print(self.size, len(self.list))
+        while (cnt < self.size):
+            # TODO: Unexpected behavior may occur if user puts in invalid array such as not having enough elements or saved_list's size is 0
+            for i in range(0, len(self.list)):
+                self.visited.append(False)
+                cnt += 1
+                if (cnt == self.size):
+                    break
+        self.createList()
 
     def createList(self):
         width = self.dim[0]/len(self.list)
@@ -213,6 +237,7 @@ def reset(self, list = None):
             self.list = list
         self.visited = []
         cnt = 0
+        #print(self.size, len(self.list))
         while (cnt < self.size):
             if (list == None):
                 for i in range(self.beg, self.end+1):
@@ -229,18 +254,35 @@ def reset(self, list = None):
                     cnt += 1
                     if (cnt == self.size):
                         break
-
         self.createList()
-    '''
-    def reverse(self):
+    
+    def reverse(self, list = None):
+        self.array_group.empty()
+
         self.list = []
+        if (list != None):
+            self.list = list
         self.visited = []
-        for i in range(1, self.size+1):
-            self.list.append(self.end - i + 1)
-            self.visited.append(False)
-        self.array_group.empty()
+        cnt = 0
+        while (cnt < self.size):
+            if (list == None):
+                for i in range(self.end, self.beg - 1, -1):
+                    self.list.append(i)
+                    self.visited.append(False)
+                    cnt += 1
+                    if (cnt == self.size):
+                        break
+            # TODO: Unexpected behavior may occur if user puts in invalid array such as not having enough elements
+            else:
+                self.list = list
+                for i in range(0, len(self.list)):
+                    self.visited.append(False)
+                    cnt += 1
+                    if (cnt == self.size):
+                        break
+
         self.createList()
-    '''
+    
     def change(self, dim, coords):
         self.array_group.empty()
         self.dim = dim

UI/UI.py

@@ -151,6 +151,9 @@ def __init__(self, window, screen_group, sorting_group, aux_sorting_group, scrol
         self.sorting_group = sorting_group
         self.aux_sorting_group = aux_sorting_group
         sorting_group.empty()
+
+        self.array_config = [self.array_length, 1, self.array_length]
+        self.list = [i for i in range(1, self.array_length+1)]
         #print("{},{}  {},{}".format(self.SORTING_WIDTH, self.SORTING_HEIGHT, self.SORTING_X - self.SORTING_WIDTH/2, self.SORTING_Y - self.SORTING_HEIGHT/2))
         self.array = Array(sorting_group, (self.SORTING_WIDTH, self.SORTING_HEIGHT), (self.SORTING_X - self.SORTING_WIDTH/2, self.SORTING_Y - self.SORTING_HEIGHT/2), 1, self.array_length, midi)
         self.aux_array = None
@@ -162,6 +165,7 @@ def update(self):
         # self.scroll_bar[0] = reset scroll
         # self.scroll_bar[1] = sort scroll
         # Glitch where it will click the button behind it
+        #print(len(self.list))
         if (self.window.options_screen and self.handled != 1):
             #print("options extended")
             self.scroll_bar[0].set_unpressable()
@@ -237,9 +241,9 @@ def func():
         for sort_input in Sorting.sorting_algos:
             buttons.append(Wrapper.ScrollButton(Wrapper.DefaultText.text(sort_input.name, Wrapper.FontSizes.BUTTON_SIZE), bind_function(sort_input), self.window))
 
-        resets.append(Wrapper.ScrollButton(Wrapper.DefaultText.text("Sorted", Wrapper.FontSizes.BUTTON_SIZE), self.array.reset, self.window))
-        resets.append(Wrapper.ScrollButton(Wrapper.DefaultText.text("Reverse", Wrapper.FontSizes.BUTTON_SIZE), self.array.reset, self.window))
-        resets.append(Wrapper.ScrollButton(Wrapper.DefaultText.text("Previous File", Wrapper.FontSizes.BUTTON_SIZE), self.array.reset, self.window))
+        resets.append(Wrapper.ScrollButton(Wrapper.DefaultText.text("Sorted", Wrapper.FontSizes.BUTTON_SIZE), Wrapper.sequential_functions(self.on_reset, self.array.reset), self.window))
+        resets.append(Wrapper.ScrollButton(Wrapper.DefaultText.text("Reverse", Wrapper.FontSizes.BUTTON_SIZE), Wrapper.sequential_functions(self.on_reset, self.array.reverse), self.window))
+        resets.append(Wrapper.ScrollButton(Wrapper.DefaultText.text("Previous File", Wrapper.FontSizes.BUTTON_SIZE), Wrapper.sequential_functions(self.on_reset, self.array.load_config), self.window))
 
         # Button Constants
         button_col_top = 130 # Where the buttons start
@@ -318,7 +322,9 @@ def custom_array(self):
         tkinter.Tk().withdraw() # prevents an empty tkinter window from appearing
         self.file = filedialog.askopenfilename()
         f = open(self.file, 'r')
-        array_config = list(map(int, f.readline().split()))
-        array = list(map(int, f.readline().split()))
-        self.array.change_array(array_config[1], array_config[2], array_config[0], array)
+        self.array_config.clear()
+        self.list.clear()
+        self.array_config = list(map(int, f.readline().split()))
+        self.list = list(map(int, f.readline().split()))
+        self.array.change_array(self.array_config[1], self.array_config[2], self.array_config[0], self.list)