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

HeatmapNG: skip y <= 0 values when log y axis (#51221)

Browse Source
This commit is contained in:
Leon Sorokin 2022-06-22 09:12:22 -05:00 committed by GitHub
parent be6a878fd6
commit ef53a49896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/app/features/transformers/calculateHeatmap/heatmap.ts
View File

@ -387,6 +387,8 @@ function heatmap(xs: number[], ys: number[], opts?: HeatmapOpts) {
let maxX = xSorted ? xs[len - 1] : -Infinity; let maxX = xSorted ? xs[len - 1] : -Infinity;
let maxY = ySorted ? ys[len - 1] : -Infinity; let maxY = ySorted ? ys[len - 1] : -Infinity;
let yExp = opts?.yLog;
for (let i = 0; i < len; i++) { for (let i = 0; i < len; i++) {
if (!xSorted) { if (!xSorted) {
minX = Math.min(minX, xs[i]); minX = Math.min(minX, xs[i]);
@ -394,17 +396,13 @@ function heatmap(xs: number[], ys: number[], opts?: HeatmapOpts) {
} }
if (!ySorted) { if (!ySorted) {
minY = Math.min(minY, ys[i]); if (!yExp || ys[i] > 0) {
maxY = Math.max(maxY, ys[i]); minY = Math.min(minY, ys[i]);
maxY = Math.max(maxY, ys[i]);
}
} }
} }
let yExp = opts?.yLog;
if (yExp && (minY <= 0 || maxY <= 0)) {
throw 'Log Y axes cannot have values <= 0';
}
//let scaleX = opts?.xLog === 10 ? Math.log10 : opts?.xLog === 2 ? Math.log2 : (v: number) => v; //let scaleX = opts?.xLog === 10 ? Math.log10 : opts?.xLog === 2 ? Math.log2 : (v: number) => v;
//let scaleY = opts?.yLog === 10 ? Math.log10 : opts?.yLog === 2 ? Math.log2 : (v: number) => v; //let scaleY = opts?.yLog === 10 ? Math.log10 : opts?.yLog === 2 ? Math.log2 : (v: number) => v;
@ -466,6 +464,10 @@ function heatmap(xs: number[], ys: number[], opts?: HeatmapOpts) {
let [xs2, ys2, counts] = initBins(xBinQty, yBinQty, minXBin, xBinIncr, minYBin, yBinIncr, yExp); let [xs2, ys2, counts] = initBins(xBinQty, yBinQty, minXBin, xBinIncr, minYBin, yBinIncr, yExp);
for (let i = 0; i < len; i++) { for (let i = 0; i < len; i++) {
if (yExp && ys[i] <= 0) {
continue;
}
const xi = (binX(xs[i]) - minXBin) / xBinIncr; const xi = (binX(xs[i]) - minXBin) / xBinIncr;
const yi = (binY(ys[i]) - minYBin) / yBinIncr; const yi = (binY(ys[i]) - minYBin) / yBinIncr;
const ci = xi * yBinQty + yi; const ci = xi * yBinQty + yi;

2
public/app/plugins/panel/heatmap-new/utils.ts
View File

@ -919,7 +919,7 @@ export const boundedMinMax = (
}; };
export const valuesToFills = (values: number[], palette: string[], minValue: number, maxValue: number) => { export const valuesToFills = (values: number[], palette: string[], minValue: number, maxValue: number) => {
let range = maxValue - minValue; let range = Math.max(maxValue - minValue, 1);
let paletteSize = palette.length; let paletteSize = palette.length;