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

Merge branch 'allow-zero' into 'v3'

Browse source 
Allow 0 as a setting in the webapp

Closes #693

See merge request openflexure/openflexure-microscope-server!508
This commit is contained in:
Julian Stirling 2026-02-24 13:29:03 +00:00
commit de08bb1740
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/openflexure_microscope_server/things/scan_workflows.py
View file

@ -290,7 +290,7 @@ class HistoScanWorkflow(RectGridWorkflow[HistoScanSettingsModel]):
This uses the settings from the ``BackgroundDetectThing``. This uses the settings from the ``BackgroundDetectThing``.
""" """
max_range: int = lt.setting(default=45000) max_range: int = lt.setting(default=45000, ge=0)
"""The maximum distance in steps from the centre of the scan.""" """The maximum distance in steps from the centre of the scan."""
# Stacking settings # Stacking settings

3
webapp/src/components/labThingsComponents/inputFromSchema.vue
View file

@ -346,7 +346,8 @@ export default {
} }
// Rounding to about 5 sig figs to stop weird javascript rounding. // Rounding to about 5 sig figs to stop weird javascript rounding.
const magnitude = Math.floor(Math.log10(Math.abs(newValue))); const absVal = Math.abs(newValue);
const magnitude = absVal > Number.EPSILON ? Math.floor(Math.log10(absVal)) : 0;
const factor = 10 ** -(Math.floor(magnitude) - 4); const factor = 10 ** -(Math.floor(magnitude) - 4);
this.internalValue = Math.round(newValue * factor) / factor; this.internalValue = Math.round(newValue * factor) / factor;
}, },

4
webapp/src/mixins/labThingsMixins.js
View file

@ -56,10 +56,10 @@ export default {
"writeproperty", "writeproperty",
false, false,
); );
// `false` fails because axios somehow eats it! // `false` and 0 fail because axios turns it to ""
// Other values should not be stringified or pydantic // Other values should not be stringified or pydantic
// can't parse them. // can't parse them.
if (value === false || value === true) { if (value === false || value === true || value === 0) {
value = JSON.stringify(value); value = JSON.stringify(value);
} }
await axios.put(url, value); await axios.put(url, value);