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

#113 power formatting on turbine energy in main overview

Browse Source
This commit is contained in:
Mikayla Fischler
2022-11-02 14:47:18 -04:00
parent 54264f5149
commit c620310e51
6 changed files with 160 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coordinator/startup.lua
View File

@@ -16,7 +16,7 @@ local config = require("coordinator.config")
local coordinator = require("coordinator.coordinator")
local renderer = require("coordinator.renderer")
local COORDINATOR_VERSION = "alpha-v0.6.0"
local COORDINATOR_VERSION = "alpha-v0.6.1"
local print = util.print
local println = util.println

3
coordinator/ui/components/turbine.lua
View File

@@ -4,6 +4,7 @@ local util = require("scada-common.util")
local style = require("coordinator.ui.style")
local DataIndicator = require("graphics.elements.indicators.data")
local PowerIndicator = require("graphics.elements.indicators.power")
local StateIndicator = require("graphics.elements.indicators.state")
local Rectangle = require("graphics.elements.rectangle")
local VerticalBar = require("graphics.elements.indicators.vbar")
@@ -23,7 +24,7 @@ local function new_view(root, x, y, ps)
local lu_col = cpair(colors.gray, colors.gray)
local status = StateIndicator{parent=turbine,x=8,y=1,states=style.turbine.states,value=1,min_width=10}
local prod_rate = DataIndicator{parent=turbine,x=5,y=3,lu_colors=lu_col,label="",unit="FE",format="%10.2f",value=0,width=16,fg_bg=text_fg_bg}
local prod_rate = PowerIndicator{parent=turbine,x=5,y=3,lu_colors=lu_col,label="",format="%10.2f",value=0,width=16,fg_bg=text_fg_bg}
local flow_rate = DataIndicator{parent=turbine,x=5,y=4,lu_colors=lu_col,label="",unit="mB/t",format="%10.0f",value=0,commas=true,width=16,fg_bg=text_fg_bg}
ps.subscribe("computed_status", status.update)