You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/04 19:57:13 UTC
[19/36] incubator-nifi git commit: NIFI-287: - Updating the way
active thread count is displayed.
NIFI-287:
- Updating the way active thread count is displayed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d145e209
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d145e209
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d145e209
Branch: refs/heads/NIFI-250
Commit: d145e2098fcd7f0b1165e0ed37e93ab9482728b2
Parents: 9c61bdb
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Feb 3 09:43:01 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Feb 3 09:43:01 2015 -0500
----------------------------------------------------------------------
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 17 ++++++++++++++---
.../main/webapp/js/nf/canvas/nf-process-group.js | 6 +++---
.../webapp/js/nf/canvas/nf-remote-process-group.js | 2 +-
3 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d145e209/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
index 40116ca..83a3117 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
@@ -349,7 +349,7 @@ nf.CanvasUtils = (function () {
.each(function () {
var bBox = this.getBBox();
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')
.attr('width', function () {
var bBox = activeThreadCount.node().getBBox();
- return bBox.width + 4;
+ return bBox.width + 8;
})
.attr('x', function () {
var bBox = activeThreadCount.node().getBBox();
@@ -367,7 +367,18 @@ nf.CanvasUtils = (function () {
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');
} else {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d145e209/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
index 0bd522c..ae42547 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group.js
@@ -565,9 +565,9 @@ nf.ProcessGroup = (function () {
.attr({
'class': 'active-thread-count-background',
'height': 13,
- 'y': 2,
+ 'y': 0,
'fill': '#fff',
- 'fill-opacity': '0.65',
+ 'fill-opacity': '0.4',
'stroke': '#aaa',
'stroke-width': '1'
});
@@ -577,7 +577,7 @@ nf.ProcessGroup = (function () {
.attr({
'class': 'active-thread-count',
'height': 13,
- 'y': 12,
+ 'y': 10,
'fill': '#000'
});
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d145e209/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
----------------------------------------------------------------------
diff --git a/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 b/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
index e55f5bb..6c4a302 100644
--- a/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
+++ b/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
@@ -512,7 +512,7 @@ nf.RemoteProcessGroup = (function () {
'height': 13,
'y': 0,
'fill': '#fff',
- 'fill-opacity': '0.65',
+ 'fill-opacity': '0.4',
'stroke': '#aaa',
'stroke-width': '1'
});