From a4214e8a4fb9e666205861d451b77a49e3864f06 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 24 Feb 2024 19:34:43 -0500 Subject: [PATCH] #405 fixed waste line still always being black and removed colormap test --- coordinator/ui/components/unit_flow.lua | 8 +++++--- coordinator/ui/layout/main_view.lua | 5 ----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/coordinator/ui/components/unit_flow.lua b/coordinator/ui/components/unit_flow.lua index 577314a..e0c1519 100644 --- a/coordinator/ui/components/unit_flow.lua +++ b/coordinator/ui/components/unit_flow.lua @@ -149,6 +149,8 @@ local function make(parent, x, y, wide, unit) local waste = Div{parent=root,x=3,y=6} + local waste_c = style.theme.fuel_color + local waste_pipes = { pipe(0, 0, _wide(19, 16), 1, colors.brown, true), pipe(_wide(14, 13), 1, _wide(19, 17), 5, colors.brown, true), @@ -162,9 +164,9 @@ local function make(parent, x, y, wide, unit) pipe(_wide(74, 63), 4, _wide(95, 81), 4, colors.cyan, true), pipe(_wide(74, 63), 8, _wide(133, 111), 8, colors.cyan, true), - pipe(_wide(108, 94), 1, _wide(132, 110), 6, colors.black, true, true), - pipe(_wide(108, 94), 4, _wide(111, 95), 1, colors.black, true, true), - pipe(_wide(132, 110), 6, _wide(130, 108), 6, colors.black, true, true) + pipe(_wide(108, 94), 1, _wide(132, 110), 6, waste_c, true, true), + pipe(_wide(108, 94), 4, _wide(111, 95), 1, waste_c, true, true), + pipe(_wide(132, 110), 6, _wide(130, 108), 6, waste_c, true, true) } PipeNetwork{parent=waste,x=1,y=1,pipes=waste_pipes,bg=style.theme.bg} diff --git a/coordinator/ui/layout/main_view.lua b/coordinator/ui/layout/main_view.lua index 08254a0..9598e42 100644 --- a/coordinator/ui/layout/main_view.lua +++ b/coordinator/ui/layout/main_view.lua @@ -12,7 +12,6 @@ local unit_overview = require("coordinator.ui.components.unit_overview") local core = require("graphics.core") -local ColorMap = require("graphics.elements.colormap") local TextBox = require("graphics.elements.textbox") local DataIndicator = require("graphics.elements.indicators.data") @@ -69,10 +68,6 @@ local function init(main) -- command & control - ColorMap{parent=main,y=cnc_y_start+2} - - cnc_y_start = cnc_y_start - -- induction matrix and process control interfaces are 24 tall + space needed for divider local cnc_bottom_align_start = main.get_height() - 26