diff --git a/README.md b/README.md index aa4eb75..11c79a9 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,5 @@ This tool automaticly composites graphs onto your slides for you. Just edit the ## Usage (Python must be installed) 1. Download tool and extract the files 2. Enter folder -3. Intall dependencies with ``` pip install openpyxl PIL ``` -4. Run ```python main.py``` -5. Check the **gen** folder for the outputed images \ No newline at end of file +3. Click run.bat +4. check the **gen** folder for the generated slides \ No newline at end of file diff --git a/graphs.py b/graphs.py index 6a8f3db..b92be55 100644 --- a/graphs.py +++ b/graphs.py @@ -1,9 +1,14 @@ import matplotlib.pyplot as plt +import imageGen def currency_fmt(num): - return ("$"+("{:0,.2f}".format(float(num))))[:-3] # Cents are dropped from diplay + if num < 1000: + return ("$"+("{:0,.2f}".format(float(num))))[:-3] + if num > 1000000: + return "$"+imageGen.format_frendly_M(num) + return "$"+imageGen.format_frendly(num) -def make_basic_greenred(name, v1, v2): +def make_basic_greenred(name, v1, v2, font=24): title = (name) width = 0.2 bottom = 0 @@ -15,12 +20,12 @@ def make_basic_greenred(name, v1, v2): #make fist bar and offset the bottom line by it p = ax.bar(title, [v1], width, bottom=bottom, align='center',color='tab:green') - ax.bar_label(p, label_type='center', fmt=currency_fmt) + ax.bar_label(p, label_type='center', fmt=currency_fmt, font={'size':font}) bottom += v1 #make second bar graph p = ax.bar(title, [v2], width, bottom=bottom, align='center', color='tab:red') - ax.bar_label(p, label_type='center', fmt=currency_fmt) + ax.bar_label(p, label_type='center', fmt=currency_fmt, font={'size':font}) return fig @@ -83,13 +88,13 @@ def gen_Roth_Catch_Up(wb): # Generates graph for 401K contribution def gen_401K_Contribution(wb): - fig = make_basic_greenred("401K Contribution",wb["O Mountain"]["A6"].value,wb["O Mountain"]["C6"].value) + fig = make_basic_greenred("401K Contribution",wb["O Mountain"]["A6"].value,wb["O Mountain"]["C6"].value,15) fig.savefig('./.gen/401K_Contribution.png',dpi=300) # Generates graph for 401K contribution Catch Up def gen_401K_Catch_Up(wb): - fig = make_basic_greenred("401K Catch Up",wb["O Mountain"]["A8"].value,wb["O Mountain"]["C8"].value) + fig = make_basic_greenred("401K Catch Up",wb["O Mountain"]["A8"].value,wb["O Mountain"]["C8"].value,15) fig.savefig('./.gen/401K_Catch_Up.png',dpi=300) diff --git a/imageGen.py b/imageGen.py index 3339493..6d4b9b7 100644 --- a/imageGen.py +++ b/imageGen.py @@ -130,3 +130,8 @@ def gen_Oh_I_Mountain(wb): def format_frendly(num): T = num / 1000 return str(int(np.floor(T)))+"K" + +def format_frendly_M(num): + T = num / 1000000 + return str(int(round(T,1)))+"M" + #return str(round(T,1))+"M" diff --git a/templets/O_mountain_old.png b/templets/O_mountain_old.png deleted file mode 100644 index 3510661..0000000 Binary files a/templets/O_mountain_old.png and /dev/null differ