Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2ae22a5

Browse files
committed
add alignGaps to Series opts (#1100,#1101)
1 parent28d8efd commit2ae22a5

File tree

8 files changed

+28
-21
lines changed

8 files changed

+28
-21
lines changed

‎dist/uPlot.cjs.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,14 +2438,14 @@ const drawAccH = _drawAcc(lineToH);
24382438
constdrawAccV=_drawAcc(lineToV);
24392439

24402440
functionlinear(opts){
2441-
constalignGaps=ifNull(opts?.alignGaps,0);
2442-
24432441
return(u,seriesIdx,idx0,idx1)=>{
24442442
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
24452443
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
24462444

24472445
letpxRound=series.pxRound;
24482446

2447+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2448+
24492449
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
24502450
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
24512451

@@ -2596,7 +2596,6 @@ function stepped(opts) {
25962596
constalign=ifNull(opts.align,1);
25972597
// whether to draw ascenders/descenders at null/gap bondaries
25982598
constascDesc=ifNull(opts.ascDesc,false);
2599-
constalignGaps=ifNull(opts.alignGaps,0);
26002599
constextend=ifNull(opts.extend,false);
26012600

26022601
return(u,seriesIdx,idx0,idx1)=>{
@@ -2607,6 +2606,8 @@ function stepped(opts) {
26072606

26082607
letpxRound=series.pxRound;
26092608

2609+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2610+
26102611
let{ left, width}=u.bbox;
26112612

26122613
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
@@ -2959,14 +2960,14 @@ function bars(opts) {
29592960
}
29602961

29612962
functionsplineInterp(interp,opts){
2962-
constalignGaps=ifNull(opts?.alignGaps,0);
2963-
29642963
return(u,seriesIdx,idx0,idx1)=>{
29652964
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
29662965
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
29672966

29682967
letpxRound=series.pxRound;
29692968

2969+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2970+
29702971
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
29712972
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
29722973

‎dist/uPlot.d.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,9 @@ declare namespace uPlot {
919919
/** when true, null data values will not cause line breaks */
920920
spanGaps?:boolean;
921921

922+
// 0: also erase interpolation to left and right of null regions, 1: to right only, -1: to left only
923+
alignGaps?:-1|0|1;// 0
924+
922925
/** may mutate and/or augment gaps array found from null values */
923926
gaps?:Series.GapsRefiner;
924927

‎dist/uPlot.esm.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2436,14 +2436,14 @@ const drawAccH = _drawAcc(lineToH);
24362436
constdrawAccV=_drawAcc(lineToV);
24372437

24382438
functionlinear(opts){
2439-
constalignGaps=ifNull(opts?.alignGaps,0);
2440-
24412439
return(u,seriesIdx,idx0,idx1)=>{
24422440
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
24432441
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
24442442

24452443
letpxRound=series.pxRound;
24462444

2445+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2446+
24472447
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
24482448
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
24492449

@@ -2594,7 +2594,6 @@ function stepped(opts) {
25942594
constalign=ifNull(opts.align,1);
25952595
// whether to draw ascenders/descenders at null/gap bondaries
25962596
constascDesc=ifNull(opts.ascDesc,false);
2597-
constalignGaps=ifNull(opts.alignGaps,0);
25982597
constextend=ifNull(opts.extend,false);
25992598

26002599
return(u,seriesIdx,idx0,idx1)=>{
@@ -2605,6 +2604,8 @@ function stepped(opts) {
26052604

26062605
letpxRound=series.pxRound;
26072606

2607+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2608+
26082609
let{ left, width}=u.bbox;
26092610

26102611
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
@@ -2957,14 +2958,14 @@ function bars(opts) {
29572958
}
29582959

29592960
functionsplineInterp(interp,opts){
2960-
constalignGaps=ifNull(opts?.alignGaps,0);
2961-
29622961
return(u,seriesIdx,idx0,idx1)=>{
29632962
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
29642963
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
29652964

29662965
letpxRound=series.pxRound;
29672966

2967+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2968+
29682969
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
29692970
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
29702971

‎dist/uPlot.iife.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2439,14 +2439,14 @@ var uPlot = (function () {
24392439
constdrawAccV=_drawAcc(lineToV);
24402440

24412441
functionlinear(opts){
2442-
constalignGaps=ifNull(opts?.alignGaps,0);
2443-
24442442
return(u,seriesIdx,idx0,idx1)=>{
24452443
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
24462444
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
24472445

24482446
letpxRound=series.pxRound;
24492447

2448+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2449+
24502450
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
24512451
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
24522452

@@ -2597,7 +2597,6 @@ var uPlot = (function () {
25972597
constalign=ifNull(opts.align,1);
25982598
// whether to draw ascenders/descenders at null/gap bondaries
25992599
constascDesc=ifNull(opts.ascDesc,false);
2600-
constalignGaps=ifNull(opts.alignGaps,0);
26012600
constextend=ifNull(opts.extend,false);
26022601

26032602
return(u,seriesIdx,idx0,idx1)=>{
@@ -2608,6 +2607,8 @@ var uPlot = (function () {
26082607

26092608
letpxRound=series.pxRound;
26102609

2610+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2611+
26112612
let{ left, width}=u.bbox;
26122613

26132614
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
@@ -2960,14 +2961,14 @@ var uPlot = (function () {
29602961
}
29612962

29622963
functionsplineInterp(interp,opts){
2963-
constalignGaps=ifNull(opts?.alignGaps,0);
2964-
29652964
return(u,seriesIdx,idx0,idx1)=>{
29662965
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
29672966
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
29682967

29692968
letpxRound=series.pxRound;
29702969

2970+
letalignGaps=opts.alignGaps??series.alignGaps??0;
2971+
29712972
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
29722973
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
29732974

‎dist/uPlot.iife.min.js‎

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

‎src/paths/linear.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ const drawAccH = _drawAcc(lineToH);
1818
constdrawAccV=_drawAcc(lineToV);
1919

2020
exportfunctionlinear(opts){
21-
constalignGaps=ifNull(opts?.alignGaps,0);
22-
2321
return(u,seriesIdx,idx0,idx1)=>{
2422
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
2523
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
2624

2725
letpxRound=series.pxRound;
2826

27+
letalignGaps=opts.alignGaps??series.alignGaps??0;
28+
2929
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
3030
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
3131

‎src/paths/spline.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { ifNull, nonNullIdxs } from '../utils';
22
import{orient,clipGaps,moveToH,moveToV,lineToH,lineToV,bezierCurveToH,bezierCurveToV,clipBandLine,BAND_CLIP_FILL,bandFillClipDirs,findGaps}from'./utils';
33

44
exportfunctionsplineInterp(interp,opts){
5-
constalignGaps=ifNull(opts?.alignGaps,0);
6-
75
return(u,seriesIdx,idx0,idx1)=>{
86
returnorient(u,seriesIdx,(series,dataX,dataY,scaleX,scaleY,valToPosX,valToPosY,xOff,yOff,xDim,yDim)=>{
97
[idx0,idx1]=nonNullIdxs(dataY,idx0,idx1);
108

119
letpxRound=series.pxRound;
1210

11+
letalignGaps=opts.alignGaps??series.alignGaps??0;
12+
1313
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));
1414
letpixelForY=val=>pxRound(valToPosY(val,scaleY,yDim,yOff));
1515

‎src/paths/stepped.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export function stepped(opts) {
66
constalign=ifNull(opts.align,1);
77
// whether to draw ascenders/descenders at null/gap bondaries
88
constascDesc=ifNull(opts.ascDesc,false);
9-
constalignGaps=ifNull(opts.alignGaps,0);
109
constextend=ifNull(opts.extend,false);
1110

1211
return(u,seriesIdx,idx0,idx1)=>{
@@ -17,6 +16,8 @@ export function stepped(opts) {
1716

1817
letpxRound=series.pxRound;
1918

19+
letalignGaps=opts.alignGaps??series.alignGaps??0;
20+
2021
let{ left, width}=u.bbox;
2122

2223
letpixelForX=val=>pxRound(valToPosX(val,scaleX,xDim,xOff));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp