TheHomecraft/cc-mek-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

number fields now display numbers cleanly without using scientific notation

Browse Source
This commit is contained in:
Mikayla Fischler 2024-10-14 00:02:52 -04:00
parent 40e749d363
commit 8b9f83754b
2 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/core.lua
View File

@ -7,7 +7,7 @@ local flasher = require("graphics.flasher")
local core = {}
core.version = "2.4.4"
core.version = "2.4.5"
core.flasher = flasher
core.events = events

55
graphics/elements/form/NumberField.lua
View File

@ -44,8 +44,47 @@ return function (args)
args.max_chars = args.max_chars or e.frame.w
-- determine the format to convert the number to a string
local format = "%d"
if args.allow_decimal then
if args.max_frac_digits then
format = "%."..args.max_frac_digits.."f"
else format = "%f" end
end
-- set the value to a formatted numeric string<br>
-- trims trailing zeros
---@param num number
local function _set_value(num)
local str = util.sprintf(format, num)
if args.allow_decimal then
local found_nonzero = false
local str_table = {}
for i = #str, 1, -1 do
local c = string.sub(str, i, i)
if found_nonzero then
str_table[i] = c
else
if c == "." then
found_nonzero = true
elseif c ~= "0" then
str_table[i] = c
found_nonzero = true
end
end
end
e.value = table.concat(str_table)
else
e.value = str
end
end
-- set initial value
e.value = "" .. (args.default or 0)
_set_value(args.default or 0)
-- make an interactive field manager
local ifield = core.new_ifield(e, args.max_chars, args.fg_bg, args.dis_fg_bg, args.align_right)
@ -140,7 +179,7 @@ return function (args)
local max = tonumber(args.max)
local min = tonumber(args.min)
if type(val) == "number" then
if val then
if args.max_int_digits or args.max_frac_digits then
local str = e.value
local ceil = false
@ -169,17 +208,17 @@ return function (args)
if parts[2] then parts[2] = "." .. parts[2] else parts[2] = "" end
val = tonumber((parts[1] or "") .. parts[2])
val = tonumber((parts[1] or "") .. parts[2]) or 0
end
if type(args.max) == "number" and val > max then
e.value = "" .. max
if max and val > max then
_set_value(max)
ifield.nav_start()
elseif type(args.min) == "number" and val < min then
e.value = "" .. min
elseif min and val < min then
_set_value(min)
ifield.nav_start()
else
e.value = "" .. val
_set_value(val)
ifield.nav_end()
end
else