plexx-dev/Nassi-Shneiderman-Diagramm-Generator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed weird merging error

Browse Source
This commit is contained in:
weckyy702
2021-01-24 22:05:11 +01:00
parent da14a7125e
commit 5b72104c98
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
interpreter/NassiShneidermann.py
View File

@@ -57,24 +57,9 @@ class NassiShneidermanDiagram:
def convert_to_image(self, output_path: str, on_conflict: Overwrite_behaviour=OB.SKIP) -> bool: def convert_to_image(self, output_path: str, on_conflict: Overwrite_behaviour=OB.SKIP) -> bool:
i = 0 i = 0
for scope in self.function_scopes: for scope in self.function_scopes:
<<<<<<< HEAD
cancel = one_line_progress_meter('Progress', i+1, len(self.function_scopes), '-PROGRESSBAR-') cancel = one_line_progress_meter('Progress', i+1, len(self.function_scopes), '-PROGRESSBAR-')
if not cancel: if not cancel:
return False 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 = f"{output_path}/{scope.name}"
filepath = self.check_conflicts(filepath, on_conflict) filepath = self.check_conflicts(filepath, on_conflict)