diff --git a/gui/gui.py b/gui/gui.py index a1b964f..c5babdc 100644 --- a/gui/gui.py +++ b/gui/gui.py @@ -52,7 +52,7 @@ class Gui: font_filepath = None output_name = None output_path = None - exists_choice = OB.OVERWRITE + exists_choice = OB.SKIP types = None comments = None modifier = None @@ -75,8 +75,8 @@ class Gui: window_settings = sg.Window(title='Settings', layout=layout_settings.layout, resizable=False) event_settings, values_settings = window_settings.read() while event_settings != '-EXIT-': - if event_settings == '-OVERWRITE-' and exists_choice != OB.OVERWWRITE: - exists_choice = OB.OVERWWRITE + if event_settings == '-OVERWRITE-' and exists_choice != OB.OVERWRITE: + exists_choice = OB.OVERWRITE break elif event_settings == '-EXPICIT-' and exists_choice != OB.RANDOM_NAME: exists_choice = OB.RANDOM_NAME diff --git a/interpreter/NassiShneidermann.py b/interpreter/NassiShneidermann.py index 8ac642d..b6e35cb 100644 --- a/interpreter/NassiShneidermann.py +++ b/interpreter/NassiShneidermann.py @@ -62,9 +62,8 @@ 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: - cancel = one_line_progress_meter('Progress', i, len(self.function_scopes), '-PROGRESSBAR-') - if not cancel: - return False + cancel = one_line_progress_meter('Progress', i+1, len(self.function_scopes), '-PROGRESSBAR-') + filepath = f"{output_path}/{scope.name}" filepath = self.check_conflicts(filepath, on_conflict) @@ -79,6 +78,9 @@ class NassiShneidermanDiagram: except: logging.error(f"Failed to save image {filepath}. Unknown error") raise + + if not cancel: + return False i+=1 return True