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

#62, #72 work on main layout, not using layout class, refactoring and bugfixes

Browse Source
This commit is contained in:
Mikayla Fischler
2022-06-16 11:24:35 -04:00
parent 971657c3d2
commit 7f007e032d
9 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coordinator/renderer.lua
View File

@@ -3,8 +3,8 @@ local util = require("scada-common.util")
local core = require("graphics.core")
local main_layout = require("coordinator.ui.main_layout")
local unit_layout = require("coordinator.ui.unit_layout")
local main_view = require("coordinator.ui.layout.main_view")
local unit_view = require("coordinator.ui.layout.unit_view")
local renderer = {}
@@ -56,10 +56,15 @@ end
-- start the coordinator GUI
function renderer.start_ui()
ui.main_layout = main_layout(engine.monitors.primary)
-- hide dmesg
engine.dmesg_window.setVisible(false)
-- show main view on main monitor
ui.main_layout = main_view(engine.monitors.primary)
-- show unit views on unit displays
for id, monitor in pairs(engine.monitors.unit_displays) do
table.insert(ui.unit_layouts, unit_layout(monitor, id))
table.insert(ui.unit_layouts, unit_view(monitor, id))
end
end
@@ -73,6 +78,7 @@ function renderer.close_ui()
renderer.reset()
-- re-draw dmesg
engine.dmesg_window.setVisible(true)
engine.dmesg_window.redraw()
end