Clearer error handling, rounding values to nearest stop

src/widgets/aperture_priority_page.py

@@ -26,25 +26,15 @@ class AperturePriorityPage(Gtk.Box):
     __gtype_name__ = 'AperturePriorityPage'
 
     # Values of aperture dropdown entries defined in the .ui file
-    __aperture_priority_speed_dropdown_values = [
-        1/32,
-        1/22,
-        1/16,
-        1/11,
-        1/8,
-        1/5.6,
-        1/4,
-        1/2.8,
-        1/2,
-        1/1.4
-    ]
+    # TODO: Load dropdown strings from APERTURE_VALUES.values()
+    __aperture_priority_speed_dropdown_values = list(EVCalculator.APERTURE_VALUES.keys())
 
     # Widgets
     aperture_priority_aperture_dropdown = Gtk.Template.Child()
     aperture_priority_time_label = Gtk.Template.Child()
 
     __sensorValue = None
-    __isoSpeed = 100
+    __isoSpeed = EVCalculator.DEFAULT_ISO_SPEED
 
     def onValuesChanged(self, isoSpeed: int, sensorValue: float, sensorUnit: str):
         # Check the unit is absolute ("lux")
@@ -64,9 +54,16 @@ class AperturePriorityPage(Gtk.Box):
     def updateView(self):
         apertureValue = self.__aperture_priority_speed_dropdown_values[self.aperture_priority_aperture_dropdown.get_selected()]
         shutterSpeed = EVCalculator.calcShutterSpeed(self.__isoSpeed, self.__sensorValue, apertureValue)
-        # TODO: Round shutter speed value to nearest existing value and set label color to red if outside 1 stop range
-        self.aperture_priority_time_label.set_label("1/ {:.5f}".format(shutterSpeed))
+
+        # Round shutter speed value to nearest existing value and set label color to red if outside 1 stop range
+        [nearestValue, isInsideRange] = EVCalculator.toNearestStr(shutterSpeed, EVCalculator.SHUTTER_SPEED_VALUES)
+
+        if isInsideRange:
+            self.aperture_priority_time_label.set_label(nearestValue)
+        else:
+            self.aperture_priority_time_label.set_label("<span foreground=\"red\">{}</span>".format(nearestValue))
 
     @Gtk.Template.Callback()
     def onApertureChanged(self, dropDown: Gtk.DropDown, _: any):
         self.updateView()
+

src/widgets/aperture_priority_page.ui

@@ -30,6 +30,7 @@
     <child>
       <object class="GtkLabel" id="aperture_priority_time_label">
         <property name="label" translatable="no">--s</property>
+        <property name="use-markup">true</property>
         <style>
           <class name="lumos-big-result"/>
         </style>

src/widgets/time_priority_page.py

@@ -52,7 +52,7 @@ class TimePriorityPage(Gtk.Box):
     time_priority_aperture_label = Gtk.Template.Child()
 
     __sensorValue = None
-    __isoSpeed = 100
+    __isoSpeed = EVCalculator.DEFAULT_ISO_SPEED
 
     def onValuesChanged(self, isoSpeed: int, sensorValue: float, sensorUnit: str):
         # Check the unit is absolute ("lux")
@@ -71,8 +71,13 @@ class TimePriorityPage(Gtk.Box):
     def updateView(self):
         shutterSpeed = self.__time_priority_speed_dropdown_values[self.time_priority_speed_dropdown.get_selected()]
         apertureValue = EVCalculator.calcAperture(self.__isoSpeed, self.__sensorValue, shutterSpeed)
-        # TODO: Round aperture value to nearest existing value and set label color to red if outside 1 stop range
-        self.time_priority_aperture_label.set_label("f/ {:.2f}".format(apertureValue))
+
+        # Round aperture value to nearest existing value and set label color to red if outside range
+        [nearestValue, isInsideRange] = EVCalculator.toNearestStr(shutterSpeed, EVCalculator.APERTURE_VALUES)
+        if isInsideRange:
+            self.time_priority_aperture_label.set_label(nearestValue)
+        else:
+            self.time_priority_aperture_label.set_label("<span foreground=\"red\">{}</span>".format(nearestValue))
 
     @Gtk.Template.Callback()
     def onShutterSpeedChanged(self, dropDown: Gtk.DropDown, _: any):

src/widgets/time_priority_page.ui

@@ -30,6 +30,7 @@
     <child>
       <object class="GtkLabel" id="time_priority_aperture_label">
         <property name="label" translatable="no">f/--</property>
+        <property name="use-markup">true</property>
         <style>
           <class name="lumos-big-result"/>
         </style>