⚡ Saving the graphs as file
- WIP, Saved graphs are currently empty pictures for some reason
This commit is contained in:
parent
b8c9b58cc2
commit
e5be34dd55
18
Analyser.py
18
Analyser.py
|
@ -56,18 +56,18 @@ class Analyser:
|
||||||
countryTimeData = countryTimeData.sort_values('dateRep')
|
countryTimeData = countryTimeData.sort_values('dateRep')
|
||||||
countryTimeData['cases'] = countryTimeData['cases'].cumsum()
|
countryTimeData['cases'] = countryTimeData['cases'].cumsum()
|
||||||
|
|
||||||
print(countryTimeData.head())
|
print(countryTimeData)
|
||||||
|
|
||||||
countryTimeData.plot(ax=ax, x='dateRep', y='cases')
|
countryTimeData.plot(ax=ax, x='dateRep', y='cases')
|
||||||
|
|
||||||
plt.show(block=True)
|
plt.show(block=True)
|
||||||
|
filePath = ('graphs/casesGraph_' + country + '_' + datetime.now().strftime('%Y-%m-%d'))
|
||||||
|
plt.savefig(filePath)
|
||||||
|
|
||||||
# TODO Change return
|
return filePath
|
||||||
return 'abc'
|
|
||||||
else:
|
else:
|
||||||
print('Unknown country')
|
print('Unknown country')
|
||||||
# TODO Change return
|
return '-1'
|
||||||
return 'abc'
|
|
||||||
|
|
||||||
def getCaseIncreaseGraph(self, country):
|
def getCaseIncreaseGraph(self, country):
|
||||||
"""
|
"""
|
||||||
|
@ -90,13 +90,13 @@ class Analyser:
|
||||||
countryTimeData.plot(ax=ax, x='dateRep', y='cases')
|
countryTimeData.plot(ax=ax, x='dateRep', y='cases')
|
||||||
|
|
||||||
plt.show(block=True)
|
plt.show(block=True)
|
||||||
|
filePath = ('graphs/casesIncreaseGraph_' + country + '_' + datetime.now().strftime('%Y-%m-%d'))
|
||||||
|
plt.savefig(filePath)
|
||||||
|
|
||||||
# TODO Change return
|
return filePath
|
||||||
return 'abc'
|
|
||||||
else:
|
else:
|
||||||
print('Unknown country')
|
print('Unknown country')
|
||||||
# TODO Change return
|
return '-1'
|
||||||
return 'abc'
|
|
||||||
|
|
||||||
def getTotalCases(self, country, date=datetime.now().strftime('%Y-%m-%d')) -> int:
|
def getTotalCases(self, country, date=datetime.now().strftime('%Y-%m-%d')) -> int:
|
||||||
"""
|
"""
|
||||||
|
|
1
Main.py
1
Main.py
|
@ -13,4 +13,5 @@ if __name__ == '__main__':
|
||||||
country = input('What country do you want the graph for: ')
|
country = input('What country do you want the graph for: ')
|
||||||
analyser.getCasesGraph(country, start_date='2020-02-14')
|
analyser.getCasesGraph(country, start_date='2020-02-14')
|
||||||
print(analyser.getTotalCases(country))
|
print(analyser.getTotalCases(country))
|
||||||
|
analyser.getCaseIncreaseGraph(country)
|
||||||
fetcher.updateStatsFile()
|
fetcher.updateStatsFile()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user