You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/09/28 15:15:41 UTC
[69/69] [abbrv] stratos git commit: Fix for member count line chart
series plotted outside without y-scale
Fix for member count line chart series plotted outside without y-scale
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/224b2302
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/224b2302
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/224b2302
Branch: refs/heads/stratos-4.1.x
Commit: 224b2302854338bef646007e62d5bd1f17660d89
Parents: 8293e36
Author: Thanuja <th...@wso2.com>
Authored: Mon Sep 28 01:14:24 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Sep 28 18:44:19 2015 +0530
----------------------------------------------------------------------
.../Member_Count/js/igviz.js | 26 +++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/224b2302/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/igviz.js
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/igviz.js b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/igviz.js
index 0bf9913..7d827fd 100644
--- a/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/igviz.js
+++ b/extensions/das/metering-service/capps/stratos-metering-service/Gadget_Member_Count/Member_Count/js/igviz.js
@@ -75,7 +75,8 @@
"range": "width",
"zero": false,
"clamp": false,
- "field": xString
+ "field": xString,
+ "round": true
}
yScaleConfig = {
@@ -87,8 +88,27 @@
"field": yStrings[0]
}
- var xScale = setScale(xScaleConfig)
- var yScale = setScale(yScaleConfig);
+ var yDomain = [];
+ chartConfig.yAxis.forEach(function (columnIndex, i) {
+ dataTable.data.forEach(function (row, j) {
+ yDomain.push(row[columnIndex]);
+ });
+ });
+
+ yDomain.sort(function (a, b) {
+ return a - b;
+ });
+
+ var yScale = {
+ name: "y",
+ type: "linear",
+ range: "height",
+ zero: true,
+ domain: [yDomain[0], yDomain[yDomain.length - 1]]
+ };
+
+ var xScale = setScale(xScaleConfig);
+ var yScale = yScale;
var xAxisConfig = {
"type": "x",