From 225ed7baa19436a32a372c0d80d63d1bf61a2feb Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Wed, 22 Feb 2023 23:20:59 -0500 Subject: [PATCH] #118 removed some coordinator nodiscard tags --- coordinator/ui/components/boiler.lua | 1 - coordinator/ui/components/imatrix.lua | 1 - coordinator/ui/components/processctl.lua | 1 - coordinator/ui/components/reactor.lua | 1 - coordinator/ui/components/turbine.lua | 1 - coordinator/ui/components/unit_detail.lua | 1 - coordinator/ui/components/unit_overview.lua | 3 +-- coordinator/ui/components/unit_waiting.lua | 1 - coordinator/ui/layout/main_view.lua | 5 ++--- coordinator/ui/layout/unit_view.lua | 3 +-- 10 files changed, 4 insertions(+), 14 deletions(-) diff --git a/coordinator/ui/components/boiler.lua b/coordinator/ui/components/boiler.lua index cc4e93b..c4a433b 100644 --- a/coordinator/ui/components/boiler.lua +++ b/coordinator/ui/components/boiler.lua @@ -13,7 +13,6 @@ local cpair = core.graphics.cpair local border = core.graphics.border -- new boiler view ----@nodiscard ---@param root graphics_element parent ---@param x integer top left x ---@param y integer top left y diff --git a/coordinator/ui/components/imatrix.lua b/coordinator/ui/components/imatrix.lua index e60a126..2910fbb 100644 --- a/coordinator/ui/components/imatrix.lua +++ b/coordinator/ui/components/imatrix.lua @@ -19,7 +19,6 @@ local border = core.graphics.border local TEXT_ALIGN = core.graphics.TEXT_ALIGN -- new induction matrix view ----@nodiscard ---@param root graphics_element parent ---@param x integer top left x ---@param y integer top left y diff --git a/coordinator/ui/components/processctl.lua b/coordinator/ui/components/processctl.lua index 82ce614..26944e0 100644 --- a/coordinator/ui/components/processctl.lua +++ b/coordinator/ui/components/processctl.lua @@ -29,7 +29,6 @@ local border = core.graphics.border local period = core.flasher.PERIOD -- new process control view ----@nodiscard ---@param root graphics_element parent ---@param x integer top left x ---@param y integer top left y diff --git a/coordinator/ui/components/reactor.lua b/coordinator/ui/components/reactor.lua index 139a8d3..a17fc75 100644 --- a/coordinator/ui/components/reactor.lua +++ b/coordinator/ui/components/reactor.lua @@ -15,7 +15,6 @@ local cpair = core.graphics.cpair local border = core.graphics.border -- create new reactor view ----@nodiscard ---@param root graphics_element parent ---@param x integer top left x ---@param y integer top left y diff --git a/coordinator/ui/components/turbine.lua b/coordinator/ui/components/turbine.lua index c6caec9..ef09cee 100644 --- a/coordinator/ui/components/turbine.lua +++ b/coordinator/ui/components/turbine.lua @@ -15,7 +15,6 @@ local cpair = core.graphics.cpair local border = core.graphics.border -- new turbine view ----@nodiscard ---@param root graphics_element parent ---@param x integer top left x ---@param y integer top left y diff --git a/coordinator/ui/components/unit_detail.lua b/coordinator/ui/components/unit_detail.lua index 82b01ec..f507682 100644 --- a/coordinator/ui/components/unit_detail.lua +++ b/coordinator/ui/components/unit_detail.lua @@ -57,7 +57,6 @@ local waste_opts = { } -- create a unit view ----@nodiscard ---@param parent graphics_element parent ---@param id integer local function init(parent, id) diff --git a/coordinator/ui/components/unit_overview.lua b/coordinator/ui/components/unit_overview.lua index 5062116..e5a07f9 100644 --- a/coordinator/ui/components/unit_overview.lua +++ b/coordinator/ui/components/unit_overview.lua @@ -19,7 +19,6 @@ local TEXT_ALIGN = core.graphics.TEXT_ALIGN local pipe = core.graphics.pipe -- make a new unit overview window ----@nodiscard ---@param parent graphics_element parent ---@param x integer top left x ---@param y integer top left y @@ -52,7 +51,7 @@ local function make(parent, x, y, unit) -- REACTOR -- ------------- - local _ = reactor_view(root, 1, 3, unit.reactor_data, unit.unit_ps) + reactor_view(root, 1, 3, unit.reactor_data, unit.unit_ps) if num_boilers > 0 then local coolant_pipes = {} diff --git a/coordinator/ui/components/unit_waiting.lua b/coordinator/ui/components/unit_waiting.lua index 8c29f1a..3b1a846 100644 --- a/coordinator/ui/components/unit_waiting.lua +++ b/coordinator/ui/components/unit_waiting.lua @@ -16,7 +16,6 @@ local TEXT_ALIGN = core.graphics.TEXT_ALIGN local cpair = core.graphics.cpair -- create a unit waiting view ----@nodiscard ---@param parent graphics_element parent ---@param y integer y offset local function init(parent, y) diff --git a/coordinator/ui/layout/main_view.lua b/coordinator/ui/layout/main_view.lua index d1397d8..94d25f8 100644 --- a/coordinator/ui/layout/main_view.lua +++ b/coordinator/ui/layout/main_view.lua @@ -30,7 +30,6 @@ local TEXT_ALIGN = core.graphics.TEXT_ALIGN local cpair = core.graphics.cpair -- create new main view ----@nodiscard ---@param monitor table main viewscreen local function init(monitor) local facility = iocontrol.get_db().facility @@ -91,7 +90,7 @@ local function init(monitor) cnc_bottom_align_start = cnc_bottom_align_start + 2 - local _ = process_ctl(main, 2, cnc_bottom_align_start) + process_ctl(main, 2, cnc_bottom_align_start) -- testing ---@fixme remove test code @@ -124,7 +123,7 @@ local function init(monitor) SwitchButton{parent=audio,x=1,text="RCS TRANSIENT",min_width=23,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=cpair(colors.white,colors.gray),callback=sounder.test_rcs} SwitchButton{parent=audio,x=1,text="TURBINE TRIP",min_width=23,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=cpair(colors.white,colors.gray),callback=sounder.test_turbinet} - local _ = imatrix(main, 131, cnc_bottom_align_start, facility.induction_data_tbl[1], facility.induction_ps_tbl[1]) + imatrix(main, 131, cnc_bottom_align_start, facility.induction_data_tbl[1], facility.induction_ps_tbl[1]) return main end diff --git a/coordinator/ui/layout/unit_view.lua b/coordinator/ui/layout/unit_view.lua index c6ca828..1c5fddf 100644 --- a/coordinator/ui/layout/unit_view.lua +++ b/coordinator/ui/layout/unit_view.lua @@ -9,13 +9,12 @@ local unit_detail = require("coordinator.ui.components.unit_detail") local DisplayBox = require("graphics.elements.displaybox") -- create a unit view ----@nodiscard ---@param monitor table ---@param id integer local function init(monitor, id) local main = DisplayBox{window=monitor,fg_bg=style.root} - local _ = unit_detail(main, id) + unit_detail(main, id) return main end