cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 01:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

tgui power monitor; linegraph component

Browse Source
This commit is contained in:
Bjorn Neergaard
2016-02-02 17:40:55 -06:00
parent c5e6a922ca
commit 29fdf73cc6
17 changed files with 267 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/power.dm
-113
View File
@@ -1,113 +0,0 @@
// the power monitoring computer
// for the moment, just report the status of all APCs in the same powernet
/obj/machinery/computer/monitor
name = "power monitoring console"
desc = "It monitors power levels across the station."
icon_screen = "power"
icon_keyboard = "power_key"
use_power = 2
idle_power_usage = 20
active_power_usage = 80
circuit = /obj/item/weapon/circuitboard/powermonitor
var/datum/powernet/powernet = null
//fix for issue 521, by QualityVan.
//someone should really look into why circuits have a powernet var, it's several kinds of retarded.
/obj/machinery/computer/monitor/New()
..()
var/obj/structure/cable/attached = null
var/turf/T = loc
if(isturf(T))
attached = locate() in T
if(attached)
powernet = attached.get_powernet()
/obj/machinery/computer/monitor/process() //oh shit, somehow we didnt end up with a powernet... lets look for one.
if(!powernet)
var/obj/structure/cable/attached = null
var/turf/T = loc
if(isturf(T))
attached = locate() in T
if(attached)
powernet = attached.get_powernet()
return
/obj/machinery/computer/monitor/attack_hand(mob/user)
if(..())
return
interact(user)
/obj/machinery/computer/monitor/interact(mob/user)
if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if (!(istype(user, /mob/living/silicon) || IsAdminGhost(user)))
user.unset_machine()
user << browse(null, "window=powcomp")
return
user.set_machine(src)
var/t = ""
t += "<A href='?src=\ref[src];update=1'>Refresh</A> <A href='?src=\ref[src];close=1'>Close</A><br /><br />"
if(!powernet)
t += "<span class='danger'>No connection.</span>"
else
var/list/L = list()
for(var/obj/machinery/power/terminal/term in powernet.nodes)
if(istype(term.master, /obj/machinery/power/apc))
var/obj/machinery/power/apc/A = term.master
L += A
t += "<PRE>Total power: [powernet.avail] W<BR>Total load: [num2text(powernet.viewload,10)] W<BR>"
t += "<FONT SIZE=-1>"
if(L.len > 0)
t += "Area Eqp./Lgt./Env. Load Cell<HR>"
var/list/S = list("<SPAN class='bad'> Off</SPAN>","<SPAN class='bad'>AOff</SPAN>","<SPAN class='good'> On</SPAN>", "<SPAN class='good'> AOn</SPAN>")
var/list/chg = list("<SPAN class='bad'>N</SPAN>","<SPAN class='average'>C</SPAN>","<SPAN class='good'>F</SPAN>")
var/percent = 0
var/c = ""
for(var/obj/machinery/power/apc/A in L)
t += copytext(add_tspace("[format_text(A.area.name)]", 30), 1, 30)
t += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)]"
if (A.cell)
percent = round(A.cell.percent())
c = "bad"
if (percent > 50)
c = "good"
else if (percent > 25)
c = "average"
t += "<SPAN class='[c]'>[add_lspace(percent, 4)]%</SPAN> [chg[A.charging+1]]<BR>"
else
t += " N/C<BR>"
t += "</FONT></PRE>"
//user << browse(t, "window=powcomp;size=420x900")
//onclose(user, "powcomp")
var/datum/browser/popup = new(user, "powcomp", name, 500, 450)
popup.set_content(t)
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open()
/obj/machinery/computer/monitor/Topic(href, href_list)
if(..())
return
if( href_list["close"] )
usr << browse(null, "window=powcomp")
usr.unset_machine()
return
if( href_list["update"] )
src.updateDialog()
return
code/game/objects/items/devices/PDA/cart.dm
+2 -2
View File
@@ -347,12 +347,12 @@ Code:
menu += "<span class='danger'>No connection<BR></span>"
else
var/list/L = list()
for(var/obj/machinery/power/terminal/term in powmonitor.powernet.nodes)
for(var/obj/machinery/power/terminal/term in powmonitor.attached.powernet.nodes)
if(istype(term.master, /obj/machinery/power/apc))
var/obj/machinery/power/apc/A = term.master
L += A
menu += "<PRE>Total power: [powmonitor.powernet.avail] W<BR>Total load: [num2text(powmonitor.powernet.viewload,10)] W<BR>"
menu += "<PRE>Total power: [powmonitor.attached.powernet.viewavail] W<BR>Total load: [num2text(powmonitor.attached.powernet.viewload,10)] W<BR>"
menu += "<FONT SIZE=-1>"
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
-1
View File
@@ -6,7 +6,6 @@
var/icon_state_open = "cold_off"
density = TRUE
anchored = TRUE
idle_power_usage = 25
var/on = FALSE
var/min_temperature = 0
code/modules/power/apc.dm
+1 -1
View File
@@ -625,7 +625,7 @@
"powerCellStatus" = cell ? cell.percent() : null,
"chargeMode" = chargemode,
"chargingStatus" = charging,
"totalLoad" = lastused_equip + lastused_light + lastused_environ,
"totalLoad" = lastused_total,
"coverLocked" = coverlocked,
"siliconUser" = user.has_unlimited_silicon_privilege,
"malfStatus" = get_malf_status(user),
code/modules/power/cable.dm
-5
View File
@@ -114,11 +114,6 @@ By design, d1 is the smallest direction and d2 is the highest
else
icon_state = "[d1]-[d2]"
// returns the powernet this cable belongs to
/obj/structure/cable/proc/get_powernet() //TODO: remove this as it is obsolete
return powernet
//Telekinesis has no effect on a cable
/obj/structure/cable/attack_tk(mob/user)
return
code/modules/power/monitor.dm
+81
View File
@@ -0,0 +1,81 @@
/obj/machinery/computer/monitor
name = "power monitoring console"
desc = "It monitors power levels across the station."
icon_screen = "power"
icon_keyboard = "power_key"
use_power = 2
idle_power_usage = 20
active_power_usage = 100
circuit = /obj/item/weapon/circuitboard/powermonitor
var/obj/structure/cable/attached
var/list/history = list()
var/record_size = 60
var/record_interval = 50
var/next_record = 0
/obj/machinery/computer/monitor/New()
..()
search()
history["supply"] = list()
history["demand"] = list()
/obj/machinery/computer/monitor/process()
if(!attached)
use_power = 1
search()
else
use_power = 2
record()
/obj/machinery/computer/monitor/proc/search()
var/turf/T = get_turf(src)
attached = locate() in T
/obj/machinery/computer/monitor/proc/record()
if(world.time >= next_record)
next_record = world.time + record_interval
var/list/supply = history["supply"]
supply += attached.powernet.viewavail
if(supply.len > record_size)
supply.Cut(1, 2)
var/list/demand = history["demand"]
demand += attached.powernet.viewload
if(demand.len > record_size)
demand.Cut(1, 2)
/obj/machinery/computer/monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
datum/tgui/master_ui = null, datum/ui_state/state = default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "power_monitor", name, 1200, 1000, master_ui, state)
ui.open()
/obj/machinery/computer/monitor/get_ui_data()
var/list/data = list()
data["stored"] = record_size
data["interval"] = record_interval / 10
data["attached"] = attached ? TRUE : FALSE
if(attached)
data["supply"] = attached.powernet.viewavail
data["demand"] = attached.powernet.viewload
data["history"] = history
data["areas"] = list()
for(var/obj/machinery/power/terminal/term in attached.powernet.nodes)
var/obj/machinery/power/apc/A = term.master
if(istype(A))
data["areas"] += list(list(
"name" = A.area.name,
"charge" = A.cell.percent(),
"load" = A.lastused_total,
"charging" = A.charging,
"eqp" = A.equipment,
"lgt" = A.lighting,
"env" = A.environ
))
return data
code/modules/power/power.dm
+1 -1
View File
@@ -34,7 +34,7 @@
/obj/machinery/power/proc/surplus()
if(powernet)
return powernet.avail-powernet.load
return powernet.avail - powernet.load
else
return 0
code/modules/power/powernet.dm
+6 -6
View File
@@ -3,14 +3,15 @@
// each contiguous network of cables & nodes
/////////////////////////////////////
/datum/powernet
var/number // unique id
var/list/cables = list() // all cables & junctions
var/list/nodes = list() // all connected machines
var/load = 0 // the current load on the powernet, increased by each machine at processing
var/newavail = 0 // what available power was gathered last tick, then becomes...
var/avail = 0 //...the current available power in the powernet
var/viewavail = 0 // the available power as it appears on the power console (gradually updated)
var/viewload = 0 // the load as it appears on the power console (gradually updated)
var/number = 0 // Unused //TODEL
var/netexcess = 0 // excess power on the powernet (typically avail-load)///////
/datum/powernet/New()
@@ -75,7 +76,6 @@
//handles the power changes in the powernet
//called every ticks by the powernet controller
/datum/powernet/proc/reset()
//see if there's a surplus of power remaining in the powernet and stores unused power in the SMES
netexcess = avail - load
@@ -83,11 +83,11 @@
for(var/obj/machinery/power/smes/S in nodes) // find the SMESes in the network
S.restore() // and restore some of the power that was used
//updates the viewed load (as seen on power computers)
viewload = 0.8*viewload + 0.2*load
viewload = round(viewload)
// update power consoles
viewavail = round(0.8 * viewavail + 0.2 * avail)
viewload = round(0.8 * viewload + 0.2 * load)
//reset the powernet
// reset the powernet
load = 0
avail = newavail
newavail = 0
tgstation.dme
+1 -1
View File
@@ -417,7 +417,6 @@
#include "code\game\machinery\computer\message.dm"
#include "code\game\machinery\computer\Operating.dm"
#include "code\game\machinery\computer\pod.dm"
#include "code\game\machinery\computer\power.dm"
#include "code\game\machinery\computer\prisoner.dm"
#include "code\game\machinery\computer\robot.dm"
#include "code\game\machinery\computer\security.dm"
@@ -1385,6 +1384,7 @@
#include "code\modules\power\generator.dm"
#include "code\modules\power\gravitygenerator.dm"
#include "code\modules\power\lighting.dm"
#include "code\modules\power\monitor.dm"
#include "code\modules\power\port_gen.dm"
#include "code\modules\power\power.dm"
#include "code\modules\power\powernet.dm"
tgui/assets/tgui.css
+1 -1
View File
File diff suppressed because one or more lines are too long
tgui/assets/tgui.js
+12 -11
View File
File diff suppressed because one or more lines are too long
tgui/package.json
+1
View File
@@ -30,6 +30,7 @@
"html5shiv": "3.7.3",
"ie8": "0.3.2",
"minimist": "1.2.0",
"paths-js": "0.4.2",
"pleeease-filters": "2.0.0",
"postcss": "5.0.14",
"postcss-color-rgba-fallback": "2.2.0",
tgui/src/components/linegraph.ract
+89
View File
@@ -0,0 +1,89 @@
<script>
component.exports = {
data: {
graph: require('paths-js/smooth-line'),
xaccessor: point => point.x,
yaccessor: point => point.y,
height: 600
},
computed: {
size () {
const points = this.get('points')
return points[0].length
},
scale () {
const points = this.get('points')
return Math.max(...Array.map(points, a => Math.max(...Array.map(a, p => p.y))))
},
xaxis () {
const xinc = this.get('xinc')
const size = this.get('size')
return Array.from(Array(size).keys()).filter(num => num && num % xinc == 0)
},
yaxis () {
const yinc = this.get('yinc')
const scale = this.get('scale')
return Array.from(Array(yinc).keys()).map(num => Math.round((scale * (++num / 100)) * 10))
}
},
oninit () {
this.on({
enter (event) {
this.set('selected', event.index.count)
},
exit (event) {
this.set('selected')
}
})
window.addEventListener('resize', (event) => {
this.set('width', this.el.clientWidth)
})
},
onrender () {
this.set('width', this.el.clientWidth)
}
}
</script>
<svg class='linegraph' width='100%' height='{{height + 10}}'>
<g transform='translate(0, 5)'>
{{#graph({data: points, xaccessor: xaccessor, yaccessor: yaccessor, width: width, height: height})}}
{{#each xaxis}}
<line x1='{{xscale(.)}}' x2='{{xscale(.)}}' y1='0' y2='{{height}}' stroke='darkgray'/>
{{#if @index % 2 == 0}}
<text x='{{xscale(.)}}' y='{{height - 5}}' text-anchor='middle' fill='white'>{{(size - .) * xfactor}} {{xunit}}</text>
{{/if}}
{{/each}}
{{#each yaxis}}
<line x1='0' x2='{{width}}' y1='{{yscale(.)}}' y2='{{yscale(.)}}' stroke='darkgray'/>
<text x='0' y='{{yscale(.) - 5}}' text-anchor='begin' fill='white'>{{. * yfactor}} {{yunit}}</text>
{{/each}}
{{#each curves:curve}}
<path d='{{area.path.print()}}' fill='{{colors[curve]}}' opacity='0.1'/>
{{/each}}
{{#each curves:curve}}
<path d='{{line.path.print()}}' stroke='{{colors[curve]}}' fill='none'/>
{{/each}}
{{#each curves:curve}}
{{#each line.path.points():count}}
<circle transform='translate({{.}})' r='{{selected == count ? 10 : 4}}' fill='{{colors[curve]}}' on-mouseenter='enter' on-mouseleave='exit'/>
{{/each}}
{{/each}}
{{#each curves:curve}}
{{#each line.path.points():count}}
{{#if selected == count }}
<text transform='translate({{.}}) {{count <= size / 2 ? "translate(15, 4)" : "translate(-15, 4)"}}' text-anchor='{{count <= size / 2 ? "start" : "end"}}' fill='white'>
{{item[count].y * yfactor}} {{yunit}} @ {{(size - item[count].x) * xfactor}} {{xunit}}
</text>
{{/if}}
{{/each}}
{{/each}}
{{#each curves:curve}}
<g transform='translate({{(width / (curves.length + 1)) * (@index + 1)}}, 10)'>
<circle r='4' fill='{{colors[curve]}}'/>
<text x='8' y='4' fill='white'>{{legend[curve]}}</text>
</g>
{{/each}}
{{/graph}}
</g>
</svg>
tgui/src/components/linegraph.styl
+2
View File
@@ -0,0 +1,2 @@
svg.linegraph
overflow: hidden
tgui/src/interfaces/power_monitor.ract
+68
View File
@@ -0,0 +1,68 @@
<script>
component.exports = {
data: {
chargingState (status) {
switch (status) {
case 2: return 'good'
case 1: return 'average'
default: return 'bad'
}
},
chargingMode (status) {
if (status == 2) return 'Full'
else if (status == 1) return 'Charging'
else return 'Draining'
},
channelState (status) {
if (status >= 2) return 'good'
else return 'bad'
},
channelPower (status) {
if (status >= 2) return 'On'
else return 'Off'
},
channelMode (status) {
if (status == 1 || status == 3) return 'Auto'
else return 'Manual'
}
},
computed: {
graphData () {
const history = this.get('data.history')
return Object.keys(history).map(key => {
return history[key].map((point, index) => {
return { x: index, y: point }
})
})
}
}
}
</script>
<ui-display title='Network'>
<ui-linegraph points='{{graphData}}'
legend='["Available", "Used"]' colors='["rgb(0, 102, 0)", "rgb(153, 0, 0)"]'
xunit='seconds ago' xfactor='{{data.interval}}' yunit='W' yfactor='1'
xinc='{{data.stored / 10}}' yinc='9'>
</ui-display>
<ui-display title='Areas'>
<ui-section nowrap>
<div class='content'>Area</div>
<div class='content'>Charge</div>
<div class='content'>Load</div>
<div class='content'>Status</div>
<div class='content'>Equipment</div>
<div class='content'>Lighting</div>
<div class='content'>Environment</div>
</ui-section>
{{#each data.areas}}
<ui-section label='{{name}}' nowrap>
<div class='content'>{{Math.round(adata.areas[@index].charge)}} %</div>
<div class='content'>{{Math.round(adata.areas[@index].load)}} W</div>
<div class='content'><span class='{{chargingState(charging)}}'>{{chargingMode(charging)}}</span></div>
<div class='content'><span class='{{channelState(eqp)}}'>{{channelPower(eqp)}} [<span>{{channelMode(eqp)}}</span>]</span></div>
<div class='content'><span class='{{channelState(lgt)}}'>{{channelPower(lgt)}} [<span>{{channelMode(lgt)}}</span>]</span></div>
<div class='content'><span class='{{channelState(env)}}'>{{channelPower(env)}} [<span>{{channelMode(env)}}</span>]</span></div>
</ui-section>
{{/each}}
</ui-display>
tgui/src/tgui.ract
+1
View File
@@ -12,6 +12,7 @@ component.exports = {
'ui-button': require('components/button'),
'ui-display': require('components/display'),
'ui-input': require('components/input'),
'ui-linegraph': require('components/linegraph'),
'ui-notice': require('components/notice'),
'ui-section': require('components/section'),
'ui-subdisplay': require('components/subdisplay'),
tgui/src/util/tooltip.styl
+1 -1
View File
@@ -1,4 +1,4 @@
[data-tooltip]
div[data-tooltip], span[data-tooltip]
position: relative
&::after