freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

forcegraph: draw labels ontop of everything else

Browse source
This commit is contained in:
Nils Schneider 2015-08-02 00:34:20 +02:00
parent 76fb29d5d8
commit dc5e364803
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/forcegraph.js
View file

@ -291,11 +291,6 @@ define(["d3"], function (d3) {
ctx.restore() ctx.restore()
// -- draw labels --
if (scale > 0.9)
intNodes.filter(visibleNodes).forEach(drawLabel, scale)
// -- draw unknown nodes -- // -- draw unknown nodes --
ctx.beginPath() ctx.beginPath()
unknownNodes.filter(visibleNodes).forEach(function (d) { unknownNodes.filter(visibleNodes).forEach(function (d) {
@ -398,6 +393,10 @@ define(["d3"], function (d3) {
ctx.restore() ctx.restore()
} }
// -- draw labels --
if (scale > 0.9)
intNodes.filter(visibleNodes).forEach(drawLabel, scale)
ctx.restore() ctx.restore()
} }
@ -609,7 +608,7 @@ define(["d3"], function (d3) {
var name = nodeName(d) var name = nodeName(d)
var offset = 8 var offset = 5
var lineWidth = 3 var lineWidth = 3
var buffer = document.createElement("canvas") var buffer = document.createElement("canvas")
var r = window.devicePixelRatio var r = window.devicePixelRatio
@ -622,12 +621,9 @@ define(["d3"], function (d3) {
bctx.scale(scale, scale) bctx.scale(scale, scale)
bctx.textBaseline = "middle" bctx.textBaseline = "middle"
bctx.textAlign = "center" bctx.textAlign = "center"
bctx.lineWidth = lineWidth bctx.fillStyle = "rgba(242, 227, 198, 1.0)"
bctx.lineCap = "round" bctx.shadowColor = "rgba(0, 0, 0, 1)"
bctx.strokeStyle = "rgba(53, 54, 52, 0.1)" bctx.shadowBlur = 5
bctx.fillStyle = "rgba(242, 227, 198, 0.8)"
bctx.miterLimit = 2
bctx.strokeText(name, buffer.width / (2 * scale), buffer.height / (2 * scale))
bctx.fillText(name, buffer.width / (2 * scale), buffer.height / (2 * scale)) bctx.fillText(name, buffer.width / (2 * scale), buffer.height / (2 * scale))
d.label = buffer d.label = buffer