diff --git a/coordinator/ui/components/reactor.lua b/coordinator/ui/components/reactor.lua index 6f01d66..acd1ba7 100644 --- a/coordinator/ui/components/reactor.lua +++ b/coordinator/ui/components/reactor.lua @@ -21,8 +21,8 @@ local function new_view(root, x, y) 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 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 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 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 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 reactor_fills = Rectangle{parent=root,border=border(1, colors.gray, true),width=24,height=7,x=(x + 29),y=y} diff --git a/coordinator/ui/components/unit_overview.lua b/coordinator/ui/components/unit_overview.lua index 6ec388f..fff0aad 100644 --- a/coordinator/ui/components/unit_overview.lua +++ b/coordinator/ui/components/unit_overview.lua @@ -6,16 +6,19 @@ local reactor_view = require("coordinator.ui.components.reactor") local boiler_view = require("coordinator.ui.components.boiler") 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 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 cpair = core.graphics.cpair local border = core.graphics.border +local pipe = core.graphics.pipe ---@param parent graphics_element 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) + 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 -- -------------