Default to kPa for Pressure

waynedgrant · Apr 23, 2015 · 33f600d · 33f600d
1 parent b7bf7d8
commit 33f600d
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 23 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -2,7 +2,7 @@ pifacecad-wdlive is licensed under the MIT License:
 
 > The MIT License (MIT)
 > 
-> Copyright (c) 2014 Wayne D Grant
+> Copyright (c) 2015 Wayne D Grant
 >
 > Permission is hereby granted, free of charge, to any person obtaining a copy
 > of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # pifacecad-wdlive
 
-Copyright © 2014 Wayne D Grant
+Copyright © 2015 Wayne D Grant
 
 Licensed under the MIT License
 

diff --git a/__init__.py b/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 __author__ = "Wayne D Grant (www.waynedgrant.com)"

diff --git a/clientraw.py b/clientraw.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 from measures import Pressure

diff --git a/cyclical.py b/cyclical.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 

diff --git a/formatters.py b/formatters.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 from decimal import *

diff --git a/measures.py b/measures.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 from decimal import *

diff --git a/pifacecad-wdlive.py b/pifacecad-wdlive.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 import pifacecad

diff --git a/settings.py b/settings.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 from cyclical import Cyclical

diff --git a/test/test_clientraw.py b/test/test_clientraw.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 import unittest

diff --git a/test/test_cyclical.py b/test/test_cyclical.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 import unittest

diff --git a/test/test_formatters.py b/test/test_formatters.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 import unittest

diff --git a/test/test_measures.py b/test/test_measures.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 import unittest

diff --git a/test/test_settings.py b/test/test_settings.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 import unittest
@@ -23,9 +23,9 @@ def test_weather_item_type(self):
 
     def test_pressure_unit(self):
         testee = Settings()
-        self.assertEqual(PressureUnit.HECTOPASCALS, testee.get_pressure_unit())
+        self.assertEqual(PressureUnit.KILOPASCALS, testee.get_pressure_unit())
         testee.change_pressure_unit()
-        self.assertEqual(PressureUnit.INCHES_OF_MERCURY, testee.get_pressure_unit())
+        self.assertEqual(PressureUnit.MILLIBARS, testee.get_pressure_unit())
 
     def test_rainfall_unit(self):
         testee = Settings()

diff --git a/test/test_weatheritems.py b/test/test_weatheritems.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 import unittest
@@ -30,7 +30,7 @@ def __gen_populated_client_raw_str(self):
     def test_summary(self):
         weather_item = self.__get_weather_item(WeatherItemType.SUMMARY)
         self.assertEqual("25.4°C ➘ 97% ➚", weather_item.get_line1())
-        self.assertEqual("1019.7 hPa ➙", weather_item.get_line2())
+        self.assertEqual("101.97 kPa ➙", weather_item.get_line2())
 
     def test_average_wind(self):
         weather_item = self.__get_weather_item(WeatherItemType.AVERAGE_WIND)
@@ -90,7 +90,7 @@ def test_rainfall_rate(self):
     def test_surface_pressure(self):
         weather_item = self.__get_weather_item(WeatherItemType.SURFACE_PRESSURE)
         self.assertEqual("Surface Pressure", weather_item.get_line1())
-        self.assertEqual("1019.7 hPa ➙", weather_item.get_line2())
+        self.assertEqual("101.97 kPa ➙", weather_item.get_line2())
 
     def test_temperature(self):
         weather_item = self.__get_weather_item(WeatherItemType.TEMPERATURE)

diff --git a/units.py b/units.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 
@@ -11,8 +11,8 @@ class PressureUnit:
     MILLMETRES_OF_MERCURY = 5
 
     def get_all(self):
-        return [self.HECTOPASCALS, self.INCHES_OF_MERCURY, self.KILOPASCALS,
-                self.MILLIBARS, self.MILLMETRES_OF_MERCURY]
+        return [self.KILOPASCALS, self.MILLIBARS, self.MILLMETRES_OF_MERCURY,
+                self.HECTOPASCALS, self.INCHES_OF_MERCURY, ]
 
 
 class RainfallUnit:

diff --git a/weatheritems.py b/weatheritems.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Wayne D Grant (www.waynedgrant.com)
+# Copyright 2015 Wayne D Grant (www.waynedgrant.com)
 # Licensed under the MIT License
 
 from formatters import ForecastFormatter