Skip to content

Commit e289bc3

Browse files
committed
use distance between first/last in-view points for points.show density assertion
1 parent 73783f0 commit e289bc3

5 files changed

Lines changed: 31 additions & 16 deletions

File tree

dist/uPlot.cjs.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,12 +1277,15 @@ function ptDia(width, mult) {
12771277
}
12781278

12791279
function seriesPoints(self, si) {
1280-
const xsc = self.scales[self.series[0].scale];
1281-
const dim = xsc.ori == 0 ? self.bbox.width : self.bbox.height;
1282-
const s = self.series[si];
1280+
let { scale, idxs } = self.series[0];
1281+
let xData = self.data[0];
1282+
let p0 = self.valToPos(xData[idxs[0]], scale, true);
1283+
let p1 = self.valToPos(xData[idxs[1]], scale, true);
1284+
let dim = abs(p1 - p0);
1285+
1286+
let s = self.series[si];
12831287
// const dia = ptDia(s.width, pxRatio);
12841288
let maxPts = dim / (s.points.space * pxRatio);
1285-
let idxs = self.series[0].idxs;
12861289
return idxs[1] - idxs[0] <= maxPts;
12871290
}
12881291

dist/uPlot.esm.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,12 +1275,15 @@ function ptDia(width, mult) {
12751275
}
12761276

12771277
function seriesPoints(self, si) {
1278-
const xsc = self.scales[self.series[0].scale];
1279-
const dim = xsc.ori == 0 ? self.bbox.width : self.bbox.height;
1280-
const s = self.series[si];
1278+
let { scale, idxs } = self.series[0];
1279+
let xData = self.data[0];
1280+
let p0 = self.valToPos(xData[idxs[0]], scale, true);
1281+
let p1 = self.valToPos(xData[idxs[1]], scale, true);
1282+
let dim = abs(p1 - p0);
1283+
1284+
let s = self.series[si];
12811285
// const dia = ptDia(s.width, pxRatio);
12821286
let maxPts = dim / (s.points.space * pxRatio);
1283-
let idxs = self.series[0].idxs;
12841287
return idxs[1] - idxs[0] <= maxPts;
12851288
}
12861289

dist/uPlot.iife.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,12 +1286,17 @@ var uPlot = (function () {
12861286
}
12871287

12881288
function seriesPoints(self, si) {
1289-
var xsc = self.scales[self.series[0].scale];
1290-
var dim = xsc.ori == 0 ? self.bbox.width : self.bbox.height;
1289+
var ref = self.series[0];
1290+
var scale = ref.scale;
1291+
var idxs = ref.idxs;
1292+
var xData = self.data[0];
1293+
var p0 = self.valToPos(xData[idxs[0]], scale, true);
1294+
var p1 = self.valToPos(xData[idxs[1]], scale, true);
1295+
var dim = abs(p1 - p0);
1296+
12911297
var s = self.series[si];
12921298
// const dia = ptDia(s.width, pxRatio);
12931299
var maxPts = dim / (s.points.space * pxRatio);
1294-
var idxs = self.series[0].idxs;
12951300
return idxs[1] - idxs[0] <= maxPts;
12961301
}
12971302

dist/uPlot.iife.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/opts.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
import {
66
assign,
77

8+
abs,
89
min,
910
max,
1011

@@ -631,12 +632,15 @@ export function ptDia(width, mult) {
631632
}
632633

633634
function seriesPoints(self, si) {
634-
const xsc = self.scales[self.series[0].scale];
635-
const dim = xsc.ori == 0 ? self.bbox.width : self.bbox.height;
636-
const s = self.series[si];
635+
let { scale, idxs } = self.series[0];
636+
let xData = self.data[0];
637+
let p0 = self.valToPos(xData[idxs[0]], scale, true);
638+
let p1 = self.valToPos(xData[idxs[1]], scale, true);
639+
let dim = abs(p1 - p0);
640+
641+
let s = self.series[si];
637642
// const dia = ptDia(s.width, pxRatio);
638643
let maxPts = dim / (s.points.space * pxRatio);
639-
let idxs = self.series[0].idxs;
640644
return idxs[1] - idxs[0] <= maxPts;
641645
}
642646

0 commit comments

Comments
 (0)