From a102ca515b1a614ebac2c6efef047b12fafeb9e4 Mon Sep 17 00:00:00 2001 From: stockiNail Date: Wed, 2 Aug 2023 16:42:29 +0200 Subject: [PATCH] Revert fix for monotone cubic interpolation (#11432) --- src/controllers/controller.line.js | 2 +- .../scaleMInMaxLimits.js | 35 ------------------ .../scaleMInMaxLimits.png | Bin 9263 -> 0 bytes .../cubicInterpolationMode/scaleMaxLimit.js | 35 ------------------ .../cubicInterpolationMode/scaleMaxLimit.png | Bin 8887 -> 0 bytes 5 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 test/fixtures/controller.line/cubicInterpolationMode/scaleMInMaxLimits.js delete mode 100644 test/fixtures/controller.line/cubicInterpolationMode/scaleMInMaxLimits.png delete mode 100644 test/fixtures/controller.line/cubicInterpolationMode/scaleMaxLimit.js delete mode 100644 test/fixtures/controller.line/cubicInterpolationMode/scaleMaxLimit.png diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js index 8c5977e19..fddd5ce98 100644 --- a/src/controllers/controller.line.js +++ b/src/controllers/controller.line.js @@ -57,7 +57,7 @@ export default class LineController extends DatasetController { line._chart = this.chart; line._datasetIndex = this.index; line._decimated = !!_dataset._decimated; - line.points = points.slice(Math.max(this._drawStart - 1, 0), this._drawStart + this._drawCount); + line.points = points; const options = this.resolveDatasetElementOptions(mode); if (!this.options.showLine) { diff --git a/test/fixtures/controller.line/cubicInterpolationMode/scaleMInMaxLimits.js b/test/fixtures/controller.line/cubicInterpolationMode/scaleMInMaxLimits.js deleted file mode 100644 index 605ac1864..000000000 --- a/test/fixtures/controller.line/cubicInterpolationMode/scaleMInMaxLimits.js +++ /dev/null @@ -1,35 +0,0 @@ -module.exports = { - config: { - type: 'line', - data: { - datasets: [ - { - data: [ - {x: -10, y: 150}, - {x: 0, y: 81}, - {x: 10, y: 49}, - {x: 20, y: 32}, - {x: 30, y: 21}, - {x: 35, y: 1}, - {x: 40, y: 16}, - {x: 45, y: 13}, - ], - borderColor: '#ff0000', - cubicInterpolationMode: 'monotone' - } - ] - }, - options: { - scales: { - x: {display: false, type: 'linear', min: 5, max: 37}, - y: {display: false} - } - } - }, - options: { - canvas: { - height: 256, - width: 512 - } - } -}; diff --git a/test/fixtures/controller.line/cubicInterpolationMode/scaleMInMaxLimits.png b/test/fixtures/controller.line/cubicInterpolationMode/scaleMInMaxLimits.png deleted file mode 100644 index 056d4510167ace1c5f38402173f33f7efc436009..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 9263 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 YwBnZxYSp7(L*VDoK}(a8{j`Yx2dgPm4gdfE diff --git a/test/fixtures/controller.line/cubicInterpolationMode/scaleMaxLimit.js b/test/fixtures/controller.line/cubicInterpolationMode/scaleMaxLimit.js deleted file mode 100644 index 6bae22dfe..000000000 --- a/test/fixtures/controller.line/cubicInterpolationMode/scaleMaxLimit.js +++ /dev/null @@ -1,35 +0,0 @@ -module.exports = { - config: { - type: 'line', - data: { - datasets: [ - { - data: [ - {x: -10, y: 150}, - {x: 0, y: 81}, - {x: 10, y: 49}, - {x: 20, y: 32}, - {x: 30, y: 21}, - {x: 35, y: 1}, - {x: 40, y: 16}, - {x: 45, y: 13}, - ], - borderColor: '#ff0000', - cubicInterpolationMode: 'monotone' - } - ] - }, - options: { - scales: { - x: {display: false, type: 'linear', max: 30}, - y: {display: false} - } - } - }, - options: { - canvas: { - height: 256, - width: 512 - } - } -}; diff --git a/test/fixtures/controller.line/cubicInterpolationMode/scaleMaxLimit.png b/test/fixtures/controller.line/cubicInterpolationMode/scaleMaxLimit.png deleted file mode 100644 index 048c8c390847bcf751b3a08ac71b01de7944df61..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 8887 zc-l>Rc_5Vg_y05djIFUY)+k%nK}4uQxR(+od(+sWY*Vt7%FHN~t!^o0Y04FfEZNF7 zmK!&vx=OCX;Fe^Y7Byw*_kL!k&+qG>JkI-hzt8eIuXE1(>8!h(v!s}k7z9C*zyG#< zHv}QUuLuZ_1^@hYzCR3pirwvO58dronT8;B==be*o{7}C5%HnWz59ATE?henmN&jW z-JXm*m%d)XDTE3+QaoBH=PsPTVo97snP)YV8YMf~1ZI(m_sIY=@+zygMG_ zK)HH)Lc7;8;9c$U)!4xf+o}cY1*<9Bsg|YLm3>cRi$05mEwm1X&CN~?M^xoj>#`Y0 zFvU`UTlh$VT5y6Da^W`^2=`;%XpKnGO@7=}s9It5m}Ese+ATw20oP-Y zR&L0}WGPf1{$(0180zJvFVa`#R7gL+=knOjoQA5?d)9UZ5>7p{R~G3*3C27?aQSNx~HZvpQ8Mg zkbWnw3>_70`H=AVz6>oD#rQ0V$eKw~{!pK~ygwPhuD@c>W);NTp-jhIED6*FdlU)4Ig`{Hd4X6`hU5oZLFY!EYRjOVW{?O?ZFUDN9EEN_yOwka7XQZ0biw=V zwWpl$mlMGki*#560{=24X@S5JUqutFmlgt ztq_VU*OHFGI^}ZG^oFk>aaukjKh%h#6u}TluCOqUlcXQjLbBBCxP}RDyy7X;`6V(~ z9H_NS;Ps#5do#Oa-VA)8R(}*~mFY{XK(K)aFzL@3(f6T5FV@n-H}S@$LfA)O9;!hu z`1J3Pi80&1A5)Z1I~kGGnJUa{vJ(>nTil(G_?Sv*ERa&UNb4fKUMLaKLkY(o%V>(P zkS0c8j`q25wFpP_le(NlFKaU~;!voZx)&i6sQ8i-ZDrMQIQUTe6%V1_xkzy(`0N$r zR$R9mYvj{7x~H+$IkHaZkzk?^4|dpYt~lpLuEq89+__*fPezp2ZfphEtWeJPnjQ3# zwb{FPqgeYdPfqvCn!sMhffBuE;`S0r-d{Yo=d5O1NHhcv3l3^*~AU% zqY~+x{}*O5nmG)EvH=%V#jtf%4vu2@Y)~H*`^CH*8_Xd^p!bj>U#U9jU~q*@q9^NV z|Gg(_cSX#MIiw8B>rXTI*|k!Z>+K9wBRxc+L|_i7!bVFoVj$~F77uUP)f{t=Tp#j3 zIr`8#AWz&xmnO!dZgzj|sL7(Yn9zR7w_>!{Lzjre7)*BoqtaFR6_oa8e~8^L5Ps1h zo4|h2f%YRWU$Gd)s1$Jj*g8DBOJsU0XFF_LPzlG!gzP1ic?3tNuofEHHe*By;LJP= zgUJTP4=TxOgqC!gZuP`3nTaZhA^8Hl`_zChNjF|L^T-C?Y4jbxkzxy~P&+lWwgu3R zXV1MzX;giM*tLTmyC&+Jjwonew3{g4_+)&6=X6J&IPVg=vA)4Os!6DPEPlrc809ZH zIQ^(r6-%;Ri`M__K8Vc11HD>Q6a7n0)@-Fz$P#BTKEKj-{j)p(6-p+uJDk$k?ZT`H zqE)Db|9W@*vocuv7?*wwF(Q+MwK0pckg5GuNJGD#2qqty%3|z7ID0F}`{R4OI%`U* zMO-l`z9|~b1{)7UVMu4M1q`H#d5~ourY6f&{6fvY*4wG-QegU*)>Qv>SKK_>V0iMXq9hgoTw% zW7N{#<3CQLYvLKdR3g;D5U4gJ&LC&^Ouv1llemB8_z3pbuIBKIbIc5ev-j~;K6+jB zN};;Y)H`TDc^H`pfZVW>(i~U%kvqpn9}1Ye&W{}jzgXysA8P$_szrfRg?kvmQV^9P z<7baxOYQo~DUVnI#_{2YjUd z4!IqlejnixG{D{ipu8K_v0>jhpP8Y6`rTQs$}g8hFV};YeIIP?y1`k?7}{<5 zsIaDz&eHcwY8;{q%PpP+Sq$VVO5yr%pJu#fmMS5YVt>9S{(9HyLECA@J!bi*0Xzby z*>t-;AxqL5);li|bWm&d<&6u9P*aJGRMUgBu9dSwkJZbPp)W&PTId3Tfl(R>dA#m( zm_V=y3!dvJW+S&o;oqa4To=Ud#ct5Rg*5_Nu*Mo4(PZzkNfvOCyD|dBf%aV(_u zG7vnQ?E<3|fMST|4kB5-AWcx9U)XaXa!xdWvDUM=qd{C78(U8SkDdT4kNJfqD$+mI z^&o1P&yt^fej(yHPA^&la$pyZA7*4=Bs*U25!M?wu$AU(8Khg`*K^!S*??_-x+W?K zL6oXZgGfqRkE`7{dbFSDk5QrsT7XkD5*$-EJgV(*eN-NdR=4NubZEO&x<|<7G++hi z=)HA54Kk}X)fLMhl(^5(n=`pbigpV#q7C$xCoe9>Q&M%HDbyNW=QntjOX{7!5(Xnr zhBD7@>uTd*IA7nIHX?Vq@(QJ?gL_1Us+57Cx!wG}qTW@+xx$oxyJH(h%9Z|cxqtS# z5a1FH2#hL zHSabzR0!gx{lG5|^EJBSL)|#1-qtEJ*6Q&8Bi$Jn)zYS9S>=rnHO~j?gO-f>_7BBG zN7luMo*3g|QNK*nm}g4(Lt%)g6#+jh32p)DKN5Ee%==2<<7vzvHeGUbzsIOD&+!xj zwVAT_Q?0OzmLWq1w6HLXY|b*O(C|$2+hEQ@X_mjZh&)MIVDC+LPZpYY?MGCVtH{M* zm*ZJUKek-h<|Qf#0I50d#jC!ln-L4;0aJg}(w@x~w>3-&fE<1uWT(@~B7iYZ+TrrS zdX5I+lxOiFKY4+2Sdbux2G54-bR?pyL(7K^IRhix*auWY<6tRaEg5=IjWSz4Q~&3iIbprJ1wuth76TdDDlgVobfT|y(Rqrp6fHP?Qup-9WHFBAroy= zbEHI8wk594`|GSgyc6ENC9Ur^Q@_-ZB$tG1(d_tf&3o*F5cHlL$bBIDDz#E#0Ymlv zKD8El>PmlgdQ-;}G_x~dR?W&$0s5qS3#T;N(_N@u}&JC97ZbOP# z-9nlSZF-;DTkY*@#S1L)RkYOTAV?m%wNsFoBo;shK0R)WV=4|AhS*j9Lf;7yv`O6w zBjWux?d(iBNtxbi5+CB-cDdKKMx~JZ32XlHmN08{xp)qPev$5zI)>RQwj=k)sCbJ; z$Jh@0mC9m)g6{!?6yK}->#Er@mX59VFR}kArjpMc^z;13MaU-mK-R>6`nbP3QeR~T zW7BwK@h6H}@GG_1q42aBmzX-q{DyFKy*FvdY{wey!{xa0vi{;tqm})-gZ6+(F}>g! zb8s$n9rG#F>^$%a^{qp78!N#UT~w!{W`#-9=8s)|E*QDkd%>1oaS5e0iVcXZZE8jB zN_<}vA56@@gj-&mY**`IjKF!!RIsJea80baK2<(o&8s&O`lgZ3S5~(0---E{zC5N$ zM4^QXvGBs7@>Yw3s>@Tkyuath7c=_&k**9}#}7yP3D(8qwpZE(OqXW>;1aU<$~~f4 zjT*aI<;QydWI|_tL&}w{#N86OOZ(2WNi0XR)=4dP76~RuS_dFL@llMpKeL`bA=h%) zyr9;6`BZB2?l7zI=(8J!a_Jgjs$WwF^S`~Z)D1~RKyRl~--bqv=b?RCx3yuH zvx^Z9oUd|llOPF#V*dX07B7viRn9iVNFk>9nu!umo4X+!`=aJm#YK2+7cfv&F=8UpS|k@oI;%WRq-S#8u7rdaRwZCticeHw(u1E&ZOc^Ab6j)uR3~ zN_~Ljav-ZJv)zm8AwbYtKyJn^s|W5O6|*s`GCn4AX<<-u0XJDwFkO{h0hUl#Ols=? zuGZp}e*DQRk2FHRk?g*6I{7Mh^lTJc9%ex$P}#zL(u|JAn%b!F)p-R6$4T+yIgH7 zdM6`JXf@WB*7m8q`hT)>@o~O%Z{Y|g2Qex&Ycf~bc-b2l{5o*I>K8XyZ6^RK65@90 z>^}Amxy<{BWbEvgxn5Wb>yKu@z7L~P`E z_m4=q-oiK(u#6vRmi1Pfi~8tf$7acKZSZJQzdZ< z&7VOxX4d#oT|`Y7r#m6gTIu|_9Vdd}4Xr5{{4hj+FUM^qM2DxPSHd88rvpg(`gP|V zU-s-4KJM*vj?sY8I#-EgG5%-tm~!mPmIB!6a36a1gOUDgdEKftYU14?9n<1spq!F%&bY5e=a$$wBVKe26r+F!rKMfm#- z%A~JgshC*{)OG{&We@H;nQlB2=GpKTaN@^(k*H>5XeW0()Q}nW?B8omenDL~?ggK* zGzuk?>->cr`(D%;47!_X->dBqt^vEpxxWI=U1S@VWmd#DOvMY3W z`4j`AqdbXXq=`3oY&{;jzLUOx|5{!T%tAYXtIX#}cg#;QCDs^&CHuJ@W-qv3YyaVv z6WYvIm5w|9-)u<5hopPsa?leWIRi{bvrUGVl~$eAJ2_7z4?cJTU)zCF==b7Zi~3}+ z9fB&>UB*!}D+sjZRcT2S6mmybt0tsj%=5vqlbgStlhr#v&XK`Vp-3|av!J92Ge$1Q zvCWZuLp7>iKKv~3hn8xTS(?uIKr7y|47O-X-v-t?1A4?_qQGJUUZN@U5CFI z7|QG3k!&L+K9^{giQj9qF_62be{J}5R?t29GWdcuwJ<1Gdyjfo6+#+Iwd@;)Z3P1~ zr(M&>_Nrn1AfQ_`z`X47=N2zq)VqSX)iT&@=<*Zyj%Mc5+zZU140SJ!I>D6*2zh4K zuy{Ryy|(zn6U^W~dk3@D-J}`u0^dOr{}9XPL@(T2WP;v@yqmh~F6Sx6bk?&$H=9h% z5kH`}8CmK~qSt6FsDbid0?PlT2Sxr&m}+WwsAQ6>mkhQwH)M(xT;}STz;!hc)V9>} z>HBgdih7sqqwbEen`SQLJ>R2`?VulE>EoI*(_p>wK@-@bAy;;mGH+m|G9%XQk2Z;+ zHT&NFI+jc3&0X^xI|Tf78g5rAx+VRI&4_bu@?=0HHMQ~|w05tuHvASeCq+$am$e5L9 z%&U9ixl${G4ML9pbaR)jybb*DJJ?J++_;!ijWM-pI?c>8BPz>3@mf{2tgP5dijayl zP%Kg%BlIiAkJwxXJt5!~_n%v9Q^g){JRi80oA7ALB;ShL8OPhdhvyu@)&JORIR5vy z&I^6qWh>+V)&R(x0E9j~S|aJeUHuu_9uwMeqp-9&gsaWn+B6|$xsb#w3Ff|e;oCU` z;$jHuRo$P(Q3tGnHup2dR4_JVxp~BVvXr||L)yzwG~kk;Rk-(20uxDiBJQ;f<^iZE z*wMtzDtuWVYVO$(_wTq7Z}DvxxyoXCY>FAc^OIR`{}N6n^4Mg-w!zBNUEi3cQMjjm z$fUnwS-z`%+@8=F);*a3%{yR{cLuy!&{n4<_C=F!tWq!MbvN~C55m7gTCv{;orGA5 zdZ$_A@x1-gnY1_c)jCnhe^O3@6Bg%`BW{6t&@|G6s*xE{aDh9@-_R9JdAv4#*Q^Km zb+YptYys|sMw{$%NJ#EtH(*N{z`Vct*p?$N8oM_b&!;kd!qmU&<&{_9R%IbSAz$M4DB5x;bP}j}!Ck0=UAN5kuEOD8Ns|gqzCIAN9D<0jw ztBi6F^XN!-jZVisM%X{T7w8Q#ISOq7$PO#Q-I#{#%009rATcivcn^9qhY6PqGn0z} zgwQqk=kFfXo9MZ3-S5)gq-i%d9DYVF{5HtXa@&YzIUk5A@zE&|&E$68B44$~Dbe704=e5MCNJ>D$y>03h33wRQ6Ad(>o#B(rS zQ<9OPj-C4r1J#ioh{7zwX8)i{=1@nqGXCxk){FgifDK-BI!o2`_UZrY!eUh}fn85NV!N!!fZPHz}!644)WvC)`9$$Ea=H z5-3`CGe7E2_*86+1IK) zy&VB>Z~LUMEBr|MYfo9*?XaxVB|nD?_xx76#hA%U6UuSG&Q)Dqm!q%lE4yfDP zZ6?kB>+B!AN@+Ry?Br=;tXPnlW(INtTn{n_W%b#Ve9WU^w8`IOg^eFh1^uc1)%JZ! zz?NO-RKepJOM85%S&JyQr=Po^sY2RNq1U_t^^FdTIHW-uPNref3Po zWCzu3aLs@}0?wbvzso=_%IP+1JPb}DsirTG%-@II4BTX3Z})g(dT6%s{x$3TaNjCf z0|{q}OKH5j2XfM^X-c6f zQZnGMb-?}2v(2h++R&rqS07iG4uDd1?cb^f(D(U)c&y=G>CrlH7Qs`2yhXj}dkg~=lj0bmFS*Y? zEVmes9C-8rR23sT8>jS>M5BZ&-M2=-Tpv!oKD-|GkSw#F_pW)I(>LBSM_Z_*jTO?y zN~%LrA#y%7QzB9VMTtEBrS$~?f0+PcyCb~EHwx~R;4vU#{J)Ks6AG50IDTtA?|uny zwYK}PL6F?_JpbyJSD%q4W%Qkj8`H_e>kG)Ah1|BS{gb=aQaDgG^qvYg-adF{t=6Y; z&V54A?-M&+QXSvQcjpBR6^4+KV@ylgX%BjirmS-!>Rw;)Zc8pu|3;TeHVp#Fmd>8{p3omi#9`>hG_-%T2%hr8)fKG#1Urph*Z2)aL z>q9_|xD&_PH&Oh9J-N;!WOp^4qf<&vUL6oSRy7F9bL~y85`6x_d zDc4!NrZaF`ti*#?t@qKaycpsJtaAIFshBIBU1GtL8@_{#OD zN$HRA_TLWM&t?#loh|7ZZ>=bj5NhZwt zJvs$1_VH|c%y0R3Gd6Lib$$|2od3SvFce%08=kk8U9$n-z04w+r}v2EAk}PgQWLr; z->jXa?(U>7+Vop_X!VxrK@c(&{=WceN|5&L<_f{bJc>8FrO>@_KXIJB^zR``dE%Lm zKOW_ajd&|gChfgQ4cr7tB&H?i36`G3JPJtpu;I-7SW3$c_o(*?kBZM6A~zXz>|A`A zcmDvE@%xO)%pHLp)qtk^R8peV-=Erc;$5Zm@ixzde!Iuk>Bq1y7iMOfOm8CCQ*DcB z!mBTZ-ojT33C7pca*yFge%f6Bj_pv0(b`Ua@Ag}!H>rx+yCNq6?QF}B$`{Of?r78Q z0v1Utokkq{IGvipPwG1spsT(9;eTEH?d0^Q@`U+<9;+#v7Z6$J!ZzVo7usi}V!R$x zebg(R@@yr$-CN>)g1@h#$=AK<&SEB3hbI$Qds~aly86wYc#xqldhZuRH;(S=3Dm$@ zYzoOS-CH?$wSz6L?zl6^u{)Za-X4tB0Bpe~S{u#Ps=4i|?wN3-{QD;f!p`nkBf1W5 zLn>ZIwC}#WGn+!3QSJ^nz4GqxeA0S+NaEuxdjCuM{0;g!1WoOx+HK)AS`%nr>kN*| z<;dQ?C=;w1*k4FmKt&top2RPA{^Ta0X#uv=aU#|Jp!jaNuPpH(-ze^i`>2LdtoQd2 zpL?!hGQ~Mi>VFFdh0DqcDXDV|odcGW&DBSwBR`T7uOis-`$Er%c4_1IB|4{ujp4&= zCEP%`$A-)VSBkpsu3)UINGmSoCZZ^Y&Al$d@8e)#*Fj{zdVNRu=q?W0eZvPGE}{>T cROU~d;j!1Yl2WWA5cv7s(QW%(dm8Ki0qJKI!~g&Q -- 2.47.3