From a2facca43e544937886e5e91011a87cf7dc482b8 Mon Sep 17 00:00:00 2001
From: jaknapper <jaknapper@hotmail.com>
Date: Thu, 2 Oct 2025 16:16:32 +0100
Subject: [PATCH 1/3] Clean up primary vs secondary buttons

---
 src/openflexure_microscope_server/things/camera/picamera.py  | 5 +++++
 .../tabContentComponents/controlComponents/paneControl.vue   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index 0158c56e..6bc089fc 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -885,16 +885,19 @@ class StreamingPiCamera2(BaseCamera):
                 self.auto_expose_from_minimum,
                 submit_label="Auto Gain & Shutter Speed",
                 can_terminate=False,
+                button_primary=False,
             ),
             action_button_for(
                 self.calibrate_white_balance,
                 submit_label="Auto White Balance",
                 can_terminate=False,
+                button_primary=False,
             ),
             action_button_for(
                 self.calibrate_lens_shading,
                 submit_label="Auto Flat Field Correction",
                 can_terminate=False,
+                button_primary=False,
                 requires_confirmation=True,
                 confirmation_message=(
                     "Is the microscope looking at an evenly illuminated, empty field "
@@ -912,11 +915,13 @@ class StreamingPiCamera2(BaseCamera):
                 self.flat_lens_shading,
                 submit_label="Disable Flat Field Correction",
                 can_terminate=False,
+                button_primary=False,
             ),
             action_button_for(
                 self.reset_lens_shading,
                 submit_label="Reset Flat Field Correction",
                 can_terminate=False,
+                button_primary=False,
             ),
         ]
 
diff --git a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
index b4e57b2b..82ae71e8 100644
--- a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
+++ b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
@@ -119,7 +119,7 @@
                   action="fast_autofocus"
                   :submit-data="{ dz: 2000 }"
                   :submit-label="'Autofocus'"
-                  :button-primary="false"
+                  :button-primary="true"
                   :submit-on-event="'globalFastAutofocusEvent'"
                   @taskStarted="isAutofocusing = 1"
                   @finished="

From 7d794d1a22a342588fd5f8f7988cc593b7e29885 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 7 Oct 2025 10:52:06 +0100
Subject: [PATCH 2/3] Stop showing other picamera calibration buttons in
 calibration wizard

---
 .../things/camera/picamera.py                        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index 6bc089fc..40f28f8b 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -881,6 +881,12 @@ class StreamingPiCamera2(BaseCamera):
                 notify_on_success=True,
                 success_message="Finished recalibration.",
             ),
+        ]
+
+    @lt.thing_property
+    def secondary_calibration_actions(self) -> list[ActionButton]:
+        """The calibration actions that appear only in settings panel."""
+        return [
             action_button_for(
                 self.auto_expose_from_minimum,
                 submit_label="Auto Gain & Shutter Speed",
@@ -905,12 +911,6 @@ class StreamingPiCamera2(BaseCamera):
                     "images captured afterwards."
                 ),
             ),
-        ]
-
-    @lt.thing_property
-    def secondary_calibration_actions(self) -> list[ActionButton]:
-        """The calibration actions that appear only in settings panel."""
-        return [
             action_button_for(
                 self.flat_lens_shading,
                 submit_label="Disable Flat Field Correction",

From 92b14265d1632ad0a71eb6f62bb91f65fd50b78d Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 7 Oct 2025 10:59:18 +0100
Subject: [PATCH 3/3] Update picamera test results

---
 picamera_coverage.zip | Bin 54038 -> 54038 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/picamera_coverage.zip b/picamera_coverage.zip
index 95750fa82ad8244c6dc290c616aae4653d56c6ff..d1d27c2d3a5a54b3a3986031313001f9d9ca3036 100644
GIT binary patch
delta 240
zcmbQXjCtBJW}yIYW)=|!5O4{1k1k*1y<ww}N`p`?1OHF{kNng4oB5;p&hWMJ<!*Kq
z2<4kRuP=d}hmDnyvq@qyYk$7P0gz4xW(Ed{11?+A8JHLt7?>Lvc{nzA_pf*002w*|
zZ|knfP8Tj}m>8rPS)^Gcr5YO~8zq{VSSFgMT39Bgq!}BU8(5keq$MR;7+I#KO}=o!
zW^(z(o3_TOmX@aGW`;@0CdnpgDP{%+CWaQqX-OvL2Ii(Irlv+_7RF|lhDx;o-i%Bl
R%&5MY+<VCaVgK1no&eV(NZ|kg

delta 238
zcmbQXjCtBJW}yIYW)=|!5ZKvl6rH&Ey7NXMl?I_a2L7M?ANi;8H}gmHo#kue%iHWI
z5XLuoZeIdBHybM>XOq}umi~Nk1_lNR1_=g+0}N`5Y?%eXT%H7n&E5U$9XLQH?n|tf
zo$PesqPl^hsYSA>S*n4BS*k%=YO;~3QL3>?ijkq2rLl>*Nn(nLr9q;Z+2r#VY$umr
zylI=9Xl$8moM@7qYHV(3mTYchYGROPVVq`=Y+_=OYGz?<V33$(nygeC;LXS+!i?&N
O$-S2>5Z0f)<Ou)<VMnb1