Merge branch '0.2' of https://github.com/plexx-dev/Nassi-Shneiderman-Diagramm-Generator into 0.2

gui/gui.py

@@ -104,7 +104,7 @@ class Gui:
 
                             if file_is_empty:
                                 sg.popup_annoying('Our interpreter did not find anything. --> blame Kons or yourself!', title='Empty')
-                            elif path:
+                            if path:
                                 fnames = output(path)
                                 sg.popup_annoying('Successfully created!', title='Created',
                                                 auto_close_duration=2, auto_close=True, text_color='green')
@@ -118,11 +118,11 @@ class Gui:
                         except JavaSyntaxError as JsE:
                             logging.error(
                                 ('||SyntaxError in Java File|| Failed to create Image with values = ' + str(values)))
-                            sg.popup_error((str(JsE)))
+                            sg.popup_error(str(JsE))
                         except ScopeNotFoundException as SnFe:
                             logging.error(
                                 ('||ScopeNotFoundExeption|| Failed to create Image with values = ' + str(values)))
-                            sg.popup_error((str(SnFe)))
+                            sg.popup_error(str(SnFe))
                         except FileNotFoundError as FnFe:
                             logging.error(
                                 ('||FileNotFoundError|| Failed to create Image with values = ' + str(values)))
@@ -134,7 +134,7 @@ class Gui:
                         except Exception as e:
                             logging.error(
                                 ('Failed to create Image with values = ' + str(values)))
-                            sg.popup_error(('Failed to create an image of one funktion correctly. ' + str(e)) + 'There may be some images created. ')
+                            sg.popup_error(('Failed to create an image of one function correctly. ' + str(e)) + 'There may be some images created. ')
                         except:    
                             raise
 

interpreter/NassiShneidermann.py

@@ -57,9 +57,24 @@ class NassiShneidermanDiagram:
     def convert_to_image(self, output_path: str, on_conflict: Overwrite_behaviour=OB.SKIP) -> bool:
         i = 0
         for scope in self.function_scopes:
+<<<<<<< HEAD
             cancel = one_line_progress_meter('Progress', i+1, len(self.function_scopes), '-PROGRESSBAR-')
             if not cancel:
                 return False
+=======
+            #this shizz is not my fault. Ole was the stupid one
+            number_of_item += 1
+            try:
+                cancel = one_line_progress_meter('Progress', number_of_item, len(self.function_scopes), '-PROGRESSBAR-')
+                if not cancel:
+                    return False
+<<<<<<< HEAD
+            except:
+                pass
+=======
+            #I am the one responsible from here on
+>>>>>>> a41cc0369d1e82c88f6313397e7298043eee5fd1
+>>>>>>> a2a38c4638456d8fca6e5d4ec856929ff9a30bcc
 
             filepath = f"{output_path}/{scope.name}"
             filepath = self.check_conflicts(filepath, on_conflict)