Merge branch 'primary-buttons' into 'v3'
Clean up primary vs secondary buttons Closes #554 See merge request openflexure/openflexure-microscope-server!402
This commit is contained in:
commit
6a2d69ed04
3 changed files with 27 additions and 22 deletions
Binary file not shown.
|
|
@ -881,42 +881,47 @@ class StreamingPiCamera2(BaseCamera):
|
||||||
notify_on_success=True,
|
notify_on_success=True,
|
||||||
success_message="Finished recalibration.",
|
success_message="Finished recalibration.",
|
||||||
),
|
),
|
||||||
action_button_for(
|
|
||||||
self.auto_expose_from_minimum,
|
|
||||||
submit_label="Auto Gain & Shutter Speed",
|
|
||||||
can_terminate=False,
|
|
||||||
),
|
|
||||||
action_button_for(
|
|
||||||
self.calibrate_white_balance,
|
|
||||||
submit_label="Auto White Balance",
|
|
||||||
can_terminate=False,
|
|
||||||
),
|
|
||||||
action_button_for(
|
|
||||||
self.calibrate_lens_shading,
|
|
||||||
submit_label="Auto Flat Field Correction",
|
|
||||||
can_terminate=False,
|
|
||||||
requires_confirmation=True,
|
|
||||||
confirmation_message=(
|
|
||||||
"Is the microscope looking at an evenly illuminated, empty field "
|
|
||||||
"of view? If not, the current image will show through in any "
|
|
||||||
"images captured afterwards."
|
|
||||||
),
|
|
||||||
),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
@lt.thing_property
|
@lt.thing_property
|
||||||
def secondary_calibration_actions(self) -> list[ActionButton]:
|
def secondary_calibration_actions(self) -> list[ActionButton]:
|
||||||
"""The calibration actions that appear only in settings panel."""
|
"""The calibration actions that appear only in settings panel."""
|
||||||
return [
|
return [
|
||||||
|
action_button_for(
|
||||||
|
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 "
|
||||||
|
"of view? If not, the current image will show through in any "
|
||||||
|
"images captured afterwards."
|
||||||
|
),
|
||||||
|
),
|
||||||
action_button_for(
|
action_button_for(
|
||||||
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,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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="
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue