From 3593493c9843259a2608cbdb5842321cd4f7407f Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 11 Jun 2022 17:58:29 -0400 Subject: [PATCH] #62 basic start of the UI --- coordinator/renderer.lua | 18 ++++++++++++++---- coordinator/startup.lua | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/coordinator/renderer.lua b/coordinator/renderer.lua index 4ed6358..9c29c4b 100644 --- a/coordinator/renderer.lua +++ b/coordinator/renderer.lua @@ -1,8 +1,10 @@ local log = require("scada-common.log") local util = require("scada-common.util") +local core = require("graphics.core") + local displaybox = require("graphics.elements.displaybox") -local structs = require("graphics.structs") +local textbox = require("graphics.elements.textbox") local renderer = {} @@ -62,12 +64,14 @@ end -- start the coordinator GUI function renderer.start_ui() - local palette = structs.graphics.cpair(gconf.root.fgd, gconf.root.bkg) + local palette = core.graphics.cpair(gconf.root.fgd, gconf.root.bkg) - ui.main_box = displaybox{window = engine.monitors.primary, fg_bg = palette} + ui.main_box = displaybox{window=engine.monitors.primary,fg_bg=palette} + + textbox{parent=ui.main_box,text="Nuclear Generation Facility SCADA Coordinator",alignment=core.graphics.TEXT_ALIGN.CENTER,height=1,fg_bg=core.graphics.cpair(colors.white,colors.gray)} for _, monitor in pairs(engine.monitors.unit_displays) do - table.insert(ui.unit_boxes, displaybox{window = engine.monitors.primary, fg_bg = palette}) + table.insert(ui.unit_boxes, displaybox{window=monitor,fg_bg=palette}) end end @@ -76,6 +80,12 @@ function renderer.close_ui() -- clear root UI elements ui.main_box = nil ui.unit_boxes = {} + + -- reset displays + renderer.reset() + + -- re-draw dmesg + engine.dmesg_window.redraw() end return renderer diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 8b79745..3b67dea 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -12,7 +12,7 @@ local config = require("coordinator.config") local coordinator = require("coordinator.coordinator") local renderer = require("coordinator.renderer") -local COORDINATOR_VERSION = "alpha-v0.1.5" +local COORDINATOR_VERSION = "alpha-v0.1.6" local print = util.print local println = util.println