ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843: WIP charts: fixed chart height.
Date Fri, 04 Sep 2015 09:22:53 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 3459261c8 -> e3b3c57eb


IGNITE-843: WIP charts: fixed chart height.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e3b3c57e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e3b3c57e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e3b3c57e

Branch: refs/heads/ignite-843
Commit: e3b3c57ebb01a15ab5dbb89c0d6032bc041b7da7
Parents: 3459261
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Fri Sep 4 16:23:24 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Sep 4 16:23:24 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js   | 25 ++++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e3b3c57e/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 2171d92..57b7a0b 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -391,7 +391,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
         // Insert new chart.
         d3.select('#' + chartId + ' svg')
             .datum(datum)
-            .call(chart);
+            .call(chart)
+            .attr('height', 400);
 
         nv.utils.windowResize(chart.update);
 
@@ -403,12 +404,13 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
 
         nv.addGraph(function() {
             var chart = nv.models.discreteBarChart()
-                    .x(function (d) {
-                        return d.label;
-                    })
-                    .y(function (d) {
-                        return d.value;
-                    });
+                .x(function (d) {
+                    return d.label;
+                })
+                .y(function (d) {
+                    return d.value;
+                })
+                .height(400);
 
             var values = _.map(paragraph.rows, function (row) {
                 return {label: (row.length > 1) ? row[1] : index++, value: _isNumber(row,
0, 0)}
@@ -433,7 +435,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
                 .labelThreshold(.05)
                 .labelType("percent")
                 .donut(true)
-                .donutRatio(0.35);
+                .donutRatio(0.35)
+                .height(400);
 
             return _insertChart(paragraph, paragraph.rows, chart);
         });
@@ -451,7 +454,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
         nv.addGraph(function() {
             var chart = nv.models.lineChart()
                 .x(_x)
-                .y(_y);
+                .y(_y)
+                .height(400);
 
             return _insertChart(paragraph, _datum('Line chart', paragraph.rows), chart);
         });
@@ -461,7 +465,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
         nv.addGraph(function() {
             var chart = nv.models.stackedAreaChart()
                 .x(_x)
-                .y(_y);
+                .y(_y)
+                .height(400);
 
             return _insertChart(paragraph, _datum('Area chart', paragraph.rows), chart);
         });


Mime
View raw message