From 96b4aedf6690be891488252ed1bf781a6fc34573 Mon Sep 17 00:00:00 2001 From: oleting Date: Tue, 9 Feb 2021 15:42:14 +0100 Subject: [PATCH 1/2] + author and description --- draw/Iinstruction.py | 7 +++++++ draw/code_to_image.py | 6 ++++++ draw/code_to_image_wrapper.py | 7 +++++++ gui/gui.py | 7 +++++++ gui/new_window_layouts.py | 7 +++++++ gui/utils.py | 7 +++++++ interpreter/NassiShneidermann.py | 8 ++++++++ interpreter/function_scope.py | 6 ++++++ interpreter/interpret_source.py | 8 ++++++++ run.py | 5 +++++ 10 files changed, 68 insertions(+) diff --git a/draw/Iinstruction.py b/draw/Iinstruction.py index fa7b94f..38c9070 100644 --- a/draw/Iinstruction.py +++ b/draw/Iinstruction.py @@ -1,3 +1,10 @@ +#!/usr/bin/env python + +"""Iinstruction.py: #TODO""" + +__author__ = "Weckyy702" + + from typing import Iterable, List from abc import ABCMeta, abstractmethod from draw import code_to_image as cti diff --git a/draw/code_to_image.py b/draw/code_to_image.py index ce72948..18e737a 100644 --- a/draw/code_to_image.py +++ b/draw/code_to_image.py @@ -1,3 +1,9 @@ +#!/usr/bin/env python + +"""code_to_image.py: #TODO""" + +__author__ = "plexx, Weckyy702" + from typing import Iterable from PIL import Image, ImageDraw, ImageFont import os diff --git a/draw/code_to_image_wrapper.py b/draw/code_to_image_wrapper.py index b65896f..9f568a3 100644 --- a/draw/code_to_image_wrapper.py +++ b/draw/code_to_image_wrapper.py @@ -1,3 +1,10 @@ +#!/usr/bin/env python + +"""code_to_image_wrapper.py: #TODO""" + +__author__ = "Weckyy702" + + import draw.code_to_image as cti class NSD_writer(object): diff --git a/gui/gui.py b/gui/gui.py index 7fde7f5..4133b01 100644 --- a/gui/gui.py +++ b/gui/gui.py @@ -1,3 +1,10 @@ +#!/usr/bin/env python + +"""gui.py: handle and init Gui.""" + +__author__ = "oleting" + + from gui.utils import nassi, output from gui.new_window_layouts import Layout_std, Layout_settings from errors.custom import JavaSyntaxError, ScopeNotFoundException, InterpreterException, NoPathError diff --git a/gui/new_window_layouts.py b/gui/new_window_layouts.py index 32fa7d5..bedc27b 100644 --- a/gui/new_window_layouts.py +++ b/gui/new_window_layouts.py @@ -1,3 +1,10 @@ +#!/usr/bin/env python + +"""new_window_layouts.py: create layouts""" + +__author__ = "oleting" + + import PySimpleGUI as sg class Layout_std: diff --git a/gui/utils.py b/gui/utils.py index 4db3e28..1274376 100644 --- a/gui/utils.py +++ b/gui/utils.py @@ -1,3 +1,10 @@ +#!/usr/bin/env python + +"""utils.py: utils for gui.py""" + +__author__ = "oleting, Weckyy702" + + from errors.custom import NoPathError from interpreter.NassiShneidermann import NassiShneidermanDiagram, Overwrite_behaviour, OB diff --git a/interpreter/NassiShneidermann.py b/interpreter/NassiShneidermann.py index dfb88a5..8ffa2e3 100644 --- a/interpreter/NassiShneidermann.py +++ b/interpreter/NassiShneidermann.py @@ -1,3 +1,11 @@ +#!/usr/bin/env python + +"""NassiShneidermann.py: #TODO""" + +__author__ = "Weckyy702" + + + from typing import Dict, List, Optional from PySimpleGUI import one_line_progress_meter import logging diff --git a/interpreter/function_scope.py b/interpreter/function_scope.py index d1d5d81..ca65cd2 100644 --- a/interpreter/function_scope.py +++ b/interpreter/function_scope.py @@ -1,3 +1,9 @@ +#!/usr/bin/env python + +"""function_scope.py: #TODO""" + +__author__ = "Weckyy702" + from typing import Iterable, List from draw.Iinstruction import Iinstruction diff --git a/interpreter/interpret_source.py b/interpreter/interpret_source.py index 235fba3..d410388 100644 --- a/interpreter/interpret_source.py +++ b/interpreter/interpret_source.py @@ -1,3 +1,11 @@ +#!/usr/bin/env python + +"""interpret_source.py: #TODO""" + +__author__ = "Weckyy702" + + + import logging import re from typing import Dict, List, Match, Tuple, Union, Iterable diff --git a/run.py b/run.py index 0ee8812..596a09c 100755 --- a/run.py +++ b/run.py @@ -1,4 +1,9 @@ #!/usr/bin/env python + +"""run.py: entrypoint""" + +__author__ = "oleting, Weckyy702" + from gui.gui import Gui as gui from sys import argv From 7d000593f686824ad4f6f8c1c7560a54cb08fc1e Mon Sep 17 00:00:00 2001 From: oleting Date: Tue, 9 Feb 2021 15:46:14 +0100 Subject: [PATCH 2/2] + fix --- gui/gui.py | 6 ------ gui/new_window_layouts.py | 2 -- gui/utils.py | 4 +--- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/gui/gui.py b/gui/gui.py index 4133b01..6ca260d 100644 --- a/gui/gui.py +++ b/gui/gui.py @@ -162,12 +162,6 @@ class Gui: sg.popup( 'This was made by plexx(Image generation), Weckyy702(Interpreter) and oleting(Frontend). Used Python 3.9.1, Libraries PySimpleGUI and Pillow.', title='Credits') - # handle fun feature - if event == '-DONATE-': - logging.debug(('event = ' + str(event))) - sg.popup_notify( - ('You donated $' + str(random.randint(500, 100000000)) + '.'), title='Thanks') - # needed Input diff --git a/gui/new_window_layouts.py b/gui/new_window_layouts.py index bedc27b..a6acd4f 100644 --- a/gui/new_window_layouts.py +++ b/gui/new_window_layouts.py @@ -15,8 +15,6 @@ class Layout_std: sg.Button(button_text='Create Image', key='-CREATE-'), sg.Button(button_text='Credits', key='-CREDITS-'), sg.Button(button_text='Settings', key='-SETTINGS-'), - # * fun feature - sg.Button(button_text='Donate', key='-DONATE-'), ] ] diff --git a/gui/utils.py b/gui/utils.py index 1274376..7678e0b 100644 --- a/gui/utils.py +++ b/gui/utils.py @@ -34,9 +34,7 @@ def nassi(input_path: str, output_path: str, outputname: str, types, remove_tags cancel = NSD.convert_to_image(output_directory, on_conflict=behaviour) - if not cancel: - return None - + return output_directory, is_empty