From b63d2b3279256f009bbb7d263a7e15ea4829f295 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Tue, 27 Jun 2017 12:26:41 +0300 Subject: [PATCH] heatmap: fix Y axis decimals with log scale --- public/app/plugins/panel/heatmap/rendering.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/public/app/plugins/panel/heatmap/rendering.ts b/public/app/plugins/panel/heatmap/rendering.ts index 153375dfa41..54dbb812a95 100644 --- a/public/app/plugins/panel/heatmap/rendering.ts +++ b/public/app/plugins/panel/heatmap/rendering.ts @@ -132,7 +132,7 @@ export default function link(scope, elem, attrs, ctrl) { ticks = Math.ceil((y_max - y_min) / tick_interval); let decimalsAuto = getPrecision(tick_interval); - let decimals = panel.yAxis.decimals === null ? getPrecision(tick_interval) : panel.yAxis.decimals; + let decimals = panel.yAxis.decimals === null ? decimalsAuto : panel.yAxis.decimals; let scaledDecimals = getScaledDecimals(decimals, tick_interval); // Set default Y min and max if no data @@ -215,7 +215,10 @@ export default function link(scope, elem, attrs, ctrl) { let domain = yScale.domain(); let tick_values = logScaleTickValues(domain, log_base); - let decimals = panel.yAxis.decimals; + + let decimalsAuto = getPrecision(y_min); + let decimals = panel.yAxis.decimals || decimalsAuto; + let scaledDecimals = decimals - 2; data.yAxis = { min: y_min, @@ -225,7 +228,7 @@ export default function link(scope, elem, attrs, ctrl) { let yAxis = d3.axisLeft(yScale) .tickValues(tick_values) - .tickFormat(tickValueFormatter(decimals)) + .tickFormat(tickValueFormatter(decimals, scaledDecimals)) .tickSizeInner(0 - width) .tickSizeOuter(0) .tickPadding(Y_AXIS_TICK_PADDING);