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

implemented generation of multiples NSDs and spelling

Browse Source
This commit is contained in:
weckyy702
2020-12-28 12:57:53 +01:00
parent 2052e9a084
commit c3a61da020
4 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gui/gui.py
View File

@@ -49,7 +49,7 @@ class Gui:
sg.HSeparator(),
],
[
sg.Text('Optional choose custom font and name.'),
sg.Text('Optional: choose custom font and name.'),
],
[
sg.Text('TTF File'),
@@ -132,33 +132,33 @@ class Gui:
output_path = values['-OUTPUT FOLDER-']
if output_name is None:
sg.popup_auto_close('You dont set a name for the image, it will be named random.')
sg.popup_auto_close('You didn\'t set a name for the image, it will be named randomly.')
output_name = secrets.token_hex(16)
if file_there((output_path + '/' + output_name)) is True:
proceed = sg.popup_yes_no(
'File already exist! Continue?', title='File alreday exist!')
'File already exists! Continue?', title='File alreday exists!')
if proceed == 'Yes':
nassi(filepath=file_path, output_path=output_path, outputname=output_name, gui=self,
font_filepath=font_filepath)
fnames = output(values)
sg.popup_annoying('Successful created!', title='Created',
sg.popup_annoying('Successfully created!', title='Created',
auto_close_duration=2, auto_close=True, text_color='green')
window['-OUTPUT FILE LIST-'].update(fnames)
elif proceed == 'No':
logging.warning('There will be no image created.')
logging.warning('Cancelled. No image created')
else:
logging.warning(
'You did not made a decision! Try again!')
sg.popup_annoying('You did not made a decision! Try again!', title='FAIL',
'You did not make a decision! Try again!')
sg.popup_annoying('You did not make a decision! Try again!', title='FAIL',
auto_close_duration=2, auto_close=True, text_color='orange')
else:
nassi(filepath=file_path, output_path=output_path, outputname=output_name, gui=self,
font_filepath=font_filepath)
fnames = output(values)
sg.popup_annoying('Successful created!', title='Created',
sg.popup_annoying('Successfully created!', title='Created',
auto_close_duration=2, auto_close=True, text_color='green')
window['-OUTPUT FILE LIST-'].update(fnames)
@@ -200,7 +200,7 @@ class Gui:
if event == '-CREDITS-':
sg.popup(
'This is made by Plexx, Weckyy and Oleting. Used PySimpleGUI and Pillow', title='Credits')
'This was made by Plexx, Weckyy702 and Oleting. Libraries used are PySimpleGUI and Pillow', title='Credits')
if event == '-DONATE-':
logging.debug(('event = ' + str(event)))

8
gui/utils.py
View File

@@ -7,12 +7,14 @@ from interpreter.NassiShneidermann import NassiShneidermanDiagram
from draw.Iinstruction import *
def nassi(filepath: str, output_path: str, outputname: str, gui, font_filepath: Optional[str]=None):
def nassi(input_path: str, output_path: str, outputname: str, gui, font_filepath: Optional[str]=None):
NSD = NassiShneidermanDiagram(gui.debug_mode)
if font_filepath != None:
NSD.set_font(font_filepath)
NSD.load_from_file(filepath)
NSD.convert_to_image((output_path + '/' + outputname), 500)
NSD.load_from_file(input_path)
NSD.convert_to_image(output_path, outputname, 500)
def output(values):

27
interpreter/NassiShneidermann.py
View File

@@ -10,7 +10,7 @@ import draw.code_to_image as cti
class NassiShneidermanDiagram:
def __init__(self, do_debug: bool):
self.instructions: List[Iinstruction] = []
self.scopes: List[List[Iinstruction]] = []
self.init_logging(do_debug)
def init_logging(self, debug: bool):
@@ -23,21 +23,24 @@ class NassiShneidermanDiagram:
def set_font(self, font_filepath: str):
cti.set_font(font_filepath)
def _get_image_height(self) -> int:
def _get_image_height(self, scope_index: int) -> int:
h = 0
for inst in self.instructions:
for inst in self.scopes[scope_index]:
h += inst.getblksize()
return int(h)
def convert_to_image(self, filepath: str, x_size: int=200):
image_y_sz = self._get_image_height()
logging.info(f"Saving NSD to {filepath}.png...")
with NSD_writer(filepath, x_size, image_y_sz):
x, y = 0, 0
def convert_to_image(self, output_path: str, filename: str, x_size: int=200):
for i in range(len(self.scopes)):
filepath = f"{output_path}/{filename}#{i}"
logging.info(f"Saving NSD to {filepath}.png...")
for instruction in self.instructions:
x, y = instruction.to_image(x, y, x_size)
logging.info("Done!")
image_y_sz = self._get_image_height(i)
with NSD_writer(filepath, x_size, image_y_sz):
scope = self.scopes[i]
x, y = 0, 0
for instruction in scope:
x, y = instruction.to_image(x, y, x_size)
logging.info("Done!")
def load_from_file(self, filepath:str):
self.instructions = itp.load_instructions(filepath)
self.scopes = itp.load_instructions(filepath)

4
interpreter/interpret_source.py
View File

@@ -3,7 +3,7 @@ from os import remove
import re
from typing import List, Tuple
from errors.custom import JavaSyntaxError, ScopeNotFoundException
from errors.custom import InterpreterException, JavaSyntaxError, ScopeNotFoundException
from draw.Iinstruction import *
COMMENT_PATTERN = re.compile(r"""^//|^/\*\*|^\*|^--""")
@@ -20,7 +20,7 @@ remove_pattern = re.compile("|".join(REPLACE.keys()))
variable_regex = "^("
for kw in FUNCTION_IDENTIFIERS:
variable_regex += fr"""{kw}|"""
variable_pattern = re.compile(variable_regex[0:-1]+"$(.*)")
variable_pattern = re.compile(variable_regex[0:-1]+")$(.*)")
function_regex = "^("
for kw in FUNCTION_IDENTIFIERS: