diff --git a/__pycache__/app_functions.cpython-39.pyc b/__pycache__/app_functions.cpython-39.pyc deleted file mode 100644 index 45b7d5b6b5a4d6b986b61f6b283ec4b4274fa578..0000000000000000000000000000000000000000 Binary files a/__pycache__/app_functions.cpython-39.pyc and /dev/null differ diff --git a/__pycache__/image_maker.cpython-39.pyc b/__pycache__/image_maker.cpython-39.pyc deleted file mode 100644 index f628d10a2a3276b44b45ea3fa6899ceac7f8f375..0000000000000000000000000000000000000000 Binary files a/__pycache__/image_maker.cpython-39.pyc and /dev/null differ diff --git a/__pycache__/logic.cpython-39.pyc b/__pycache__/logic.cpython-39.pyc deleted file mode 100644 index 5597bf98296c0f6d31ddd7f58fa37fb81ab36d39..0000000000000000000000000000000000000000 Binary files a/__pycache__/logic.cpython-39.pyc and /dev/null differ diff --git a/__pycache__/parsing.cpython-39.pyc b/__pycache__/parsing.cpython-39.pyc deleted file mode 100644 index f89a1bf0ea84b3e6cfee52d2a2ddfe97922d679b..0000000000000000000000000000000000000000 Binary files a/__pycache__/parsing.cpython-39.pyc and /dev/null differ diff --git a/image_maker.py b/image_maker.py index 783f458c95eda80265a25dad0f188d5b14c3094c..c294f04525ab73084dc1e593455e3912d253b7d7 100644 --- a/image_maker.py +++ b/image_maker.py @@ -94,20 +94,20 @@ space_width = 0 def get_space_wdith(): return space_width -def get_concat_h_multi_resize(im_list, resample=Image.BICUBIC): +def get_concat_h_multi_resize(im_list, resample=Image.BILINEAR): global space_width max_height=max(im.height for im in im_list) min_height = min(im.height for im in im_list) - max_width = sum(im.width for im in im_list) + # max_width = sum(im.width for im in im_list) min_width=min(im.width for im in im_list) if space_width == 0: space_width=(int(min_width*0.3)) else: space_width=min(get_space_wdith(),int(min_width*0.3)) total_init_width = sum(im.width for im in im_list) + get_space_wdith() * (len(im_list) - 1) - im_list_resize = [im.resize((int(im.width * min_height / im.height), min_height), resample=resample) - for im in im_list] - total_width = sum(im.width for im in im_list_resize) + (len(im_list_resize) -1) * space_width + # im_list_resize = [im.resize((int(im.width * min_height / im.height), min_height), resample=resample) + # for im in im_list] + # total_width = sum(im.width for im in im_list_resize) + (len(im_list_resize) -1) * space_width dst = Image.new('RGB', (total_init_width, max_height),(255,255,255)) pos_x = 0 for im in im_list: @@ -170,11 +170,11 @@ def saveImage(image,name,path,date=True): now = datetime.datetime.now() now_string = now.strftime("%Y-%m-%d__%H-%M-%S") if path == None: - image.image.save(now_string+'---'+name+'.png', 'PNG') + image.image.save(now_string+'---'+name+'.jpeg', 'jpeg',optimize=True,quality=85) else: - image.image.save(path+'/'+now_string+'---'+name+'.png', 'PNG') + image.image.save(path+'/'+now_string+'---'+name+'.jpeg', 'jpeg',optimize=True,quality=85) else: if path == None: - image.image.save(name+'.png', 'PNG') + image.image.save(name+'.jpeg', 'jpeg',optimize=True,quality=85) else: - image.image.save(path+'/'+name+'.png', 'PNG') + image.image.save(path+'/'+name+'.jpeg', 'jpeg',optimize=True,quality=85) diff --git a/logic.py b/logic.py index 164e586e5b5af9f5b8581b9b77f52602147baf78..576ecdf4858129e6d93d03770a71e9ae0511c8dd 100644 --- a/logic.py +++ b/logic.py @@ -268,9 +268,15 @@ def beta_reduction_totale(terme, path, saveImages=True): return (terme) else: if path == None: - captureImage(terme, None) + if annotate_reductor(terme) != None: + captureImage(annotate_reductor(terme), None) + else: + captureImage(terme, None) else: - captureImage(terme,path) + if annotate_reductor(terme) != None: + captureImage(annotate_reductor(terme), path) + else: + captureImage(terme,path) if beta_reduction(terme) != None: return beta_reduction_totale(beta_reduction(terme), path) return (terme) diff --git a/main.py b/main.py index a717a7100b3042494ee136677db3d65ba18797cf..24c0b1c4315d872e9ee524c12e3b48465e89f066 100644 --- a/main.py +++ b/main.py @@ -8,7 +8,12 @@ import time import pyfiglet import keyboard import shutil -clear = lambda: os.system('cls') +import platform + +if platform.system() == 'Windows': + clear = lambda: os.system('cls') +else: + clear = lambda: os.system('clear') welcome_banner = pyfiglet.figlet_format('LambdaCalculus Interpreter') good_bye_banner = pyfiglet.figlet_format('Goodbye!')