Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

#72 ui formatting

Browse Source
This commit is contained in:
Mikayla Fischler 2022-07-09 13:43:38 -04:00
parent b25ebdf959
commit 5a96818c97
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,14 +6,9 @@ local reactor_view = require("coordinator.ui.components.reactor")
local boiler_view = require("coordinator.ui.components.boiler") local boiler_view = require("coordinator.ui.components.boiler")
local turbine_view = require("coordinator.ui.components.turbine") local turbine_view = require("coordinator.ui.components.turbine")
local Div = require("graphics.elements.div") local Div = require("graphics.elements.div")
local PipeNetwork = require("graphics.elements.pipenet") local PipeNetwork = require("graphics.elements.pipenet")
local Rectangle = require("graphics.elements.rectangle") local TextBox = require("graphics.elements.textbox")
local TextBox = require("graphics.elements.textbox")
local HorizontalBar = require("graphics.elements.indicators.hbar")
local DataIndicator = require("graphics.elements.indicators.data")
local StateIndicator = require("graphics.elements.indicators.state")
local TEXT_ALIGN = core.graphics.TEXT_ALIGN local TEXT_ALIGN = core.graphics.TEXT_ALIGN
@ -24,7 +19,7 @@ local pipe = core.graphics.pipe
---@param parent graphics_element ---@param parent graphics_element
local function make(parent, x, y, unit_id) local function make(parent, x, y, unit_id)
-- bounding box div -- bounding box div
local root = Div{parent=parent,x=x,y=y,width=80,height=27}--,fg_bg=cpair(colors.white,colors.black)} local root = Div{parent=parent,x=x,y=y,width=80,height=25}
-- unit header message -- unit header message
TextBox{parent=root,text="Unit #" .. unit_id,alignment=TEXT_ALIGN.CENTER,height=1,fg_bg=style.header} TextBox{parent=root,text="Unit #" .. unit_id,alignment=TEXT_ALIGN.CENTER,height=1,fg_bg=style.header}
@ -36,8 +31,8 @@ local function make(parent, x, y, unit_id)
reactor_view(root, 1, 3) reactor_view(root, 1, 3)
local coolant_pipes = { local coolant_pipes = {
pipe(0, 0, 12, 12, colors.lightBlue), pipe(0, 0, 11, 12, colors.lightBlue),
pipe(0, 0, 12, 3, colors.lightBlue), pipe(0, 0, 11, 3, colors.lightBlue),
pipe(2, 0, 11, 2, colors.orange), pipe(2, 0, 11, 2, colors.orange),
pipe(2, 0, 11, 11, colors.orange) pipe(2, 0, 11, 11, colors.orange)
} }
@ -49,7 +44,7 @@ local function make(parent, x, y, unit_id)
------------- -------------
boiler_view(root, 16, 11) boiler_view(root, 16, 11)
boiler_view(root, 16, 20) boiler_view(root, 16, 19)
-------------- --------------
-- TURBINES -- -- TURBINES --
@ -57,15 +52,15 @@ local function make(parent, x, y, unit_id)
turbine_view(root, 58, 3) turbine_view(root, 58, 3)
turbine_view(root, 58, 11) turbine_view(root, 58, 11)
turbine_view(root, 58, 20) turbine_view(root, 58, 19)
local steam_pipes_a = { local steam_pipes_a = {
-- boiler 1 -- boiler 1
pipe(0, 1, 6, 1, colors.white, false, true), pipe(0, 1, 6, 1, colors.white, false, true),
pipe(0, 2, 6, 2, colors.blue, false, true), pipe(0, 2, 6, 2, colors.blue, false, true),
-- boiler 2 -- boiler 2
pipe(0, 10, 6, 10, colors.white, false, true), pipe(0, 9, 6, 9, colors.white, false, true),
pipe(0, 11, 6, 11, colors.blue, false, true) pipe(0, 10, 6, 10, colors.blue, false, true)
} }
local steam_pipes_b = { local steam_pipes_b = {
@ -79,9 +74,9 @@ local function make(parent, x, y, unit_id)
-- turbine 3, pipes from boiler 2 -- turbine 3, pipes from boiler 2
pipe(0, 18, 1, 9, colors.white, false, true), pipe(0, 18, 1, 9, colors.white, false, true),
pipe(1, 1, 3, 1, colors.white, false, false), pipe(1, 1, 3, 1, colors.white, false, false),
pipe(0, 18, 3, 18, colors.white, false, true), pipe(0, 17, 3, 17, colors.white, false, true),
pipe(0, 19, 2, 10, colors.blue, false, true), pipe(0, 18, 2, 10, colors.blue, false, true),
pipe(0, 19, 3, 19, colors.blue, false, true), pipe(0, 18, 3, 18, colors.blue, false, true),
} }
PipeNetwork{parent=root,x=47,y=11,pipes=steam_pipes_a,bg=colors.lightGray} PipeNetwork{parent=root,x=47,y=11,pipes=steam_pipes_a,bg=colors.lightGray}

4
coordinator/ui/layout/main_view.lua
View File

@ -23,8 +23,8 @@ local function init(monitor)
-- unit overviews -- unit overviews
unit_overview(main, 2, 3, 1) unit_overview(main, 2, 3, 1)
unit_overview(main, 84, 3, 2) unit_overview(main, 84, 3, 2)
unit_overview(main, 2, 32, 3) unit_overview(main, 2, 29, 3)
unit_overview(main, 84, 32, 4) unit_overview(main, 84, 29, 4)
return main return main
end end

24
coordinator/ui/style.lua
View File

@ -11,14 +11,22 @@ style.root = cpair(colors.black, colors.lightGray)
style.header = cpair(colors.white, colors.gray) style.header = cpair(colors.white, colors.gray)
style.colors = { style.colors = {
{ { c = colors.red, hex = 0xdf4949 },
c = colors.green, { c = colors.orange, hex = 0xffb659 },
hex = 0x7ed788 { c = colors.yellow, hex = 0xfffc79 },
}, { c = colors.lime, hex = 0x64dd20 },
{ { c = colors.green, hex = 0x4aee8a },
c = colors.lightGray, { c = colors.cyan, hex = 0x34bac8 },
hex = 0xcacaca { c = colors.lightBlue, hex = 0x6cc0f2 },
} { c = colors.blue, hex = 0x0096ff },
{ c = colors.purple, hex = 0xb156ee },
{ c = colors.pink, hex = 0xf26ba2 },
{ c = colors.magenta, hex = 0xf9488a },
-- { c = colors.white, hex = 0xf0f0f0 },
{ c = colors.lightGray, hex = 0xcacaca },
{ c = colors.gray, hex = 0x575757 },
-- { c = colors.black, hex = 0x191919 },
-- { c = colors.brown, hex = 0x7f664c }
} }
-- MAIN LAYOUT -- -- MAIN LAYOUT --