rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up primary vs secondary buttons

Browse source
This commit is contained in:
jaknapper 2025-10-02 16:16:32 +01:00
parent 4345f8c336
commit a2facca43e
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/openflexure_microscope_server/things/camera/picamera.py
View file

@ -885,16 +885,19 @@ class StreamingPiCamera2(BaseCamera):
self.auto_expose_from_minimum, self.auto_expose_from_minimum,
submit_label="Auto Gain & Shutter Speed", submit_label="Auto Gain & Shutter Speed",
can_terminate=False, can_terminate=False,
button_primary=False,
), ),
action_button_for( action_button_for(
self.calibrate_white_balance, self.calibrate_white_balance,
submit_label="Auto White Balance", submit_label="Auto White Balance",
can_terminate=False, can_terminate=False,
button_primary=False,
), ),
action_button_for( action_button_for(
self.calibrate_lens_shading, self.calibrate_lens_shading,
submit_label="Auto Flat Field Correction", submit_label="Auto Flat Field Correction",
can_terminate=False, can_terminate=False,
button_primary=False,
requires_confirmation=True, requires_confirmation=True,
confirmation_message=( confirmation_message=(
"Is the microscope looking at an evenly illuminated, empty field " "Is the microscope looking at an evenly illuminated, empty field "
@ -912,11 +915,13 @@ class StreamingPiCamera2(BaseCamera):
self.flat_lens_shading, self.flat_lens_shading,
submit_label="Disable Flat Field Correction", submit_label="Disable Flat Field Correction",
can_terminate=False, can_terminate=False,
button_primary=False,
), ),
action_button_for( action_button_for(
self.reset_lens_shading, self.reset_lens_shading,
submit_label="Reset Flat Field Correction", submit_label="Reset Flat Field Correction",
can_terminate=False, can_terminate=False,
button_primary=False,
), ),
] ]

2
webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
View file

@ -119,7 +119,7 @@
action="fast_autofocus" action="fast_autofocus"
:submit-data="{ dz: 2000 }" :submit-data="{ dz: 2000 }"
:submit-label="'Autofocus'" :submit-label="'Autofocus'"
:button-primary="false" :button-primary="true"
:submit-on-event="'globalFastAutofocusEvent'" :submit-on-event="'globalFastAutofocusEvent'"
@taskStarted="isAutofocusing = 1" @taskStarted="isAutofocusing = 1"
@finished=" @finished="