m.giller/E-Paper-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

Aviation Units #7

Merged
dicijr merged 3 commits from master into master 2019-05-15 08:40:40 +02:00
Conversation 1 Commits 3 Files changed 4 +8
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d11c9dd833 - Show all commits

4
Calendar/WeatherColumnDesign.py
View file

@ -31,6 +31,10 @@ class WeatherColumnDesign (DesignEntity):
temperature = forecast.air_temperature + " " + self.__get_unit__(("°C", "°F"))
humidity = forecast.air_humidity + "%"
if self.forecast.units== "aviation":
if len(forecast.wind_deg)==1:
forecast.wind_deg = "00" + forecast.wind_deg
elif len(forecast.wind_deg)==2:
forecast.wind_deg = "0" + forecast.wind_deg
if int(forecast.wind_speed)<10:
windspeed = forecast.wind_deg + "@" + "0" + forecast.wind_speed + self.__get_unit__(("", "")) #added degrees, if wind<10 add a 0 to make two digit
else:

4
Calendar/WeatherHeaderDesign.py
View file

@ -30,6 +30,10 @@ class WeatherHeaderDesign (DesignEntity):
temperature = cur_weather.air_temperature + " " + self.__get_unit__(("°C", "°F"))
if units== "aviation": #pick up aviation
if len(forecast.wind_deg)==1: #if deg is 2, add two zeros for format
forecast.wind_deg = "00" + forecast.wind_deg
elif len(forecast.wind_deg)==2:
forecast.wind_deg = "0" + forecast.wind_deg
if int(cur_weather.wind_speed)<10:
windspeed = cur_weather.wind_deg + "@" + "0" + cur_weather.wind_speed + self.__get_unit__(("", "")) #added degrees, if wind<10 add a 0 to make two digit
else: