opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-23 01:43:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(graph): refactoring

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-26 14:04:13 +02:00
parent acfde82c0a
commit 40e6317b7b
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/panel/graph/axes_editor.ts
View File

@ -30,7 +30,7 @@ export class AxesEditorCtrl {
this.xAxisModes = { this.xAxisModes = {
'Time': 'time', 'Time': 'time',
'Series': 'series', 'Series': 'series',
'Data field': 'field', // 'Data field': 'field',
}; };
this.xAxisStatOptions = [ this.xAxisStatOptions = [

1
public/app/plugins/panel/graph/data_processor.ts
View File

@ -68,6 +68,7 @@ export class DataProcessor {
this.panel.stack = false; this.panel.stack = false;
this.panel.legend.show = false; this.panel.legend.show = false;
this.panel.tooltip.shared = false; this.panel.tooltip.shared = false;
this.panel.xaxis.values = ['total'];
break; break;
} }
} }

30
public/app/plugins/panel/graph/graph.ts
View File

@ -236,24 +236,10 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
} }
}; };
for (var i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
var series = data[i]; var series = data[i];
series.data = series.getFlotPairs(series.nullPointMode || panel.nullPointMode); series.data = series.getFlotPairs(series.nullPointMode || panel.nullPointMode);
if (panel.xaxis.mode === 'series') {
series.data = [[i + 1, series.stats[panel.xaxis.values[0]]]];
} else if (panel.xaxis.mode === 'table' || panel.xaxis.mode === 'elastic') {
series.data = [];
for (var j = 0; j < series.datapoints.length; j++) {
var dataIndex = i * series.datapoints.length + j;
series.datapoints[j];
series.data.push([
dataIndex + 1,
series.datapoints[j][0]
]);
}
}
// if hidden remove points and disable stack // if hidden remove points and disable stack
if (ctrl.hiddenSeries[series.alias]) { if (ctrl.hiddenSeries[series.alias]) {
series.data = []; series.data = [];
@ -265,6 +251,12 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
case 'series': { case 'series': {
options.series.bars.barWidth = 0.7; options.series.bars.barWidth = 0.7;
options.series.bars.align = 'center'; options.series.bars.align = 'center';
for (let i = 0; i < data.length; i++) {
var series = data[i];
series.data = [[i + 1, series.stats[panel.xaxis.values[0]]]];
}
addXSeriesAxis(options); addXSeriesAxis(options);
break; break;
} }
@ -483,7 +475,7 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
var defaults = { var defaults = {
position: 'left', position: 'left',
show: panel.yaxes[0].show, show: panel.yaxes[0].show,
// min: panel.yaxes[0].min, min: panel.yaxes[0].min,
index: 1, index: 1,
logBase: panel.yaxes[0].logBase || 1, logBase: panel.yaxes[0].logBase || 1,
max: panel.percentage && panel.stack ? 100 : panel.yaxes[0].max, max: panel.percentage && panel.stack ? 100 : panel.yaxes[0].max,
@ -494,11 +486,11 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) {
if (_.find(data, {yaxis: 2})) { if (_.find(data, {yaxis: 2})) {
var secondY = _.clone(defaults); var secondY = _.clone(defaults);
secondY.index = 2, secondY.index = 2;
secondY.show = panel.yaxes[1].show; secondY.show = panel.yaxes[1].show;
secondY.logBase = panel.yaxes[1].logBase || 1, secondY.logBase = panel.yaxes[1].logBase || 1;
secondY.position = 'right'; secondY.position = 'right';
// secondY.min = panel.yaxes[1].min; secondY.min = panel.yaxes[1].min;
secondY.max = panel.percentage && panel.stack ? 100 : panel.yaxes[1].max; secondY.max = panel.percentage && panel.stack ? 100 : panel.yaxes[1].max;
// autoscaleSpanOverride(panel.yaxes[1], data[1], secondY); // autoscaleSpanOverride(panel.yaxes[1], data[1], secondY);
options.yaxes.push(secondY); options.yaxes.push(secondY);