You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/25 06:34:41 UTC
ignite git commit: IGNITE-843 Minor charts tweaks.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 3f29a19a7 -> b29d0171e
IGNITE-843 Minor charts tweaks.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b29d0171
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b29d0171
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b29d0171
Branch: refs/heads/ignite-843
Commit: b29d0171e33474d54af7a5ae26da293fe0a715e6
Parents: 3f29a19
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 25 11:34:43 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 25 11:34:43 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 6 ++----
.../src/main/js/views/sql/chart-settings.jade | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b29d0171/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 47525bb..83ec8a3 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
@@ -393,7 +393,7 @@ controlCenterModule.controller('sqlController',
_.forEach(res.meta, function (meta, idx) {
if (paragraph.columnFilter(meta)) {
- paragraph.chartColumns.push({value: idx + 1, label: meta.fieldName});
+ paragraph.chartColumns.push({value: idx, label: meta.fieldName});
columnDefs.push({
headerName: meta.fieldName,
@@ -714,8 +714,6 @@ controlCenterModule.controller('sqlController',
if (remove)
d3.select('#' + chartId).selectAll('*').remove();
- chart.height(400);
-
if (chart.xAxis)
chart.xAxis.axisLabel(xAxisLabel);
@@ -763,7 +761,6 @@ controlCenterModule.controller('sqlController',
return d.val;
}
-
function _barChart(paragraph) {
nv.addGraph(function() {
var chart = nv.models.multiBarChart()
@@ -818,6 +815,7 @@ controlCenterModule.controller('sqlController',
function _lineChart(paragraph) {
nv.addGraph(function() {
var chart = nv.models.lineChart()
+ .useInteractiveGuideline(true)
.x(_xX)
.y(_yY)
.margin({left: 70});
http://git-wip-us.apache.org/repos/asf/ignite/blob/b29d0171/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
index 1650ee1..11e896c 100644
--- a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
+++ b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
@@ -22,16 +22,16 @@
form.form-horizontal.chart-settings(name='chartSettingsForm' novalidate)
.form-group.chart-settings
label All columns
- ul.chart-settings-columns-list( dnd-list='paragraph.chartColumns' dnd-allowed-types='[]')
+ ul.chart-settings-columns-list(dnd-list='paragraph.chartColumns' dnd-allowed-types='[]')
li(ng-repeat='col in paragraph.chartColumns track by $index')
.btn.btn-default.btn-chart-column-movable(dnd-draggable='col' dnd-effect-allowed='copy' dnd-dragstart='chartSettingsDragStart(paragraph)') {{col.label}}
label X axis
- ul.chart-settings-columns-list(id='chart-settings-keys' dnd-list='paragraph.chartKeyCols' dnd-disable-if='paragraph.chartKeyCols.length > 0' dnd-drop='acceptKeyColumn(event, index, item, external, type, allowedType)')
+ ul.chart-settings-columns-list(dnd-list='paragraph.chartKeyCols' dnd-disable-if='paragraph.chartKeyCols.length > 0' dnd-drop='acceptKeyColumn(event, index, item, external, type, allowedType)')
li(ng-repeat='col in paragraph.chartKeyCols track by $index')
.btn.btn-info.btn-chart-column {{col.label}}
i.fa.fa-close(ng-click='removeKeyColumn(paragraph, $index)')
label Y axis
- ul.chart-settings-columns-list(id='chart-settings-vals' dnd-list='paragraph.chartValCols' dnd-drop='acceptValColumn(event, index, item, external, type, allowedType)')
+ ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='acceptValColumn(event, index, item, external, type, allowedType)')
li(ng-repeat='col in paragraph.chartValCols track by $index')
.btn.btn-success.btn-chart-column {{col.label}}
i.fa.fa-close(ng-click='removeValColumn(paragraph, $index)')