Skip to content

Better decimal rounding in the NumberInput widget #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfish33 merged 8 commits into from
Jan 7, 2022
Merged

Better decimal rounding in the NumberInput widget #457

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
db7515c
better decimal rounding in NumberInput
mfish33 Dec 30, 2021
999a35a
Merge branch 'master' into rounded-zoom-numbering
mfish33 Jan 3, 2022
b0b0c58
- created function to reuse
mfish33 Jan 3, 2022
a09555d
updated comment to be correct
mfish33 Jan 3, 2022
205ad4d
Merge branch 'master' into rounded-zoom-numbering
mfish33 Jan 6, 2022
67489bb
updated comment
mfish33 Jan 6, 2022
ca5c417
Merge branch 'rounded-zoom-numbering' of https://github.com/GraphiteE…
mfish33 Jan 6, 2022
7271a76
updated comment
mfish33 Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions frontend/src/components/widgets/inputs/NumberInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
<script lang="ts">
import { defineComponent, PropType } from "vue";

import { clamp } from "@/utilities/math";

export type IncrementBehavior = "Add" | "Multiply" | "Callback" | "None";
export type IncrementDirection = "Decrease" | "Increase";

Expand Down Expand Up @@ -240,13 +242,21 @@ export default defineComponent({
if (invalid) sanitized = this.value;

if (this.isInteger) sanitized = Math.round(sanitized);
if (typeof this.min === "number" && !Number.isNaN(this.min)) sanitized = Math.max(sanitized, this.min);
if (typeof this.max === "number" && !Number.isNaN(this.max)) sanitized = Math.min(sanitized, this.max);
sanitized = clamp(newValue, this.min, this.max);

if (!invalid) this.$emit("update:value", sanitized);

const roundingPower = 10 ** this.displayDecimalPlaces;
const displayValue = Math.round(sanitized * roundingPower) / roundingPower;
this.setText(sanitized);
},
setText(value: number) {
// Find the amount of digits on the left side of the Decimal
// 10.25 == 2
// 1.23 == 1
// 0.23 == 0 - Reason for the slightly more complicated code
const leftSideDigits = Math.max(Math.floor(value).toString().length, 0) * Math.sign(value);

const roundingPower = 10 ** Math.max(this.displayDecimalPlaces - leftSideDigits, 0);
const displayValue = Math.round(value * roundingPower) / roundingPower;
this.text = `${displayValue}${this.unit}`;
},
},
Expand All @@ -258,13 +268,9 @@ export default defineComponent({
return;
}

let sanitized = newValue;
if (typeof this.min === "number") sanitized = Math.max(sanitized, this.min);
if (typeof this.max === "number") sanitized = Math.min(sanitized, this.max);
const sanitized = clamp(newValue, this.min, this.max);

const roundingPower = 10 ** this.displayDecimalPlaces;
const displayValue = Math.round(sanitized * roundingPower) / roundingPower;
this.text = `${displayValue}${this.unit}`;
this.setText(sanitized);
},
},
mounted() {
Expand Down