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

#72 added pipes to main overview, changed text of reactor overview

Browse Source
This commit is contained in:
Mikayla Fischler 2022-06-29 17:40:46 -04:00
parent ef73c52417
commit 20a1fab611
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coordinator/ui/components/reactor.lua
View File

@ -21,8 +21,8 @@ local function new_view(root, x, y)
local lu_col = cpair(colors.gray, colors.gray) local lu_col = cpair(colors.gray, colors.gray)
local status = StateIndicator{parent=reactor,x=8,y=1,states=style.reactor.states,value=3,min_width=14} local status = StateIndicator{parent=reactor,x=8,y=1,states=style.reactor.states,value=3,min_width=14}
local core_temp = DataIndicator{parent=reactor,x=2,y=3,lu_colors=lu_col,label="Core: ",unit="K",format="%12.2f",value=451.12,width=26,fg_bg=text_fg_bg} local core_temp = DataIndicator{parent=reactor,x=2,y=3,lu_colors=lu_col,label="Core Temp:",unit="K",format="%10.2f",value=451.12,width=26,fg_bg=text_fg_bg}
local burn_r = DataIndicator{parent=reactor,x=2,y=4,lu_colors=lu_col,label="Burn: ",unit="mB/t",format="%12.1f",value=40.1,width=26,fg_bg=text_fg_bg} local burn_r = DataIndicator{parent=reactor,x=2,y=4,lu_colors=lu_col,label="Burn Rate:",unit="mB/t",format="%10.1f",value=40.1,width=26,fg_bg=text_fg_bg}
local heating_r = DataIndicator{parent=reactor,x=2,y=5,lu_colors=lu_col,label="Heating:",unit="mB/t",format="%12.0f",value=8015342,commas=true,width=26,fg_bg=text_fg_bg} local heating_r = DataIndicator{parent=reactor,x=2,y=5,lu_colors=lu_col,label="Heating:",unit="mB/t",format="%12.0f",value=8015342,commas=true,width=26,fg_bg=text_fg_bg}
local reactor_fills = Rectangle{parent=root,border=border(1, colors.gray, true),width=24,height=7,x=(x + 29),y=y} local reactor_fills = Rectangle{parent=root,border=border(1, colors.gray, true),width=24,height=7,x=(x + 29),y=y}

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

@ -6,16 +6,19 @@ 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 Div = require("graphics.elements.div") local Div = require("graphics.elements.div")
local HorizontalBar = require("graphics.elements.indicators.hbar")
local DataIndicator = require("graphics.elements.indicators.data")
local StateIndicator = require("graphics.elements.indicators.state")
local Rectangle = require("graphics.elements.rectangle") 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 PipeNetwork = require("graphics.elements.indicators.pipenet")
local StateIndicator = require("graphics.elements.indicators.state")
local TEXT_ALIGN = core.graphics.TEXT_ALIGN local TEXT_ALIGN = core.graphics.TEXT_ALIGN
local cpair = core.graphics.cpair local cpair = core.graphics.cpair
local border = core.graphics.border local border = core.graphics.border
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)
@ -31,6 +34,15 @@ local function make(parent, x, y, unit_id)
reactor_view(root, 1, 3) reactor_view(root, 1, 3)
local pipes = {
pipe(0, 0, 13, 12, colors.lightBlue),
pipe(0, 0, 13, 3, colors.lightBlue),
pipe(2, 0, 11, 2, colors.orange),
pipe(2, 0, 11, 11, colors.orange)
}
PipeNetwork{parent=root,x=12,y=10,pipes=pipes,bg=colors.lightGray}
------------- -------------
-- BOILERS -- -- BOILERS --
------------- -------------