#496 threaded app loading

pocket/ui/apps/diag_apps.lua

@@ -3,6 +3,7 @@
 --
 
 local iocontrol      = require("pocket.iocontrol")
+local pocket         = require("pocket.pocket")
 
 local core           = require("graphics.core")
 
@@ -15,9 +16,10 @@ local Checkbox       = require("graphics.elements.controls.checkbox")
 local PushButton     = require("graphics.elements.controls.push_button")
 local SwitchButton   = require("graphics.elements.controls.switch_button")
 
+local ALIGN = core.ALIGN
 local cpair = core.cpair
 
-local ALIGN = core.ALIGN
+local APP_ID = pocket.APP_ID
 
 -- create diagnostic app pages
 ---@param root graphics_element parent
@@ -30,7 +32,7 @@ local function create_pages(root)
 
     local alarm_test = Div{parent=root,x=1,y=1}
 
-    local alarm_app = db.nav.register_app(iocontrol.APP_ID.ALARMS, alarm_test)
+    local alarm_app = db.nav.register_app(APP_ID.ALARMS, alarm_test)
 
     local page = alarm_app.new_page(nil, function () end)
     page.tasks = { db.diag.tone_test.get_tone_states }

pocket/ui/apps/dummy_app.lua

@@ -3,12 +3,15 @@
 --
 
 local iocontrol = require("pocket.iocontrol")
+local pocket    = require("pocket.pocket")
 
 local core      = require("graphics.core")
 
 local Div       = require("graphics.elements.div")
 local TextBox   = require("graphics.elements.textbox")
 
+local APP_ID = pocket.APP_ID
+
 -- create placeholder app page
 ---@param root graphics_element parent
 local function create_pages(root)
@@ -16,7 +19,7 @@ local function create_pages(root)
 
     local main = Div{parent=root,x=1,y=1}
 
-    db.nav.register_app(iocontrol.APP_ID.DUMMY, main).new_page(nil, function () end)
+    db.nav.register_app(APP_ID.DUMMY, main).new_page(nil, function () end)
 
     TextBox{parent=main,text="This app is not implemented yet.",x=1,y=2,alignment=core.ALIGN.CENTER}
 

pocket/ui/apps/guide.lua

@@ -3,13 +3,12 @@
 --
 
 local util          = require("scada-common.util")
--- local log        = require("scada-common.log")
 
 local iocontrol     = require("pocket.iocontrol")
-local TextField     = require("graphics.elements.form.text_field")
+local pocket        = require("pocket.pocket")
 
 local docs          = require("pocket.ui.docs")
-local style         = require("pocket.ui.style")
+-- local style         = require("pocket.ui.style")
 
 local guide_section = require("pocket.ui.pages.guide_section")
 
@@ -20,33 +19,44 @@ local ListBox       = require("graphics.elements.listbox")
 local MultiPane     = require("graphics.elements.multipane")
 local TextBox       = require("graphics.elements.textbox")
 
+local WaitingAnim   = require("graphics.elements.animations.waiting")
+
 local PushButton    = require("graphics.elements.controls.push_button")
 
+local TextField     = require("graphics.elements.form.text_field")
+
 local ALIGN = core.ALIGN
 local cpair = core.cpair
 
-local label        = style.label
--- local lu_col       = style.label_unit_pair
-local text_fg      = style.text_fg
+local APP_ID = pocket.APP_ID
+
+-- local label   = style.label
+-- local lu_col  = style.label_unit_pair
+-- local text_fg = style.text_fg
 
 -- new system guide view
 ---@param root graphics_element parent
 local function new_view(root)
     local db = iocontrol.get_db()
 
-    local main = Div{parent=root,x=1,y=1}
+    local frame = Div{parent=root,x=1,y=1}
 
-    local app = db.nav.register_app(iocontrol.APP_ID.GUIDE, main)
+    local app = db.nav.register_app(APP_ID.GUIDE, frame)
 
-    TextBox{parent=main,y=2,text="Guide",height=1,alignment=ALIGN.CENTER}
-    TextBox{parent=main,y=4,text="Loading...",height=1,alignment=ALIGN.CENTER}
+    local load_div = Div{parent=frame,x=1,y=1}
+    local main = Div{parent=frame,x=1,y=1}
+
+    TextBox{parent=load_div,y=12,text="Loading...",height=1,alignment=ALIGN.CENTER}
+    WaitingAnim{parent=load_div,x=math.floor(main.get_width()/2)-1,y=8,fg_bg=cpair(colors.cyan,colors._INHERIT)}
+
+    local load_pane = MultiPane{parent=main,x=1,y=1,panes={load_div,main}}
 
     local btn_fg_bg = cpair(colors.cyan, colors.black)
     local btn_active = cpair(colors.white, colors.black)
     local btn_disable = cpair(colors.gray, colors.black)
 
     local list = {
-        { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = function () db.nav.open_app(iocontrol.APP_ID.ROOT) end },
+        { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = function () db.nav.open_app(APP_ID.ROOT) end },
         { label = " \x14 ", color = core.cpair(colors.black, colors.cyan), callback = function () app.switcher(1) end },
         { label = "__?", color = core.cpair(colors.black, colors.lightGray), callback = function () app.switcher(2) end }
     }
@@ -142,6 +152,8 @@ local function new_view(root)
 
         TextBox{parent=search_results,text="Click 'GO' to search..."}
 
+        util.nop()
+
         TextBox{parent=use,y=1,text="System Usage",height=1,alignment=ALIGN.CENTER}
         PushButton{parent=use,x=2,y=1,text="<",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=main_page.nav_to}
 
@@ -202,6 +214,9 @@ local function new_view(root)
 
         -- link help resources
         db.nav.link_help(doc_map)
+
+        -- done, show the app
+        load_pane.set_value(2)
     end
 
     app.set_on_load(load)

pocket/ui/apps/sys_apps.lua

@@ -19,9 +19,10 @@ local TextBox    = require("graphics.elements.textbox")
 
 local PushButton = require("graphics.elements.controls.push_button")
 
+local ALIGN = core.ALIGN
 local cpair = core.cpair
 
-local ALIGN = core.ALIGN
+local APP_ID = pocket.APP_ID
 
 -- create system app pages
 ---@param root graphics_element parent
@@ -34,7 +35,7 @@ local function create_pages(root)
 
     local about_root = Div{parent=root,x=1,y=1}
 
-    local about_app = db.nav.register_app(iocontrol.APP_ID.ABOUT, about_root)
+    local about_app = db.nav.register_app(APP_ID.ABOUT, about_root)
 
     local about_page = about_app.new_page(nil, 1)
     local nt_page = about_app.new_page(about_page, 2)

pocket/ui/apps/unit.lua

@@ -2,34 +2,39 @@
 -- Unit Overview Page
 --
 
-local util      = require("scada-common.util")
--- local log       = require("scada-common.log")
+local util          = require("scada-common.util")
+-- local log           = require("scada-common.log")
 
-local iocontrol = require("pocket.iocontrol")
+local iocontrol     = require("pocket.iocontrol")
+local pocket        = require("pocket.pocket")
 
-local style     = require("pocket.ui.style")
+local style         = require("pocket.ui.style")
 
-local boiler    = require("pocket.ui.pages.unit_boiler")
-local reactor   = require("pocket.ui.pages.unit_reactor")
-local turbine   = require("pocket.ui.pages.unit_turbine")
+local boiler        = require("pocket.ui.pages.unit_boiler")
+local reactor       = require("pocket.ui.pages.unit_reactor")
+local turbine       = require("pocket.ui.pages.unit_turbine")
 
-local core      = require("graphics.core")
+local core          = require("graphics.core")
 
-local Div       = require("graphics.elements.div")
-local ListBox   = require("graphics.elements.listbox")
-local MultiPane = require("graphics.elements.multipane")
-local TextBox   = require("graphics.elements.textbox")
+local Div           = require("graphics.elements.div")
+local ListBox       = require("graphics.elements.listbox")
+local MultiPane     = require("graphics.elements.multipane")
+local TextBox       = require("graphics.elements.textbox")
 
-local DataIndicator     = require("graphics.elements.indicators.data")
-local IconIndicator     = require("graphics.elements.indicators.icon")
--- local RadIndicator      = require("graphics.elements.indicators.rad")
--- local VerticalBar       = require("graphics.elements.indicators.vbar")
+local WaitingAnim   = require("graphics.elements.animations.waiting")
 
-local PushButton        = require("graphics.elements.controls.push_button")
+local DataIndicator = require("graphics.elements.indicators.data")
+local IconIndicator = require("graphics.elements.indicators.icon")
+-- local RadIndicator  = require("graphics.elements.indicators.rad")
+-- local VerticalBar   = require("graphics.elements.indicators.vbar")
+
+local PushButton    = require("graphics.elements.controls.push_button")
 
 local ALIGN = core.ALIGN
 local cpair = core.cpair
 
+local APP_ID = pocket.APP_ID
+
 -- local label        = style.label
 local lu_col       = style.label_unit_pair
 local text_fg      = style.text_fg
@@ -49,11 +54,17 @@ local emc_ind_s = {
 local function new_view(root)
     local db = iocontrol.get_db()
 
-    local main = Div{parent=root,x=1,y=1}
+    local frame = Div{parent=root,x=1,y=1}
 
-    local app = db.nav.register_app(iocontrol.APP_ID.UNITS, main)
+    local app = db.nav.register_app(APP_ID.UNITS, frame)
 
-    TextBox{parent=main,y=2,text="Units App",height=1,alignment=ALIGN.CENTER}
+    local load_div = Div{parent=frame,x=1,y=1}
+    local main = Div{parent=frame,x=1,y=1}
+
+    TextBox{parent=load_div,y=12,text="Loading...",height=1,alignment=ALIGN.CENTER}
+    WaitingAnim{parent=load_div,x=math.floor(main.get_width()/2)-1,y=8,fg_bg=cpair(colors.yellow,colors._INHERIT)}
+
+    local load_pane = MultiPane{parent=main,x=1,y=1,panes={load_div,main}}
 
     TextBox{parent=main,y=4,text="Loading...",height=1,alignment=ALIGN.CENTER}
 
@@ -66,7 +77,7 @@ local function new_view(root)
         local unit = db.units[id] ---@type pioctl_unit
 
         local list = {
-            { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = function () db.nav.open_app(iocontrol.APP_ID.ROOT) end },
+            { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = function () db.nav.open_app(APP_ID.ROOT) end },
             { label = "U-" .. id, color = core.cpair(colors.black, colors.yellow), callback = function () app.switcher(id) end },
             { label = " \x13 ", color = core.cpair(colors.black, colors.red), callback = nav_links[id].alarm },
             { label = "RPS", tall = true, color = core.cpair(colors.black, colors.cyan), callback = nav_links[id].rps },
@@ -174,6 +185,8 @@ local function new_view(root)
 
             --#endregion
 
+            util.nop()
+
             --#region Alarms Tab
 
             local alm_div = Div{parent=page_div}
@@ -349,6 +362,8 @@ local function new_view(root)
             end
 
             --#endregion
+
+            util.nop()
         end
 
         -- setup multipane
@@ -356,6 +371,9 @@ local function new_view(root)
         app.set_root_pane(u_pane)
 
         set_sidebar(active_unit)
+
+        -- done, show the app
+        load_pane.set_value(2)
     end
 
     app.set_on_load(load)

pocket/ui/docs.lua

@@ -102,7 +102,7 @@ doc("G_Fault", "Fault", "Something has gone wrong and/or failed to function.")
 doc("G_FrontPanel", "Front Panel", "A basic interface on the front of a device for viewing and sometimes modifying its state. This is what you see when looking at a computer running one of the SCADA applications.")
 doc("G_Nominal", "Nominal", "Normal operation. Everything operating as intended.")
 doc("G_Ringback", "Ringback", "An indication that an alarm had gone off so that you are aware, even if the alarm condition is no longer met.")
-doc("G_SCRAM", "SCRAM", "[Emergency] shut-down of a reactor by stopping the fission reactor. In Mekanism and here, it isn't always for an emergency.")
+doc("G_SCRAM", "SCRAM", "[Emergency] shut-down of a reactor by stopping the fission. In Mekanism and here, it isn't always for an emergency.")
 doc("G_Transient", "Transient", "A temporary change in state from normal operation. Coolant levels dropping or core temperature rising above nominal values would be examples of transients.")
 doc("G_Trip", "Trip", "A checked condition has occurred, also known as 'tripped'.")
 doc("G_Tripped", "Tripped", "An alarm condition has been met and is still met.")

pocket/ui/main.lua

@@ -5,6 +5,7 @@
 local util         = require("scada-common.util")
 
 local iocontrol    = require("pocket.iocontrol")
+local pocket       = require("pocket.pocket")
 
 local diag_apps    = require("pocket.ui.apps.diag_apps")
 local dummy_app    = require("pocket.ui.apps.dummy_app")
@@ -29,11 +30,12 @@ local Sidebar      = require("graphics.elements.controls.sidebar")
 
 local SignalBar    = require("graphics.elements.indicators.signal")
 
+local ALIGN = core.ALIGN
+local cpair = core.cpair
+
 local LINK_STATE = iocontrol.LINK_STATE
 
-local ALIGN = core.ALIGN
-
-local cpair = core.cpair
+local APP_ID = pocket.APP_ID
 
 -- create new main view
 ---@param main graphics_element main displaybox
@@ -82,14 +84,14 @@ local function init(main)
     diag_apps(page_div)
     dummy_app(page_div)
 
-    assert(util.table_len(db.nav.get_containers()) == iocontrol.APP_ID.NUM_APPS, "app IDs were not sequential or some apps weren't registered")
+    assert(util.table_len(db.nav.get_containers()) == APP_ID.NUM_APPS, "app IDs were not sequential or some apps weren't registered")
 
     db.nav.set_pane(MultiPane{parent=page_div,x=1,y=1,panes=db.nav.get_containers()})
     db.nav.set_sidebar(Sidebar{parent=main_pane,x=1,y=1,height=18,fg_bg=cpair(colors.white,colors.gray)})
 
     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}
 
-    db.nav.open_app(iocontrol.APP_ID.ROOT)
+    db.nav.open_app(APP_ID.ROOT)
 
     --#endregion
 end

pocket/ui/pages/guide_section.lua

@@ -1,3 +1,5 @@
+local util       = require("scada-common.util")
+
 local core       = require("graphics.core")
 
 local Div        = require("graphics.elements.div")
@@ -53,7 +55,11 @@ return function (data, base_page, title, items, scroll_height)
         table.insert(search_db, { string.lower(item.name), item.name, title, view })
 
         PushButton{parent=name_list,text=item.name,alignment=ALIGN.LEFT,fg_bg=cpair(colors.blue,colors.black),active_fg_bg=btn_active,callback=view}
+
+        if i % 12 == 0 then util.nop() end
     end
 
+    util.nop()
+
     return section_page
 end

pocket/ui/pages/home_page.lua

@@ -3,6 +3,7 @@
 --
 
 local iocontrol    = require("pocket.iocontrol")
+local pocket       = require("pocket.pocket")
 
 local core         = require("graphics.core")
 
@@ -12,11 +13,10 @@ local TextBox      = require("graphics.elements.textbox")
 
 local App          = require("graphics.elements.controls.app")
 
+local ALIGN = core.ALIGN
 local cpair = core.cpair
 
-local APP_ID = iocontrol.APP_ID
-
-local ALIGN = core.ALIGN
+local APP_ID = pocket.APP_ID
 
 -- new home page view
 ---@param root graphics_element parent
@@ -25,7 +25,7 @@ local function new_view(root)
 
     local main = Div{parent=root,x=1,y=1,height=19}
 
-    local app = db.nav.register_app(iocontrol.APP_ID.ROOT, main)
+    local app = db.nav.register_app(APP_ID.ROOT, main)
 
     local apps_1 = Div{parent=main,x=1,y=1,height=15}
     local apps_2 = Div{parent=main,x=1,y=1,height=15}