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

#78 removed redundant device index from boiler/turbine ps keys

Browse Source
This commit is contained in:
Mikayla Fischler
2022-09-07 10:25:22 -04:00
parent b53d2d6694
commit c2ac7fc973
5 changed files with 54 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coordinator/ui/components/unit_overview.lua
View File

@@ -74,8 +74,8 @@ local function make(parent, x, y, unit)
-- BOILERS --
-------------
if num_boilers >= 1 then boiler_view(root, 16, 11, 1, unit.boiler_ps_tbl[1]) end
if num_boilers >= 2 then boiler_view(root, 16, 19, 2, unit.boiler_ps_tbl[2]) end
if num_boilers >= 1 then boiler_view(root, 16, 11, unit.boiler_ps_tbl[1]) end
if num_boilers >= 2 then boiler_view(root, 16, 19, unit.boiler_ps_tbl[2]) end
--------------
-- TURBINES --
@@ -85,17 +85,17 @@ local function make(parent, x, y, unit)
local no_boilers = num_boilers == 0
if (num_turbines >= 3) or no_boilers or (num_boilers == 1 and num_turbines >= 2) then
turbine_view(root, 58, 3, t_idx, unit.turbine_ps_tbl[t_idx])
turbine_view(root, 58, 3, unit.turbine_ps_tbl[t_idx])
t_idx = t_idx + 1
end
if (num_turbines >= 1 and not no_boilers) or num_turbines >= 2 then
turbine_view(root, 58, 11, t_idx, unit.turbine_ps_tbl[t_idx])
turbine_view(root, 58, 11, unit.turbine_ps_tbl[t_idx])
t_idx = t_idx + 1
end
if (num_turbines >= 2 and num_boilers >= 2) or num_turbines >= 3 then
turbine_view(root, 58, 19, t_idx, unit.turbine_ps_tbl[t_idx])
turbine_view(root, 58, 19, unit.turbine_ps_tbl[t_idx])
end
local steam_pipes_b = {}