diff --git a/graphs.py b/graphs.py index 86ee09d..ad7e384 100644 --- a/graphs.py +++ b/graphs.py @@ -95,13 +95,13 @@ def gen_401K_Catch_Up(wb): # Generates graph for HSA Contribution def gen_HSA_Contribution(wb): - fig = make_basic_greenred("HSA Contribution",wb["O Mountain"]["A10"].value,wb["O Mountain"]["C10"].value) + fig = make_basic_greenred_NL("HSA Contribution",wb["O Mountain"]["A10"].value,wb["O Mountain"]["C10"].value) fig.savefig('./.gen/HSA_Contribution.png',dpi=300) # Generates graph for FSA Contribution def gen_FSA_Contribution(wb): - fig = make_basic_greenred("FSA Contribution",wb["O Mountain"]["A12"].value,wb["O Mountain"]["C12"].value) + fig = make_basic_greenred_NL("FSA Contribution",wb["O Mountain"]["A12"].value,wb["O Mountain"]["C12"].value) fig.savefig('./.gen/FSA_Contribution.png',dpi=300) diff --git a/imageGen.py b/imageGen.py deleted file mode 100644 index 33c689a..0000000 --- a/imageGen.py +++ /dev/null @@ -1,89 +0,0 @@ -from openpyxl import Workbook -import cords -from PIL import Image, ImageDraw, ImageFont - - -def gen_I_Mountain(wb): - ## I Mountain image code - I_Mountain = Image.open('./templets/I_mountain.png').convert('RGBA').resize((1920, 1080)) - I_Mountain_Mask = Image.open('./templets/mask/I_mountain_mask.png').convert('L') - blank = Image.open('./templets/I_mountain.png').convert('RGBA').resize((1920, 1080)) - - EF = Image.open('./.gen/EF.png') - EF = cords.scale(EF,0.265) - blank.paste(EF, cords.center_on(EF,(463,805)),EF) - - DI = Image.open('./.gen/DI.png') - DI = cords.scale(DI,0.265) - blank.paste(DI, cords.center_on(DI,(698,450)),DI) - - LI = Image.open('./.gen/LI.png') - LI = cords.scale(LI,0.265) - blank.paste(LI, cords.center_on(LI,(1472,802)),LI) - - #Mask and combine - graph_comp = Image.composite(blank, I_Mountain, I_Mountain_Mask) #.save("./gen/I_mountain.png") - draw = ImageDraw.Draw(graph_comp) - font = ImageFont.truetype("./fonts/Asap_Condensed/AsapCondensed-Bold.ttf", 36) - draw.text((442, 623),"12K",(0,0,0),font=font) - graph_comp.save("./gen/I_mountain.png") - - - - -def gen_O_Mountain(wb): - ## O Mountain Image Code - O_Mountain = Image.open('./templets/O_mountain.png').convert('RGBA').resize((1920, 1080)) - O_Mountain_Mask = Image.open('./templets/mask/O_mountain_mask.png').convert('L') - O_Mountain_Mask1 = Image.open('./templets/mask/O_mountain_mask1.png').convert('L') - O_Mountain_Mask2 = Image.open('./templets/mask/O_mountain_mask2.png').convert('L') - blank = Image.open('./templets/O_mountain.png').convert('RGBA').resize((1920, 1080)) - blank2 = Image.new('RGBA',(1920,1080)) - - K401 = Image.open('./.gen/401K_Contribution.png') - K401 = cords.scale(K401,0.378) - blank.paste(K401, cords.center_on(K401,(386,806)),K401) - - K401C = Image.open('./.gen/401K_Catch_Up.png') - K401C = cords.scale(K401C,0.378) - blank2.paste(K401C, cords.center_on(K401C,(557,806)),K401C) - - IRAC = Image.open('./.gen/Roth_Catch_Up.png') - IRAC = cords.scale(IRAC,0.265) - blank.paste(IRAC, cords.center_on(IRAC,(1177,855)),IRAC) - - IRA = Image.open('./.gen/Roth_IRA.png') - IRA = cords.scale(IRA,0.265) - blank2.paste(IRA, cords.center_on(IRA,(1425,855)),IRA) - - - if wb["O Mountain"]["B16"].value: - HSA = Image.open('./.gen/HSA_Contribution.png') - HSA = cords.scale(HSA,0.265) - blank2.paste(HSA, cords.center_on(HSA,(764,445)),HSA) - else: - FSA = Image.open('./.gen/FSA_Contribution.png') - FSA = cords.scale(FSA,0.265) - blank2.paste(FSA, cords.center_on(FSA,(764,445)),FSA) - - - - blank2 = Image.composite(blank2, Image.new('RGBA',(1920,1080)), O_Mountain_Mask2) - blank = Image.alpha_composite(blank,blank2) - - #Mask and combine - Image.composite(blank, O_Mountain, O_Mountain_Mask).save("./gen/O_mountian.png") - - -def gen_Oh_I_Mountain(wb): - ## Oh I Mountain Image Code - Oh_I_Mountain = Image.open('./templets/Oh_I_mountain.png').convert('RGBA').resize((1920, 1080)) - Oh_I_Mountain_Mask = Image.open('./templets/mask/Oh_I_mountain_mask.png').convert('L') - blank = Image.open('./templets/Oh_I_mountain.png').convert('RGBA').resize((1920, 1080)) - - Goal = Image.open('./.gen/Monthly_Income_Goal.png') - Goal = cords.scale(Goal,0.68) - blank.paste(Goal, cords.center_on(Goal,(946,673)),Goal) - - #Mask and combine - Image.composite(blank, Oh_I_Mountain, Oh_I_Mountain_Mask).save("./gen/Oh_I_mountain.png") diff --git a/main.py b/main.py index e8732a3..5ad8cfa 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,10 @@ -from openpyxl import load_workbook +from openpyxl import Workbook, load_workbook +import numpy as np import os import shutil import graphs import cords -import imageGen +from PIL import Image #Setup directorys @@ -27,15 +28,75 @@ graphs.gen_FSA_Contribution(wb) graphs.gen_Oh_I_Mountain(wb) -# Image Work -imageGen.gen_I_Mountain(wb) -imageGen.gen_O_Mountain(wb) -imageGen.gen_Oh_I_Mountain(wb) +### Image Work + +## I Mountain image code +I_Mountain = Image.open('./templets/I_mountain.png').convert('RGBA').resize((1920, 1080)) +I_Mountain_Mask = Image.open('./templets/mask/I_mountain_mask.png').convert('L') +blank = Image.open('./templets/I_mountain.png').convert('RGBA').resize((1920, 1080)) + +EF = Image.open('./.gen/EF.png') +EF = cords.scale(EF,0.265) +blank.paste(EF, cords.center_on(EF,(463,805)),EF) + +DI = Image.open('./.gen/DI.png') +DI = cords.scale(DI,0.265) +blank.paste(DI, cords.center_on(DI,(698,450)),DI) + +LI = Image.open('./.gen/LI.png') +LI = cords.scale(LI,0.265) +blank.paste(LI, cords.center_on(LI,(1472,802)),LI) + +#Mask and combine +Image.composite(blank, I_Mountain, I_Mountain_Mask).save("./gen/I_mountain.png") -#im_1.save(r'C:\Users\Ron\Desktop\Test\my_images.pdf', save_all=True, append_images=image_list) +## O Mountain Image Code +O_Mountain = Image.open('./templets/O_mountain.png').convert('RGBA').resize((1920, 1080)) +O_Mountain_Mask = Image.open('./templets/mask/O_mountain_mask.png').convert('L') +O_Mountain_Mask1 = Image.open('./templets/mask/O_mountain_mask1.png').convert('L') +O_Mountain_Mask2 = Image.open('./templets/mask/O_mountain_mask2.png').convert('L') +blank = Image.open('./templets/O_mountain.png').convert('RGBA').resize((1920, 1080)) +blank2 = Image.new('RGBA',(1920,1080)) + +K401 = Image.open('./.gen/401K_Contribution.png') +K401 = cords.scale(K401,0.378) +blank.paste(K401, cords.center_on(K401,(386,806)),K401) + +K401C = Image.open('./.gen/401K_Catch_Up.png') +K401C = cords.scale(K401C,0.378) +blank2.paste(K401C, cords.center_on(K401C,(557,806)),K401C) + +IRAC = Image.open('./.gen/Roth_Catch_Up.png') +IRAC = cords.scale(IRAC,0.265) +blank.paste(IRAC, cords.center_on(IRAC,(1177,855)),IRAC) + +IRA = Image.open('./.gen/Roth_IRA.png') +IRA = cords.scale(IRA,0.265) +blank2.paste(IRA, cords.center_on(IRA,(1425,855)),IRA) + +# FSA = Image.open('./.gen/FSA_Contribution.png') +# FSA = cords.scale(FSA,0.265) +# blank2.paste(FSA, cords.center_on(FSA,(1425,855)),FSA) + +blank2 = Image.composite(blank2, Image.new('RGBA',(1920,1080)), O_Mountain_Mask2) +blank = Image.alpha_composite(blank,blank2) + +#blank.save('blank.png') +Image.composite(blank, O_Mountain, O_Mountain_Mask).save("./gen/O_mountian.png") + + +## Oh I Mountain Image Code +Oh_I_Mountain = Image.open('./templets/Oh_I_mountain.png').convert('RGBA').resize((1920, 1080)) +Oh_I_Mountain_Mask = Image.open('./templets/mask/Oh_I_mountain_mask.png').convert('L') +blank = Image.open('./templets/Oh_I_mountain.png').convert('RGBA').resize((1920, 1080)) + +Goal = Image.open('./.gen/Monthly_Income_Goal.png') +Goal = cords.scale(Goal,0.68) +blank.paste(Goal, cords.center_on(Goal,(946,673)),Goal) + +#Mask and combine +Image.composite(blank, Oh_I_Mountain, Oh_I_Mountain_Mask).save("./gen/Oh_I_mountain.png") #Remove directorys shutil.rmtree('./.gen') - -