From b2c70d5c8023bf45b0d64f86ec8d708e0bde473e Mon Sep 17 00:00:00 2001
From: Daniele Verducci <daniele.verducci@ichibi.eu>
Date: Sat, 4 May 2024 07:50:00 +0200
Subject: [PATCH] Update time priority page on shutter speed dropdown change

---
 src/widgets/time_priority_page.py | 25 ++++++++++++++++---------
 src/widgets/time_priority_page.ui |  1 +
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/widgets/time_priority_page.py b/src/widgets/time_priority_page.py
index b651c36..cb033c1 100644
--- a/src/widgets/time_priority_page.py
+++ b/src/widgets/time_priority_page.py
@@ -26,7 +26,7 @@ class TimePriorityPage(Gtk.Box):
     __gtype_name__ = 'TimePriorityPage'
 
     # Values of time dropdown entries defined in the .ui file
-    time_priority_speed_dropdown_values = [
+    __time_priority_speed_dropdown_values = [
         1/4000,
         1/2000,
         1/1000,
@@ -51,22 +51,29 @@ class TimePriorityPage(Gtk.Box):
     time_priority_speed_dropdown = Gtk.Template.Child()
     time_priority_aperture_label = Gtk.Template.Child()
 
-    lastSensorValue = None
+    __sensorValue = None
+    __isoSpeed = 100
 
     def onValuesChanged(self, isoSpeed: int, sensorValue: float, sensorUnit: str):
         # Check the unit is absolute ("lux")
         if sensorUnit != "lux":
             return
 
-        self.lastSensorValue = sensorValue
-        self.updateView(isoSpeed, sensorValue)
+        self.__sensorValue = sensorValue
+        self.__isoSpeed = isoSpeed
+        self.updateView()
 
     def onIsoSpeedChanged(self, isoSpeed: int):
-        if self.lastSensorValue:
-            self.updateView(isoSpeed, self.lastSensorValue)
+        self.__isoSpeed = isoSpeed
+        if self.__sensorValue:
+            self.updateView()
 
-    def updateView(self, isoSpeed: int, sensorValue: float):
-        shutterSpeed = self.time_priority_speed_dropdown_values[self.time_priority_speed_dropdown.get_selected()]
-        apertureValue = EVCalculator.calcAperture(isoSpeed, sensorValue, shutterSpeed)
+    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))
+
+    @Gtk.Template.Callback()
+    def onShutterSpeedChanged(self, dropDown: Gtk.DropDown, _: any):
+        self.updateView()
diff --git a/src/widgets/time_priority_page.ui b/src/widgets/time_priority_page.ui
index e1f9437..f4fcfd1 100644
--- a/src/widgets/time_priority_page.ui
+++ b/src/widgets/time_priority_page.ui
@@ -68,6 +68,7 @@
             </items>
           </object>
         </property>
+        <signal name="notify::selected-item" handler="onShutterSpeedChanged"/>
       </object>
     </child>
   </template>