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

organize code

Browse Source
This commit is contained in:
oleting
2020-12-27 20:36:35 +01:00
parent 7552c31ccf
commit 8a529cbe83
5 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
draw/code_to_image.py
View File

@@ -116,6 +116,6 @@ def draw_while_loop_back(condition: str, x: int, y: int, xsize: int, ysize: int)
#the x, y offset then the x,y draw size (the canvas)
return x + xsize * .1, y, xsize * .9
def NSD_save(filepath: str, filename: str):
def NSD_save(filepath: str):
"""Save the created file"""
img.save(filepath + '/' + filename + datei_endung ,"PNG")
img.save(filepath + datei_endung ,"PNG")

5
draw/code_to_image_wrapper.py
View File

@@ -1,9 +1,8 @@
import draw.code_to_image as cti
class NSD_writer(object):
def __init__(self, filepath: str, filename: str, x_sz: int, y_sz: int) -> None:
def __init__(self, filepath: str, x_sz: int, y_sz: int) -> None:
self.filepath = filepath
self.filename = filename
self.x_sz = x_sz
self.y_sz = y_sz
@@ -11,4 +10,4 @@ class NSD_writer(object):
cti.NSD_init(self.x_sz, self.y_sz)
def __exit__(self, _, __, ___):
cti.NSD_save(self.filepath, self.filename)
cti.NSD_save(self.filepath)

78
gui/gui.py
View File

@@ -92,7 +92,6 @@ class Gui:
sg.VSeparator(),
sg.Column(file_list_column),
sg.VSeparator(),
sg.Column(diagramm_viewer_column),
]
]
@@ -112,45 +111,12 @@ class Gui:
while True:
logging.info('test')
event, values = window.read()
if event == 'Exit' or event == sg.WIN_CLOSED:
logging.debug(('Exit GUI'))
break
if event == '-SET OUTPUT NAME-':
output_name = values['-OUTPUT NAME-']
if event == '-CREDITS-':
sg.popup(
'This is made by Plexx, Weckyy and Oleting. Used PySimpleGUI and Pillow', title='Credits')
if event == '-DONATE-':
logging.debug(('event = ' + str(event)))
sg.popup_notify(
('You donated $' + str(random.randint(500, 100000000)) + '.'), title='Thanks')
if event == '-OUTPUT FOLDER-':
logging.debug(('event = ' + str(event) +
' value = ' + str(values['-OUTPUT FOLDER-'])))
fnames = output(values)
window['-OUTPUT FILE LIST-'].update(fnames)
elif event == '-OUTPUT FILE LIST-':
logging.debug(('event = ' + str(event) +
' value = ' + str(values['-OUTPUT FILE LIST-'])))
try:
filename = os.path.join(
values["-OUTPUT FOLDER-"], values["-OUTPUT FILE LIST-"][0]
)
window["-TOUT-"].update(filename)
window["-IMAGE-"].update(filename=filename)
except:
pass
if event == '-JAVA FOLDER-':
logging.debug(('event = ' + str(event) +
' value = ' + str(values['-JAVA FOLDER-'])))
folder = values['-JAVA FOLDER-']
window['-JAVA FOLDER-'].update(values['-JAVA FILE-'])
# execute Column
if event == '-CREATE-':
logging.debug(('event = ' + str(event) +
'values = ' + str(values)))
@@ -168,7 +134,6 @@ class Gui:
if file_there((output_path + '/' + output_name)) is True:
proceed = sg.popup_yes_no(
'File already exist! Continue?', title='File alreday exist!')
print(proceed)
if proceed == 'Yes':
nassi(filepath=file_path, output_path=output_path, outputname=output_name, gui=self,
font_filepath=font_filepath)
@@ -227,6 +192,45 @@ class Gui:
except:
pass
if event == '-CREDITS-':
sg.popup(
'This is made by Plexx, Weckyy and Oleting. Used PySimpleGUI and Pillow', title='Credits')
if event == '-DONATE-':
logging.debug(('event = ' + str(event)))
sg.popup_notify(
('You donated $' + str(random.randint(500, 100000000)) + '.'), title='Thanks')
# needed Input
if event == '-OUTPUT FOLDER-':
logging.debug(('event = ' + str(event) +
' value = ' + str(values['-OUTPUT FOLDER-'])))
fnames = output(values)
window['-OUTPUT FILE LIST-'].update(fnames)
elif event == '-OUTPUT FILE LIST-':
logging.debug(('event = ' + str(event) +
' value = ' + str(values['-OUTPUT FILE LIST-'])))
try:
filename = os.path.join(
values["-OUTPUT FOLDER-"], values["-OUTPUT FILE LIST-"][0]
)
window["-TOUT-"].update(filename)
window["-IMAGE-"].update(filename=filename)
except:
pass
if event == '-JAVA FOLDER-':
logging.debug(('event = ' + str(event) +
' value = ' + str(values['-JAVA FOLDER-'])))
folder = values['-JAVA FOLDER-']
window['-JAVA FOLDER-'].update(values['-JAVA FILE-'])
# optional Input
if event == '-SET OUTPUT NAME-':
output_name = values['-OUTPUT NAME-']
if event == '-TTF FOLDER-':
logging.debug(('event = ' + str(event) +
' value = ' + str(values['-TTF FOLDER-'])))

2
gui/utils.py
View File

@@ -12,7 +12,7 @@ def nassi(filepath: str, output_path: str, outputname: str, gui, font_filepath:
if font_filepath != None:
NSD.set_font(font_filepath)
NSD.load_from_file(filepath)
NSD.convert_to_image(output_path, outputname, 500)
NSD.convert_to_image((output_path + outputname), 500)
def output(values):

6
interpreter/NassiShneidermann.py
View File

@@ -29,10 +29,10 @@ class NassiShneidermanDiagram:
h += inst.getblksize()
return int(h)
def convert_to_image(self, filepath: str, filename: str, x_size: int=200):
def convert_to_image(self, filepath: str, x_size: int=200):
image_y_sz = self._get_image_height()
logging.info(f"Saving NSD to {filename}.png...")
with NSD_writer(filepath, filename, x_size, image_y_sz):
logging.info(f"Saving NSD to {filepath}.png...")
with NSD_writer(filepath, x_size, image_y_sz):
x, y = 0, 0
for instruction in self.instructions: