Updating to newest stats

2020-07-20 13:44:07 +02:00
parent 982e0ba1da
commit 9a55031e89
3 changed files with 30972 additions and 10541 deletions
@@ -21,7 +21,7 @@ deaths
 countriesAndTerritories
 geoId
 countryterritoryCode
-popData2018
+popData2019
 """
 from datetime import datetime, timedelta

@@ -345,7 +345,7 @@ class Analyser:
 		mask = (timeData['dateRep'] == date)
 		timeData = timeData.loc[mask]
 		timeData = timeData.sort_values('countriesAndTerritories')
-		timeData['casesPerMillion'] = ((timeData['totalCases'] / timeData['popData2018']) * 1000000)
+		timeData['casesPerMillion'] = ((timeData['totalCases'] / timeData['popData2019']) * 1000000)
 		largestData = timeData.nlargest(20, 'casesPerMillion')

 		if country not in largestData['countriesAndTerritories'].unique():
@@ -379,7 +379,7 @@ class Analyser:
 		mask = (timeData['dateRep'] == date)
 		timeData = timeData.loc[mask]
 		timeData = timeData.sort_values('countriesAndTerritories')
-		timeData['deathsPerMillion'] = ((timeData['totalDeaths'] / timeData['popData2018']) * 1000000)
+		timeData['deathsPerMillion'] = ((timeData['totalDeaths'] / timeData['popData2019']) * 1000000)
 		largestData = timeData.nlargest(20, 'deathsPerMillion')

 		if country not in largestData['countriesAndTerritories'].unique():
@@ -30,6 +30,7 @@ class UserInterface(QWidget):

 		# Plot DPI Settings
 		self.plotDpi = screen_width / 20
+		print(screen_height)

 		# Layout boxes
 		self.header_box = QHBoxLayout()