#62 graphics layouts

coordinator/renderer.lua

@@ -3,29 +3,21 @@ local util = require("scada-common.util")
 
 local core = require("graphics.core")
 
-local displaybox = require("graphics.elements.displaybox")
-local textbox = require("graphics.elements.textbox")
+local main_layout = require("coordinator.ui.main_layout")
+local unit_layout = require("coordinator.ui.unit_layout")
 
 local renderer = {}
 
-local gconf = {
-    -- root boxes
-    root = {
-        fgd = colors.black,
-        bkg = colors.lightGray
-    }
-}
-
 -- render engine
 local engine = {
     monitors = nil,
     dmesg_window = nil
 }
 
--- UI elements
+-- UI layouts
 local ui = {
-    main_box = nil,
-    unit_boxes = {}
+    main_layout = nil,
+    unit_layouts = {}
 }
 
 -- reset a display to the "default", but set text scale to 0.5
@@ -64,22 +56,18 @@ end
 
 -- start the coordinator GUI
 function renderer.start_ui()
-    local palette = core.graphics.cpair(gconf.root.fgd, gconf.root.bkg)
+    ui.main_layout = main_layout(engine.monitors.primary)
 
-    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=monitor,fg_bg=palette})
+    for id, monitor in pairs(engine.monitors.unit_displays) do
+        table.insert(ui.unit_layouts, unit_layout(monitor, id))
     end
 end
 
 -- close out the UI
 function renderer.close_ui()
     -- clear root UI elements
-    ui.main_box = nil
-    ui.unit_boxes = {}
+    ui.main_layout = nil
+    ui.unit_layouts = {}
 
     -- reset displays
     renderer.reset()