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

+ add progress bar

Browse Source
This commit is contained in:
oleting
2021-01-05 00:27:54 +01:00
parent 6dc2723e45
commit 46966dca7a
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/gui.py
View File

@@ -97,7 +97,7 @@ class Gui:
sg.popup_auto_close( sg.popup_auto_close(
'You didn\'t set a name for the image, it will be named randomly.') 'You didn\'t set a name for the image, it will be named randomly.')
output_name = secrets.token_hex(16) output_name = secrets.token_hex(16)
nassi(input_path=file_path, output_path=output_path, outputname=output_name, gui=self, nassi(input_path=file_path, output_path=output_path, outputname=output_name, gui=self,
font_filepath=font_filepath, behaviour=exists_choice, types=types, remove_tags=modifier, comments=comments) font_filepath=font_filepath, behaviour=exists_choice, types=types, remove_tags=modifier, comments=comments)

10
gui/new_window_layouts.py
View File

@@ -46,7 +46,7 @@ class Layout_std:
sg.Text('TTF File'), sg.Text('TTF File'),
sg.In(size=(25, 1), enable_events=True, key="-TTF FOLDER-"), sg.In(size=(25, 1), enable_events=True, key="-TTF FOLDER-"),
sg.FileBrowse(file_types=(('TTF-File', '*.ttf'), ('ALL Files', sg.FileBrowse(file_types=(('TTF-File', '*.ttf'), ('ALL Files',
'*.*')), key='-TTF FILE-'), '*.*')), key='-TTF FILE-'),
], ],
[ [
sg.Button(button_text='Add costum types', key='-TYPES-') sg.Button(button_text='Add costum types', key='-TYPES-')
@@ -92,7 +92,7 @@ class Layout_std:
[ [
sg.Column(input_column), sg.Column(input_column),
sg.VSeparator(), sg.VSeparator(),
#sg.Column(execute_column), # sg.Column(execute_column),
sg.VSeparator(), sg.VSeparator(),
sg.Column(file_list_column), sg.Column(file_list_column),
sg.VSeparator(), sg.VSeparator(),
@@ -107,7 +107,7 @@ class Layout_std:
], ],
[ [
sg.HSeparator(), sg.HSeparator(),
], ],
[ [
sg.Column(layout) sg.Column(layout)
] ]
@@ -123,7 +123,7 @@ class Layout_settings():
] ]
choices = [ choices = [
[ [
sg.Text('What should the program do if a file already exist?'), sg.Text('What should the program do if a file already exist?'),
sg.Button(button_text='skip', key='-SKIP-'), sg.Button(button_text='skip', key='-SKIP-'),
sg.Button(button_text='overwrite', key='-OVERWRITE-'), sg.Button(button_text='overwrite', key='-OVERWRITE-'),
@@ -138,5 +138,3 @@ class Layout_settings():
] ]

5
interpreter/NassiShneidermann.py
View File

@@ -1,6 +1,7 @@
from os import stat from os import stat
from interpreter.interpret_source import Function_scope from interpreter.interpret_source import Function_scope
from typing import Dict, List, Optional from typing import Dict, List, Optional
from PySimpleGUI import one_line_progress_meter
import logging import logging
from enum import IntEnum from enum import IntEnum
import os.path import os.path
@@ -59,7 +60,11 @@ class NassiShneidermanDiagram:
return filepath return filepath
def convert_to_image(self, output_path: str, on_conflict: Overwrite_behaviour=OB.SKIP): def convert_to_image(self, output_path: str, on_conflict: Overwrite_behaviour=OB.SKIP):
number_of_item = 1
for scope in self.function_scopes: for scope in self.function_scopes:
number_of_item += 1
one_line_progress_meter('Progress', number_of_item, len(self.function_scopes), '-PROGRESSBAR-')
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)
if filepath is not None: if filepath is not None: