From 4a4234c8c8fd9adb9bbba0cc8a70f524ee3ab743 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Fri, 10 Jan 2025 22:52:27 -0500 Subject: [PATCH] #557 ui improvements --- pocket/ui/pages/dynamic_tank.lua | 2 +- pocket/ui/pages/facility_matrix.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pocket/ui/pages/dynamic_tank.lua b/pocket/ui/pages/dynamic_tank.lua index c0719d0..17221a6 100644 --- a/pocket/ui/pages/dynamic_tank.lua +++ b/pocket/ui/pages/dynamic_tank.lua @@ -73,7 +73,7 @@ return function (app, page, panes, tank_pane, tank_id, ps, update) TextBox{parent=tank_div,y=8,text=util.trinary(is_water,"Water","Sodium").." Level",width=12,fg_bg=label} local level = HorizontalBar{parent=tank_div,y=9,bar_fg_bg=cpair(util.trinary(is_water,colors.blue,colors.lightBlue),colors.gray),height=1,width=21} - TextBox{parent=tank_div,y=1,text="Tank Fill Mode",width=14,fg_bg=label} + TextBox{parent=tank_div,y=11,text="Tank Fill Mode",width=14,fg_bg=label} local can_fill = IconIndicator{parent=tank_div,y=12,label="Fill",states=mode_ind_s} local can_empty = IconIndicator{parent=tank_div,y=13,label="Empty",states=mode_ind_s} diff --git a/pocket/ui/pages/facility_matrix.lua b/pocket/ui/pages/facility_matrix.lua index 0eeb8a5..a66f2a9 100644 --- a/pocket/ui/pages/facility_matrix.lua +++ b/pocket/ui/pages/facility_matrix.lua @@ -121,10 +121,10 @@ return function (app, panes, matrix_pane, ps, update) in_util.register(ps, "last_input", function (x) in_util.update(calc_saturation(x) * 100) end) out_util.register(ps, "last_output", function (x) out_util.update(calc_saturation(x) * 100) end) - TextBox{parent=mtx_ext_div,text="Capacity",x=1,y=13,width=13,fg_bg=label} - local capacity = PowerIndicator{parent=mtx_ext_div,y=14,lu_colors=lu_col,label="",unit=db.energy_label,format="%8.2f",value=0,width=21,fg_bg=text_fg} - TextBox{parent=mtx_ext_div,text="Maximum In/Out Rate",x=1,y=15,width=13,fg_bg=label} - local trans_cap = PowerIndicator{parent=mtx_ext_div,y=16,lu_colors=lu_col,label="",unit=db.energy_label,format="%8.2f",rate=true,value=0,width=21,fg_bg=text_fg} + TextBox{parent=mtx_ext_div,text="Capacity ("..db.energy_label..")",x=1,y=13,fg_bg=label} + local capacity = DataIndicator{parent=mtx_ext_div,y=14,lu_colors=lu_col,label="",unit="",format="%21d",value=1000000000000,width=21,fg_bg=text_fg} + TextBox{parent=mtx_ext_div,text="Max In/Out ("..db.energy_label.."/t)",x=1,y=15,fg_bg=label} + local trans_cap = DataIndicator{parent=mtx_ext_div,y=16,lu_colors=lu_col,label="",unit="",format="%21d",rate=true,value=0,width=21,fg_bg=text_fg} capacity.register(ps, "max_energy", function (val) capacity.update(db.energy_convert(val)) end) trans_cap.register(ps, "transfer_cap", function (val) trans_cap.update(db.energy_convert(val)) end)