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

#410 pocket nav overhaul

Browse Source
This commit is contained in:
Mikayla Fischler
2024-04-13 14:47:20 -04:00
parent 2b4309afa7
commit 23b31e0049
11 changed files with 288 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pocket/ui/apps/diag_apps.lua
View File

@@ -29,7 +29,11 @@ local function create_pages(root)
------------------------
local alarm_test = Div{parent=root,x=1,y=1}
local alarm_tasks = { db.diag.tone_test.get_tone_states }
local alarm_app = db.nav.register_app(iocontrol.APP_ID.ALARMS, alarm_test)
local page = alarm_app.new_page(nil, function () end)
page.tasks = { db.diag.tone_test.get_tone_states }
local ttest = db.diag.tone_test
@@ -107,8 +111,6 @@ local function create_pages(root)
local t_8 = IndicatorLight{parent=states,x=6,label="8",colors=c_blue_gray}
ttest.tone_indicators = { t_1, t_2, t_3, t_4, t_5, t_6, t_7, t_8 }
return { Alarm = { e = alarm_test, tasks = alarm_tasks } }
end
return create_pages

16
pocket/ui/pages/boiler_page.lua → pocket/ui/apps/dummy_app.lua
View File

@@ -1,5 +1,5 @@
--
-- Boiler Detail Page
-- Placeholder App
--
local iocontrol = require("pocket.iocontrol")
@@ -9,20 +9,16 @@ local core = require("graphics.core")
local Div = require("graphics.elements.div")
local TextBox = require("graphics.elements.textbox")
local ALIGN = core.ALIGN
-- new boiler page view
-- create placeholder app page
---@param root graphics_element parent
local function new_view(root)
local function create_pages(root)
local db = iocontrol.get_db()
db.nav.new_page(nil, 4)
local main = Div{parent=root,x=1,y=1}
TextBox{parent=main,text="BOILERS",x=1,y=1,height=1,alignment=ALIGN.CENTER}
db.nav.register_app(iocontrol.APP_ID.DUMMY, main).new_page(nil, function () end)
return main
TextBox{parent=main,text="This app is not implemented yet.",x=1,y=2,alignment=core.ALIGN.CENTER}
end
return new_view
return create_pages

27
pocket/ui/main.lua
View File

@@ -4,16 +4,16 @@
local iocontrol = require("pocket.iocontrol")
local style = require("pocket.ui.style")
local diag_apps = require("pocket.ui.apps.diag_apps")
local dummy_app = require("pocket.ui.apps.dummy_app")
local conn_waiting = require("pocket.ui.components.conn_waiting")
local boiler_page = require("pocket.ui.pages.boiler_page")
local home_page = require("pocket.ui.pages.home_page")
local reactor_page = require("pocket.ui.pages.reactor_page")
local turbine_page = require("pocket.ui.pages.turbine_page")
local unit_page = require("pocket.ui.pages.unit_page")
local style = require("pocket.ui.style")
local core = require("graphics.core")
local Div = require("graphics.elements.div")
@@ -71,18 +71,21 @@ local function init(main)
local page_div = Div{parent=main_pane,x=4,y=1}
local sidebar_tabs = {
{ char = "#", color = cpair(colors.black,colors.green) },
{ char = "U", color = cpair(colors.black,colors.yellow) },
{ char = "R", color = cpair(colors.black,colors.cyan) },
{ char = "B", color = cpair(colors.black,colors.lightGray) },
{ char = "T", color = cpair(colors.black,colors.white) }
{ char = "#", color = cpair(colors.black,colors.green) }
}
local page_pane = MultiPane{parent=page_div,x=1,y=1,panes={home_page(page_div),unit_page(page_div),reactor_page(page_div),boiler_page(page_div),turbine_page(page_div)}}
home_page(page_div)
unit_page(page_div)
local base = iocontrol.init_nav(page_pane)
diag_apps(page_div)
dummy_app(page_div)
Sidebar{parent=main_pane,x=1,y=1,tabs=sidebar_tabs,fg_bg=cpair(colors.white,colors.gray),callback=base.switcher}
assert(#db.nav.get_containers() == iocontrol.APP_ID.NUM_APPS, "app IDs were not sequential or some apps weren't registered")
local page_pane = MultiPane{parent=page_div,x=1,y=1,panes=db.nav.get_containers()}
db.nav.set_pane(page_pane)
Sidebar{parent=main_pane,x=1,y=1,tabs=sidebar_tabs,fg_bg=cpair(colors.white,colors.gray),callback=db.nav.open_app}
PushButton{parent=main_pane,x=1,y=19,text="\x1b",min_width=3,fg_bg=cpair(colors.white,colors.gray),active_fg_bg=cpair(colors.gray,colors.black),callback=db.nav.nav_up}

60
pocket/ui/pages/home_page.lua
View File

@@ -2,21 +2,20 @@
-- Main Home Page
--
local iocontrol = require("pocket.iocontrol")
local iocontrol = require("pocket.iocontrol")
local diag_apps = require("pocket.ui.apps.diag_apps")
local core = require("graphics.core")
local core = require("graphics.core")
local AppMultiPane = require("graphics.elements.appmultipane")
local Div = require("graphics.elements.div")
local TextBox = require("graphics.elements.textbox")
local Div = require("graphics.elements.div")
local MultiPane = require("graphics.elements.multipane")
local TextBox = require("graphics.elements.textbox")
local AppPageSel = require("graphics.elements.controls.app_page_selector")
local App = require("graphics.elements.controls.app")
local App = require("graphics.elements.controls.app")
local cpair = core.cpair
local APP_ID = iocontrol.APP_ID
local ALIGN = core.ALIGN
-- new home page view
@@ -24,42 +23,37 @@ local ALIGN = core.ALIGN
local function new_view(root)
local db = iocontrol.get_db()
local main = Div{parent=root,x=1,y=1}
local main = Div{parent=root,x=1,y=1,height=19}
local apps = Div{parent=main,x=1,y=1,height=19}
local apps_1 = Div{parent=apps,x=1,y=1,height=15}
local apps_2 = Div{parent=apps,x=1,y=1,height=15}
local apps_1 = Div{parent=main,x=1,y=1,height=15}
local apps_2 = Div{parent=main,x=1,y=1,height=15}
local panes = { apps_1, apps_2 }
local app_pane = MultiPane{parent=apps,x=1,y=1,panes=panes,height=15}
local f_ref = {}
local app_pane = AppMultiPane{parent=main,x=1,y=1,height=18,panes=panes,active_color=colors.lightGray,nav_colors=cpair(colors.lightGray,colors.gray),scroll_nav=true,drag_nav=true,callback=function(v)f_ref.callback(v)end}
AppPageSel{parent=apps,x=11,y=18,page_count=2,active_color=colors.lightGray,callback=app_pane.set_value,fg_bg=cpair(colors.gray,colors.black)}
local app = db.nav.register_app(iocontrol.APP_ID.ROOT, main, app_pane)
f_ref.callback = app.switcher
local d_apps = diag_apps(main)
app.new_page(app.new_page(nil, 1), 2)
local page_panes = { apps, d_apps.Alarm.e }
local function open(id) db.nav.open_app(id) end
local page_pane = MultiPane{parent=main,x=1,y=1,panes=page_panes}
local active_fg_bg = cpair(colors.white,colors.gray)
local npage_home = db.nav.new_page(nil, 1, page_pane)
local npage_apps = db.nav.new_page(npage_home, 1)
local npage_alarm = db.nav.new_page(npage_apps, 2)
npage_alarm.tasks = d_apps.Alarm.tasks
App{parent=apps_1,x=3,y=2,text="\x17",title="PRC",callback=function()end,app_fg_bg=cpair(colors.black,colors.purple)}
App{parent=apps_1,x=10,y=2,text="\x15",title="CTL",callback=function()end,app_fg_bg=cpair(colors.black,colors.green)}
App{parent=apps_1,x=17,y=2,text="\x08",title="DEV",callback=function()end,app_fg_bg=cpair(colors.black,colors.lightGray)}
App{parent=apps_1,x=3,y=7,text="\x7f",title="Waste",callback=function()end,app_fg_bg=cpair(colors.black,colors.brown)}
App{parent=apps_1,x=10,y=7,text="\xb6",title="Guide",callback=function()end,app_fg_bg=cpair(colors.black,colors.cyan)}
App{parent=apps_1,x=3,y=2,text="U",title="Units",callback=function()open(APP_ID.UNITS)end,app_fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=active_fg_bg}
App{parent=apps_1,x=10,y=2,text="\x17",title="PRC",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.purple),active_fg_bg=active_fg_bg}
App{parent=apps_1,x=17,y=2,text="\x15",title="CTL",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.green),active_fg_bg=active_fg_bg}
App{parent=apps_1,x=3,y=7,text="\x08",title="DEV",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.lightGray),active_fg_bg=active_fg_bg}
App{parent=apps_1,x=10,y=7,text="\x7f",title="Waste",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.brown),active_fg_bg=active_fg_bg}
App{parent=apps_1,x=17,y=7,text="\xb6",title="Guide",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.cyan),active_fg_bg=active_fg_bg}
TextBox{parent=apps_2,text="Diagnostic Apps",x=1,y=2,height=1,alignment=ALIGN.CENTER}
App{parent=apps_2,x=3,y=4,text="\x0f",title="Alarm",callback=npage_alarm.nav_to,app_fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
App{parent=apps_2,x=10,y=4,text="\x1e",title="LoopT",callback=function()end,app_fg_bg=cpair(colors.black,colors.cyan)}
App{parent=apps_2,x=17,y=4,text="@",title="Comps",callback=function()end,app_fg_bg=cpair(colors.black,colors.orange)}
App{parent=apps_2,x=3,y=4,text="\x0f",title="Alarm",callback=function()open(APP_ID.ALARMS)end,app_fg_bg=cpair(colors.black,colors.red),active_fg_bg=active_fg_bg}
App{parent=apps_2,x=10,y=4,text="\x1e",title="LoopT",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.cyan),active_fg_bg=active_fg_bg}
App{parent=apps_2,x=17,y=4,text="@",title="Comps",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.orange),active_fg_bg=active_fg_bg}
return main
end

28
pocket/ui/pages/reactor_page.lua
View File

@@ -1,28 +0,0 @@
--
-- Reactor Detail Page
--
local iocontrol = require("pocket.iocontrol")
local core = require("graphics.core")
local Div = require("graphics.elements.div")
local TextBox = require("graphics.elements.textbox")
local ALIGN = core.ALIGN
-- new reactor page view
---@param root graphics_element parent
local function new_view(root)
local db = iocontrol.get_db()
db.nav.new_page(nil, 3)
local main = Div{parent=root,x=1,y=1}
TextBox{parent=main,text="REACTOR",x=1,y=1,height=1,alignment=ALIGN.CENTER}
return main
end
return new_view

28
pocket/ui/pages/turbine_page.lua
View File

@@ -1,28 +0,0 @@
--
-- Turbine Detail Page
--
local iocontrol = require("pocket.iocontrol")
local core = require("graphics.core")
local Div = require("graphics.elements.div")
local TextBox = require("graphics.elements.textbox")
local ALIGN = core.ALIGN
-- new turbine page view
---@param root graphics_element parent
local function new_view(root)
local db = iocontrol.get_db()
db.nav.new_page(nil, 5)
local main = Div{parent=root,x=1,y=1}
TextBox{parent=main,text="TURBINES",x=1,y=1,height=1,alignment=ALIGN.CENTER}
return main
end
return new_view

5
pocket/ui/pages/unit_page.lua
View File

@@ -16,10 +16,11 @@ local ALIGN = core.ALIGN
local function new_view(root)
local db = iocontrol.get_db()
db.nav.new_page(nil, 2)
local main = Div{parent=root,x=1,y=1}
local app = db.nav.register_app(iocontrol.APP_ID.UNITS, main)
app.new_page(nil, function () end)
TextBox{parent=main,text="UNITS",x=1,y=1,height=1,alignment=ALIGN.CENTER}
return main