Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-287: 

- Updating the way active thread count is displayed.
This commit is contained in:
Matt Gilman 2015-02-03 09:43:01 -05:00
parent 9c61bdb102
commit d145e2098f
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
View File

@ -349,7 +349,7 @@ nf.CanvasUtils = (function () {
.each(function () { .each(function () {
var bBox = this.getBBox(); var bBox = this.getBBox();
d3.select(this).attr('x', function () { d3.select(this).attr('x', function () {
return d.dimensions.width - bBox.width - 2; return d.dimensions.width - bBox.width - 4;
}); });
}); });
@ -357,7 +357,7 @@ nf.CanvasUtils = (function () {
selection.select('rect.active-thread-count-background') selection.select('rect.active-thread-count-background')
.attr('width', function () { .attr('width', function () {
var bBox = activeThreadCount.node().getBBox(); var bBox = activeThreadCount.node().getBBox();
return bBox.width + 4; return bBox.width + 8;
}) })
.attr('x', function () { .attr('x', function () {
var bBox = activeThreadCount.node().getBBox(); var bBox = activeThreadCount.node().getBBox();
@ -367,7 +367,18 @@ nf.CanvasUtils = (function () {
setOffset(bBox.width + 6); setOffset(bBox.width + 6);
} }
return d.dimensions.width - bBox.width - 4; return d.dimensions.width - bBox.width - 8;
})
.attr('stroke-dasharray', function() {
var rect = d3.select(this);
var width = parseFloat(rect.attr('width'));
var height = parseFloat(rect.attr('height'));
var dashArray = [];
dashArray.push(0);
dashArray.push(width + height);
dashArray.push(width + height);
return dashArray.join(' ');
}) })
.style('display', 'block'); .style('display', 'block');
} else { } else {

6
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
View File

@ -565,9 +565,9 @@ nf.ProcessGroup = (function () {
.attr({ .attr({
'class': 'active-thread-count-background', 'class': 'active-thread-count-background',
'height': 13, 'height': 13,
'y': 2, 'y': 0,
'fill': '#fff', 'fill': '#fff',
'fill-opacity': '0.65', 'fill-opacity': '0.4',
'stroke': '#aaa', 'stroke': '#aaa',
'stroke-width': '1' 'stroke-width': '1'
}); });
@ -577,7 +577,7 @@ nf.ProcessGroup = (function () {
.attr({ .attr({
'class': 'active-thread-count', 'class': 'active-thread-count',
'height': 13, 'height': 13,
'y': 12, 'y': 10,
'fill': '#000' 'fill': '#000'
}); });

2
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
View File

@ -512,7 +512,7 @@ nf.RemoteProcessGroup = (function () {
'height': 13, 'height': 13,
'y': 0, 'y': 0,
'fill': '#fff', 'fill': '#fff',
'fill-opacity': '0.65', 'fill-opacity': '0.4',
'stroke': '#aaa', 'stroke': '#aaa',
'stroke-width': '1' 'stroke-width': '1'
}); });