IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

histogram: improved ticks rendering

Browse Source
This commit is contained in:
Alexander Zobnin 2017-06-28 11:03:36 +03:00 committed by Daniel Lee
parent c1c1bcb874
commit 934c0fea6f
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,21 +422,32 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
function addXHistogramAxis(options, bucketSize) { function addXHistogramAxis(options, bucketSize) {
let ticks, min, max; let ticks, min, max;
let defaultTicks = panelWidth / 50;
if (data.length && bucketSize) { if (data.length && bucketSize) {
ticks = _.map(data[0].data, point => point[0]); ticks = _.map(data[0].data, point => point[0]);
min = _.min(ticks);
max = _.max(ticks);
// Adjust tick step
let tickStep = bucketSize;
let ticks_num = Math.floor((max - min) / tickStep);
while (ticks_num > defaultTicks) {
tickStep = tickStep * 2;
ticks_num = Math.ceil((max - min) / tickStep);
}
// Expand ticks for pretty view // Expand ticks for pretty view
min = _.min(ticks) - bucketSize; min = Math.floor(min / tickStep) * tickStep;
max = _.max(ticks) + bucketSize; max = Math.ceil(max / tickStep) * tickStep;
ticks = []; ticks = [];
for (let i = min; i <= max; i += bucketSize) { for (let i = min; i <= max; i += tickStep) {
ticks.push(i); ticks.push(i);
} }
} else { } else {
// Set defaults if no data // Set defaults if no data
ticks = panelWidth / 100; ticks = defaultTicks / 2;
min = 0; min = 0;
max = 1; max = 1;
} }
@ -450,6 +461,9 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
label: "Histogram", label: "Histogram",
ticks: ticks ticks: ticks
}; };
// Use 'short' format for histogram values
configureAxisMode(options.xaxis, 'short');
} }
function addXTableAxis(options) { function addXTableAxis(options) {