benedikt/rki-impfparser
1
0
Fork 0
Code Releases Activity

fix: Refactored saving plots into seperate function

Browse source
This commit is contained in:
Benedikt Bastin 2021-03-23 11:51:07 +01:00
parent 5b8d0499c5
commit bbea5ae532
1 changed files with 18 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

84
plot.py
View file

@ -286,6 +286,14 @@ else:
os.mkdir(archive_folder) os.mkdir(archive_folder)
def save_plot(archive_plot_filename, latest_plot_filename):
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
print('Created plot {} as pdf and png'.format(archive_plot_filename))
def plot_vaccination_bar_graph_total_time(): def plot_vaccination_bar_graph_total_time():
@ -319,14 +327,9 @@ def plot_vaccination_bar_graph_total_time():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Tägliche Impfungen') ax.set_ylabel('Tägliche Impfungen')
save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_vaccination_bar_graph_total_time() plot_vaccination_bar_graph_total_time()
@ -401,15 +404,9 @@ def plot_vaccination_bar_graph_total_time_by_week():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Wöchentliche Impfungen') ax.set_ylabel('Wöchentliche Impfungen')
save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_vaccination_bar_graph_total_time_by_week() plot_vaccination_bar_graph_total_time_by_week()
def plot_vaccination_bar_graph_total_time_two_bars(): def plot_vaccination_bar_graph_total_time_two_bars():
@ -447,15 +444,9 @@ def plot_vaccination_bar_graph_total_time_two_bars():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Tägliche Impfungen') ax.set_ylabel('Tägliche Impfungen')
save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_vaccination_bar_graph_total_time_two_bars() plot_vaccination_bar_graph_total_time_two_bars()
def plot_vaccination_bar_graph_compare_both_vaccinations(): def plot_vaccination_bar_graph_compare_both_vaccinations():
@ -494,15 +485,9 @@ def plot_vaccination_bar_graph_compare_both_vaccinations():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Tägliche Impfungen') ax.set_ylabel('Tägliche Impfungen')
save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_vaccination_bar_graph_compare_both_vaccinations() plot_vaccination_bar_graph_compare_both_vaccinations()
def plot_cumulative_two_vaccinations(): def plot_cumulative_two_vaccinations():
@ -540,15 +525,9 @@ def plot_cumulative_two_vaccinations():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Kumulative Impfungen') ax.set_ylabel('Kumulative Impfungen')
save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_cumulative_two_vaccinations() plot_cumulative_two_vaccinations()
@ -588,15 +567,9 @@ def plot_cumulative_two_vaccinations_percentage():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Kumulative Impfungen') ax.set_ylabel('Kumulative Impfungen')
save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_cumulative_two_vaccinations_percentage() plot_cumulative_two_vaccinations_percentage()
@ -638,15 +611,9 @@ def plot_people_between_first_and_second():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Personen zwischen Erst- und Zweitimpfung') ax.set_ylabel('Personen zwischen Erst- und Zweitimpfung')
save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.pdf')
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_people_between_first_and_second() plot_people_between_first_and_second()
@ -689,14 +656,9 @@ def plot_vaccination_rate():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Impfrate [Impfungen/Tag]') ax.set_ylabel('Impfrate [Impfungen/Tag]')
plt.savefig(archive_plot_filename + '.pdf') save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_vaccination_rate() plot_vaccination_rate()
def plot_vaccination_done_days(): def plot_vaccination_done_days():
@ -736,14 +698,9 @@ def plot_vaccination_done_days():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Tage, bis 70 % erreicht sind') ax.set_ylabel('Tage, bis 70 % erreicht sind')
plt.savefig(archive_plot_filename + '.pdf') save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_vaccination_done_days() plot_vaccination_done_days()
def plot_vaccination_done_dates(): def plot_vaccination_done_dates():
@ -793,14 +750,9 @@ def plot_vaccination_done_dates():
ax.set_xlabel('Datum') ax.set_xlabel('Datum')
ax.set_ylabel('Datum, an dem 70 % erreicht sind') ax.set_ylabel('Datum, an dem 70 % erreicht sind')
plt.savefig(archive_plot_filename + '.pdf') save_plot(archive_plot_filename, latest_plot_filename)
plt.savefig(archive_plot_filename + '.png')
plt.savefig(latest_plot_filename + '.pdf')
plt.savefig(latest_plot_filename + '.png')
plt.close() plt.close()
print('Created plot {} as pdf and png'.format(archive_plot_filename))
plot_vaccination_done_dates() plot_vaccination_done_dates()
def render_dashboard(): def render_dashboard():