mirror of
https://github.com/MikaylaFischler/cc-mek-scada.git
synced 2024-08-30 18:22:34 +00:00
#460 added yields throughout main UI rendering
This commit is contained in:
parent
92a4277f73
commit
1504247b33
@ -3,6 +3,7 @@
|
|||||||
--
|
--
|
||||||
|
|
||||||
local log = require("scada-common.log")
|
local log = require("scada-common.log")
|
||||||
|
local util = require("scada-common.util")
|
||||||
|
|
||||||
local iocontrol = require("coordinator.iocontrol")
|
local iocontrol = require("coordinator.iocontrol")
|
||||||
|
|
||||||
@ -195,18 +196,21 @@ function renderer.try_start_ui()
|
|||||||
if engine.monitors.main ~= nil then
|
if engine.monitors.main ~= nil then
|
||||||
engine.ui.main_display = DisplayBox{window=engine.monitors.main,fg_bg=style.root}
|
engine.ui.main_display = DisplayBox{window=engine.monitors.main,fg_bg=style.root}
|
||||||
main_view(engine.ui.main_display)
|
main_view(engine.ui.main_display)
|
||||||
|
util.nop()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- show flow view on flow monitor
|
-- show flow view on flow monitor
|
||||||
if engine.monitors.flow ~= nil then
|
if engine.monitors.flow ~= nil then
|
||||||
engine.ui.flow_display = DisplayBox{window=engine.monitors.flow,fg_bg=style.root}
|
engine.ui.flow_display = DisplayBox{window=engine.monitors.flow,fg_bg=style.root}
|
||||||
flow_view(engine.ui.flow_display)
|
flow_view(engine.ui.flow_display)
|
||||||
|
util.nop()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- show unit views on unit displays
|
-- show unit views on unit displays
|
||||||
for idx, display in pairs(engine.monitors.unit_displays) do
|
for idx, display in pairs(engine.monitors.unit_displays) do
|
||||||
engine.ui.unit_displays[idx] = DisplayBox{window=display,fg_bg=style.root}
|
engine.ui.unit_displays[idx] = DisplayBox{window=display,fg_bg=style.root}
|
||||||
unit_view(engine.ui.unit_displays[idx], idx)
|
unit_view(engine.ui.unit_displays[idx], idx)
|
||||||
|
util.nop()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
@ -352,6 +352,8 @@ local function init(parent, id)
|
|||||||
t3_trp.register(t_ps[3], "TurbineTrip", t3_trp.update)
|
t3_trp.register(t_ps[3], "TurbineTrip", t3_trp.update)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
util.nop()
|
||||||
|
|
||||||
----------------------
|
----------------------
|
||||||
-- reactor controls --
|
-- reactor controls --
|
||||||
----------------------
|
----------------------
|
||||||
|
@ -250,6 +250,7 @@ local function init(main)
|
|||||||
local y_offset = y_ofs(i)
|
local y_offset = y_ofs(i)
|
||||||
unit_flow(main, flow_x, 5 + y_offset, #water_pipes == 0, units[i])
|
unit_flow(main, flow_x, 5 + y_offset, #water_pipes == 0, units[i])
|
||||||
table.insert(po_pipes, pipe(0, 3 + y_offset, 4, 0, colors.cyan, true, true))
|
table.insert(po_pipes, pipe(0, 3 + y_offset, 4, 0, colors.cyan, true, true))
|
||||||
|
util.nop()
|
||||||
end
|
end
|
||||||
|
|
||||||
PipeNetwork{parent=main,x=139,y=15,pipes=po_pipes,bg=style.theme.bg}
|
PipeNetwork{parent=main,x=139,y=15,pipes=po_pipes,bg=style.theme.bg}
|
||||||
@ -335,6 +336,8 @@ local function init(main)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
util.nop()
|
||||||
|
|
||||||
---------
|
---------
|
||||||
-- SPS --
|
-- SPS --
|
||||||
---------
|
---------
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
--
|
--
|
||||||
|
|
||||||
local iocontrol = require("coordinator.iocontrol")
|
local iocontrol = require("coordinator.iocontrol")
|
||||||
|
local util = require("scada-common.util")
|
||||||
|
|
||||||
local style = require("coordinator.ui.style")
|
local style = require("coordinator.ui.style")
|
||||||
|
|
||||||
@ -53,6 +54,8 @@ local function init(main)
|
|||||||
|
|
||||||
cnc_y_start = cnc_y_start + row_1_height + 1
|
cnc_y_start = cnc_y_start + row_1_height + 1
|
||||||
|
|
||||||
|
util.nop()
|
||||||
|
|
||||||
if facility.num_units >= 3 then
|
if facility.num_units >= 3 then
|
||||||
-- base offset 3, spacing 1, max height of units 1 and 2
|
-- base offset 3, spacing 1, max height of units 1 and 2
|
||||||
local row_2_offset = cnc_y_start
|
local row_2_offset = cnc_y_start
|
||||||
@ -64,6 +67,8 @@ local function init(main)
|
|||||||
uo_4 = unit_overview(main, 84, row_2_offset, units[4])
|
uo_4 = unit_overview(main, 84, row_2_offset, units[4])
|
||||||
cnc_y_start = math.max(cnc_y_start, row_2_offset + uo_4.get_height() + 1)
|
cnc_y_start = math.max(cnc_y_start, row_2_offset + uo_4.get_height() + 1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
util.nop()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- command & control
|
-- command & control
|
||||||
@ -79,6 +84,8 @@ local function init(main)
|
|||||||
|
|
||||||
process_ctl(main, 2, cnc_bottom_align_start)
|
process_ctl(main, 2, cnc_bottom_align_start)
|
||||||
|
|
||||||
|
util.nop()
|
||||||
|
|
||||||
imatrix(main, 131, cnc_bottom_align_start, facility.induction_data_tbl[1], facility.induction_ps_tbl[1])
|
imatrix(main, 131, cnc_bottom_align_start, facility.induction_data_tbl[1], facility.induction_ps_tbl[1])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user