From 3ffb89841658ba0a6e1aac772b9b61315ce0d24f Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 13 Sep 2018 18:37:03 -0400 Subject: [PATCH 1/4] scatter3d errorbars now fallback to default attributes if error_z is empty --- src/traces/scatter3d/convert.js | 5 +++-- test/image/mocks/gl3d_errorbars_xy.json | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 test/image/mocks/gl3d_errorbars_xy.json diff --git a/src/traces/scatter3d/convert.js b/src/traces/scatter3d/convert.js index 1a7fdc7968a..f9db3427b7a 100644 --- a/src/traces/scatter3d/convert.js +++ b/src/traces/scatter3d/convert.js @@ -23,6 +23,7 @@ var DASH_PATTERNS = require('../../constants/gl3d_dashes'); var MARKER_SYMBOLS = require('../../constants/gl3d_markers'); var calculateError = require('./calc_errors'); +var errorBarsAttributes = require('../../components/errorbars/attributes'); function LineWithMarkers(scene, uid) { this.scene = scene; @@ -124,9 +125,9 @@ function calculateErrorParams(errors) { if(e && e.copy_zstyle !== false) e = errors[2]; if(!e) continue; - capSize[i] = e.width / 2; // ballpark rescaling + capSize[i] = (e.width || 0) / 2; // ballpark rescaling color[i] = str2RgbaArray(e.color); - lineWidth = e.thickness; + lineWidth = (e.thickness || errorBarsAttributes.thickness.dflt); } diff --git a/test/image/mocks/gl3d_errorbars_xy.json b/test/image/mocks/gl3d_errorbars_xy.json new file mode 100644 index 00000000000..0d25cf53a61 --- /dev/null +++ b/test/image/mocks/gl3d_errorbars_xy.json @@ -0,0 +1,19 @@ +{ + "data": [{ + "type": "scatter3d", + "mode": "markers", + "x": [1], + "y": [1], + "z": [1], + "error_x": { + "type": "sqrt", + "thickness": 5 + }, + "error_y": { + "type": "sqrt", + "thickness": 5, + "color": "red" + } + }], + "layout": {} +} From 12b8aa1ce5824ffc1bf5708419b675cae2f8878a Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Fri, 14 Sep 2018 09:15:12 -0400 Subject: [PATCH 2/4] scatter3d error bars add baseline --- test/image/baselines/gl3d_errorbars_xy.png | Bin 0 -> 21253 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/image/baselines/gl3d_errorbars_xy.png diff --git a/test/image/baselines/gl3d_errorbars_xy.png b/test/image/baselines/gl3d_errorbars_xy.png new file mode 100644 index 0000000000000000000000000000000000000000..7134b425eac18f0b8eba824d731d4a7999be8850 GIT binary patch literal 21253 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 literal 0 HcmV?d00001 From b9ec1f68e0244b574052e52c1ada1e147a632f8c Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Fri, 14 Sep 2018 17:31:48 -0400 Subject: [PATCH 3/4] scatter3d use error bars' defaults values when possible --- src/traces/scatter3d/convert.js | 11 +++++------ test/image/baselines/gl3d_errorbars_xy.png | Bin 21253 -> 21573 bytes test/image/mocks/gl3d_errorbars_xy.json | 12 +++++------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/traces/scatter3d/convert.js b/src/traces/scatter3d/convert.js index f9db3427b7a..c039b85836a 100644 --- a/src/traces/scatter3d/convert.js +++ b/src/traces/scatter3d/convert.js @@ -23,7 +23,6 @@ var DASH_PATTERNS = require('../../constants/gl3d_dashes'); var MARKER_SYMBOLS = require('../../constants/gl3d_markers'); var calculateError = require('./calc_errors'); -var errorBarsAttributes = require('../../components/errorbars/attributes'); function LineWithMarkers(scene, uid) { this.scene = scene; @@ -117,17 +116,17 @@ function constructDelaunay(points, color, axis) { function calculateErrorParams(errors) { var capSize = [0.0, 0.0, 0.0], color = [[0, 0, 0], [0, 0, 0], [0, 0, 0]], - lineWidth = [0.0, 0.0, 0.0]; + lineWidth = [1.0, 1.0, 1.0]; for(var i = 0; i < 3; i++) { var e = errors[i]; - if(e && e.copy_zstyle !== false) e = errors[2]; - if(!e) continue; + if(e && e.copy_zstyle !== false && errors[2].visible !== false) e = errors[2]; + if(!e || !e.visible) continue; - capSize[i] = (e.width || 0) / 2; // ballpark rescaling + capSize[i] = e.width / 2; // ballpark rescaling color[i] = str2RgbaArray(e.color); - lineWidth = (e.thickness || errorBarsAttributes.thickness.dflt); + lineWidth[i] = e.thickness; } diff --git a/test/image/baselines/gl3d_errorbars_xy.png b/test/image/baselines/gl3d_errorbars_xy.png index 7134b425eac18f0b8eba824d731d4a7999be8850..50ffe7dc72e9632022ee2608d8f95ca754eabb38 100644 GIT binary patch literal 21573 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 diff --git a/test/image/mocks/gl3d_errorbars_xy.json b/test/image/mocks/gl3d_errorbars_xy.json index 0d25cf53a61..1330a25ed92 100644 --- a/test/image/mocks/gl3d_errorbars_xy.json +++ b/test/image/mocks/gl3d_errorbars_xy.json @@ -2,17 +2,15 @@ "data": [{ "type": "scatter3d", "mode": "markers", - "x": [1], - "y": [1], - "z": [1], + "x": [5, 10], + "y": [5, 10], + "z": [5, 10], "error_x": { "type": "sqrt", - "thickness": 5 + "color": "red" }, "error_y": { - "type": "sqrt", - "thickness": 5, - "color": "red" + "type": "sqrt" } }], "layout": {} From 7542e6f8098070a68daee5d013fc77c6368c6336 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Mon, 17 Sep 2018 10:52:26 -0400 Subject: [PATCH 4/4] scatter3d errorbars update baselines gl3d_errobars_zx.json had to be updated because thickness is defined per axis instead of previously being determined by the thickness of error_z --- test/image/baselines/gl3d_errorbars_xy.png | Bin 21573 -> 21868 bytes test/image/mocks/gl3d_errorbars_zx.json | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/image/baselines/gl3d_errorbars_xy.png b/test/image/baselines/gl3d_errorbars_xy.png index 50ffe7dc72e9632022ee2608d8f95ca754eabb38..fbc681e36ddfabecaf0fac95dc8bd1b90d63a455 100644 GIT binary patch delta 16709 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 YnssxUQ8u64slcDd4>a!QDLoJTKQNioy#N3J delta 16418 zcmY+rcUV(xvpozkXb=^!(5s4yRFx`K5J9Sfw1kdG3897FLR7#9r6^UpN|BP#1Cc5y zRk{QWU7D28gwWx;d4K19&iVXS6EXx- z?otWE#)P2!LM9(j10dzAGPjzV z^ekPOGQ|D_<|-_3C19KrZ&91<)?B8lv_0|S7aDI_pKfO4!ud|^8ziz_4&z8uX>RFV!>gCba_9U^^XkXfpL?JmdP!01yT(4iEp)eV_OcK zVYQS7o5+p@m%a+q7>c9eP+69EbM0cbq9<3r>Zs9I_$ch$eQ+*sVdaU@wTWI&DAVWb zOe(q1QBG->r{-19df|>OGcz->;-`_c^<}B25fIw(*zGgZnA(~euIaI=v8|S~X*lKw zH4CjGK3whJ`0WuIE~6z6XANC&4RZMFfsO&|(`{~3&1Vx4{omzxz)h74fI}kX9nL}q zpacu%VRVD0hMvVp(%nn?T0a3pFU8dN4NcIirp@>?2g<*VpeW(P|? z7LUr)SEmeR#MFwIDm}yhxwx3E*wViGr8+dxuv1JX4=wwQA}J=wN()_JVDeo|F}MOL zfMjEHra#_U=`lc7^vOMqY`J0QCFQlyjXR&%6)41X!T9V5`|H*NgmexwWEH zX|Tq0u$mvIp&S=_f=v>FZ*+Sh5S5qS`vj3@!ZU@8kH%~K`Xl)BQd^>Vd6%>J#X2sT zA`4@Ixr- zUZxL-^_45yNBQ(GWA--Y`zM8r`Pf&th&S#{A>|bOLPKc|fF?neg&DhOF6aA>-XH?%8o4w0g9T~_< z_4j1=_0IwLA4vs-+6s*7=kRDk5s%lL^FMur#3?43Yam;0MM?!pUWj4jrzcJ_7d@kk zKE1xZ`jb%hY?SB~%ExCZL2{8xKpZB=tG`D?=@crJRLg%O^9U(<2e*$SNs_2UpV3Jz z7=lOt8MNi{s&+_2hqiL&W7-wQ?h2Q|n${cH8L~>7IdMg4r!hQsE~Y-37&!Y2fudw| zrT4@@7xVvpzn3)V`AO!VO??XSeHkR%nYkgqxI9$2`lzg3&KoV=9e8wtihXDB?5-OR zq~)gagaYYp?szrR(87uGXSG^hj+MgSPWF8gpM1(PW28o)kO7@Bz z##9*A3QBRkZnyI$#Tv^YWzS(LAUcPmX+>@@#XJh|_uti= z2-^75J2@U2BlN+ENldb{ zsppe6E?0fD%r2OMY+5BD$j@p$MtnP7?3Xl$8cEJk%A0tm-bHr*10X8`K-RYwC5M~i~J*v5kQe#Me62=iVzT0Jr}H81DI`U~*v*YD``XI5YAQ6S)agV}qcp2yz2 z$cL$4Umb25Kn{j=*ZmEf7asdfH5T=%+Zy9zd`zUiu6HQ?D5qw@f#|H!;1)0PyNGN_ zSm`$zK1Nvi3w*1$FMMJ8Be~i>;k?Oj0e2lLWeN~~>BB3gv~5-8ez3b5S`_$Kd=U5C zHA>I1wIdI`cJ^>Ap!;xRxw`38Vq%lmi?c1(-2>T<=p|7`@=C1%GZceE?1q(Pu?TXC=Jp6Qo{RI593jcPLn41=RW|E#}W*Wmc zVnKFU5RCO>8}E3~RyIb}=0M}tdpRi|XY_2mk7a@|A-~eoS%w#Dd!BEVr{BS6#F$9; z9!j3qI;^cxT>D3l>-h?gB_b%PnJSRuZ2F2Au;q^1C(6lvBUfMisOqb<^iQp~$PU4U ze_A9hWhtv_O2y+nM{4gamKh{L{@X0lrY!bc;4VM${=) zpr&P@OcNg^XK5hEDb!@P5I^w1v?R{BD?j_>P&GzyCVWDOVo}|Ia{4qHUa-c-d*@u= z?Q;d2FBy8zFJnHW*u;{(WycEk=M%y|>*!8hn)BV%dn_5w7oz-}MyQ6~ge#)K2!aUw z40i#i_1hAw+|OnhY1CUvmV5MV7k{wll=ewZ)S-i+WrpmqxF%{z{_tx(6Xm+#F1edX zz80naFYbHuJz7-t+C{r}`qvt1h#0Y}t{z~rqb(JFBor@De$5gcciQvU6YDmXirYdR z1P#amZ)!U-PWlv~q_uJ?b`x*saJ{Ahl;rrN7gzTmnOAd+m5t3S`;rXx3EP3&li}gB zhb{Gomf=SUa&pdVQ0e&=CI9{HUl)4AthZAvcjE17_bUe9iN&OxREw5=@K1nK04B$4 zW@LuHLie?pfvlIuIS4F^p|~-{rI{V}gmo2mE?I%< z5~Z9;Py3pY^fMy>X@Pa=tNQ*Qu6H=M(X}zf_;6D5aSAk+ju%l`c}*B_Nk_l z{z3b3BJpsevX`4x(RV6x;QGhxkv-}1E8nkeMo!4)OcAnv^#9yyfM*~##Rk%*n3X3C zX(3`|5NsN3I=Cv~usj9fdb7Y@A-PnQsc*T1JCW#ZAFg*WwpVt~XXy$CyVH^3_t&oU zJ$Q$^%%^*)*Ry{lG<%LDq$kC<7YQ7Z{SDV`CD!fY|;#Ja+D-bSUd81RLaMZ z3cQX3_6958Y67P|1OqXIO7PZJ$nhN6mR+Z>raxaH_-KV7CL1rx;LBb)=`xK&6;_3ibWv z**=oOzt}5$aHe$cC(}k%NMB#A+ll4nuG=qAT0HOD5*o#gu{r255$2vUrIss^aW}|^ z4g~q13mJq?u5cPi2MD%jryz3Y*)R=ol<6z4dT>2s1)`F1;+JWtMc&`x`W=R4tn`x! zh47kY&(qW9-6LG<_&ZWZ$B3B)aH_vXh6AfZ$D~u+oN!S04ob(A^PGp^X+}R)$858`5mlq{lWb?qtH3z;4729!rZy@bDR=xn4 z;R^{VqrnccC;eu=aVdt;$kh5>5YZTKmdE0$T5aI6^Q6zXpyzfa>TCXz`;m=Z)CpJE z7tG<5l0waqt&-#!W4y#A-xmJLSwi%?9sK}!u8CavoWnmB*-3O#4_u!;*2nO<^RU{&!Ta$M%(+T}m(M<(>uWtG=CB`+J< zcWsNs%Uba31to=+H^s7W@?zMEI64o?M;gPcuNylZ>8qGJ{Zcy!T&Zn}*w;H;(Thr8 zO)&Oqy0^}B+AoNjCLNJKm|l46pP=_9`C0}9LK?DVAm3hOHR^~ZfDy6r9^4?Gc}T;5 z(lhDwn@ZstDjC^Cc7hL)nT!H;I7{_SaF0IVuFu)~pnk#of30J#ZS};T(hpqNI@C6t z_Vx0aUu!blWqN;V-M&-Na*^P|UD&dTB^MPw!8(JEv3;NiMh_#~w= z8Tg6uW=BRPhJJgvHku#IM-+7OEc{#dtF)ID$1GloTAuUxjJB+-nKDF#6 zY($DMlHbnAK%D`=5Ypqq8iXK%2o{Mz0bWA#`dn0=;hZm~Leze^5q|VzcQsILYdumr zj5FiV^Y(n7H=WMCqj|j}r|qtzgGv6vZKtk0n{|0#P4g)RBH_?5^QS%Kb-^=43;e*@ zZ@u{7m zU`mA;561etanwJ!bAzXAKJawk8d>ics#;Dhi4Gm_=;&w~HPL+G**Ki6$}Dpeu-M0E zrPFZyOe&F3^JwE}R(xp8wBMbhrI_19CKT6F`Q+8Y*~pc_yIU(Zf9>#$0z%Edu9bwH zYkD-rFPKiTT=+QqT#~N)H-F#t-@UoXLq5QT(H@km`b1{e0zmCQp|s z?2F)xBb7JT>`mot?1ez2AHr4dA^V9%>Dt`)UI;-(T4*p|!)dWHS}gZz=d}+=!#N|? zyLtH8=n;2oc|(%C#|eui`A#s3I+=fa0Bmcx&gR}i-GGr&d7T%H#fJbt*veO40YpP5&ai( zeE&OavSbJB3mQ9k^N;SHeaVci$hLnc<_e0K{nZ$u*H-hM^8#fI)!{G5KnraLfNmF@ zTC0k!_F3V9i&#s)979yPQ1Y+iFg+dL?fV`O<_(Bo2tg(Pg;+(3LI^Z+hXIXSAm}TVTI7LN8EiPiD4#uS_ zwiEUDnk)<~7o3(;-{qupjj9qYcl*i=E)Yb8D|-J%o!2^G@KJ0%TdTjko$#!FW3Av9 zEm`PdPT{V9XMA?u0A9>K9SzF!55W1~v#Sd*5pKUR_T-iKbsHk_3DpJoqt+&?pXBZb z`1zZ4)!OCGiXQj_m|2*tz>M$WmiW_8-b(a-0B2n&-?rg5JQzOOPdp~V5z8}+o7n;^ zft4HG>GxA#(LhoFY)gO2{f&dp8u_}8*C`a^_!Tct#XK%WS>vwt%bj}TB0~K-GvlT( zHP)*2wIH;?kR$NF6gUR0Rpw;7y)Wp}PdO*D-7F`BQDAW?gHpPOsaUEUq^4hOb zJ_KuHM?u}%6a7JE>fAMuT6kw2nbeep1#gZzJ^e+qMTDm5l$=~3C=DMKGzI10N$VXJ z%Q8-jMZMQi2$^%>%mDc2pQZLwb6N z(>kGl_O;`Y$71Rt(#15HVdSH2(p|SZEn*c)-ag?Y`RH1Y#VL6xQ}HFfRkFW62gHz0 zSn;L7iRWr*x3YfSJ^kF}vl!HWXS{!4(Imxxd(XEpTS@bGAk027zOd<6yx$ zs`nHW4z57Bd%K*0HdMJS+zqpQ+Wui$gednpzwC3ra`!+_*l!;ld%M!tU3JTH&)6Mi_x7~KDI4TQhkKPE2lf-7N<0S_X{@>->-R*9))a?LFpW3u z!Bry}gFEi3VC*FOOGkcL@id8TR~rwvDAIKz@2-Y5XCEftQWV<^!aTEn$PVMPx~@D? zQI>V}m>fYrxG^WopQSu#Zen#R@^sw2*p$xT!7@W4z&8CVM{jP!E72~gA`2QjzwIAe zI@hiHK$%v-sdjhu??RR#NZw{^wT^XuW=X|;tpyVX7l9dnIxz|~Z-Cl2fgII!_388u z=LqWSI&rKDVB~>FlFn(*-}9znB;37y!O%(FDR6u4=LdQxk`H66qkVqm;Az(%DpT{^ z4-yOIM+OOUzCRP?7-awmuY-{Gb4d+Vz5|(TlJUXV{O7aC#Tdn0d3P-Yp7iZYO@%*h zu`l6zOIrfluhXA?3E@SIku_?c(}S%Gdvnh-V!G65uvH)wUA{5HBt#~N$<;sCh8C;@ zO@yr+g2V94aW)h)rx*KsKM~Joe%i5TR?Lzpsno9l%aMx(n*ya92aP*0J|^%Mnj>W( z*lTpnLawEdM2<|&yEEKQ3GJ5tkW_*giJ~j$`bCY;t3z4SoFjT<-R7%wrI}933>#); zJ(m)*I~{dRu>PvUUZXou`SgIw*PWcqbc4kN?oPf8^*y=dh_T_ty({eKU+GbEOdmaxj0+cGL&EAz8X(OQg;%n29pA&s3Nk=fm#pVqM1K~!h&y3XxZGF2rHM^>1N;qaVO*)dzKkg62zM*gU&FaI{H`$KTE zvCSlCpPLpM2wsvRJ}yF;pzJK^gP#}*_wcr5(cQ>*eAMdaCj3Uke3YDQt^hvTEiHCJGm04o!}@cp&LBgx4i|zSSX{tTadl$1Tqv zn#R?YhaQP?r|9dlj~JVFU_+n`P;>;Du~)Ih`GP_(N{uDA;`b&~5gBS$aEAL92PHQv zNqXD-pF7MUg#=#{cI~+?eWKCVL7Og2_Kz+7>jb$h2edGx4uGAdrKY--5ug3A%A3-S zCRw98sS$_vUMOFYo58{~ae)J2m?(CirJybQq!#5(9_{8%7+q811qVEy%Q$bm zU^H(ghoDrkZ?=f5yPrTv{L8FtWeS+t(y{n%x*5w*uSuoNee|s{e1Ai;WCtb#*hJZo zhR3jbKGa``*le;*H;EeTGh27q z>SG%y?C?l`#PV-s3&Z4nS0`2zk10v>=h<*in9Orq_qh<+r_qN$;vElqUKw3`v*G1Z zQJ#RzYuYIJu5W=8Imz=NnMNa*v?YimHVPHIw5cdJej*o%4ExykrDlcK zj9i!GXM&^dN?M!M&rsi()Nf-zZ}^j$Z6!eiu{ zU2F06$`V6-G21e9($F|b6bR&o^L@Ewzlx&f)A@t#HJc_nBF!@hb2j2MWi*ldV4Pn^ zEt3=AthDMwbz!=z(~5!HtB*RW4QXte13(P?94uv%j#kp#@)`?Gc zd$YneGss!w51IYZ1%)hJ^c0hF1Gv(ntM*yB3rQ~4F*L$oeZ+i_ujpP3xn)7a`@Tq^ z+RoZ&9TYp4*_o!Z^q0Z`l0a(Que{;H8oL^@nIAVgbETez(8|^7y`AR zuLK-7JY8cbzGpaKB0iH(&q>SgX7ZMr2RY_Wx<^UybR1D4+o0pLwQyYG`B{TScmO9p zKAw|JWLO#%(53d2c)+*1ynoc-s0d*I*UdQzxqwv|PZ0LR2nYnmK~Jo>P4q^`-L`c- zhceaL+KK;L;SIh=TojF*T&^x9~e9a~jU`BE_-pGVeW~l+BQ& zOtXPf%8UWEv`YUbB;~YlkV7~^zb!nty?Y*+wssCyQa4iLcjp)RX6kps$#0DVRg)#T zwWhLj)PuFDmT-zF+NZPFX}C`ro*-t|RvTEkptb&V1`OWBK}aQw>%$-@dhHX>y)WI$ zWlgYtiVu#iGpX>yb5SDxz^h{Gb?Re$38r$GWv#!h`6x+<>u1}7ItQFAU{e2WA(byc z_(Ob8j`sAzty@aPj8Hs@7Z4wG(%AYBYI#t)sD6EuawkM*L$#r$N2e^P(f`v)L@LKZ zEcE*O3LD@rTJ`2jCHd?Elnc)q(Tcp(FKQX}mlto!U$NmLUq9&ng@K>v%!OO#t5}MP ziLqARbr^03Ww9p*OtL!NKN!NE(rc{7FkPN}bok3DV;OGivGua~uFUf5@BO6aP1Df2 ziXdFcVfMa4AhrY+ZxqB^sRSKgv&}WwWtAf#qjVOzG1#>Qt-_-JUv)CX7Q1@x^HZ3e z6EJt}%oD*|u`wrXd?^1hA!0YMtGTjHdmqBk8}+vTZMWe@RmV0wo6A8vdH%=wfr+#sAgEhqy>{U3Fw_gbt!X5?vw zzYB258S5>p1?B|}miy#scgjb`uk?<^HOQSEFWhc^@TUIC|30oCr?a51;MUq4$<;0T z{Tazv`*R9}aBMZR5u`XMM+(V6!l2*00t7)OW&Rf!MqoRqm{Q`i&c8|DxDPQLBya#-vwH0i=r zs3GbIyvUh&d{V*~@xw;cnUYMieh(LU{kagYfW%pihYHy%29z2gZ7{V0>NPv;ehnfD z;b+pA%r?$V41AUADM~FvJGGXW1R;<|sal1RKrfXJKb~tu2uMq`G%g6m*Kdu9*X%6| z9r@$LNa)LzHAy~yo;bVYoxG26f8?UntQJ0j^y_v|>z9SnLN5Y5GrQpQ35KJUtuS@`2M=jKeJVFgrDLEk=3d#rji&sj!Z#lY-@{{H^S>FIAoYRzxl zi8lS!VtlT|lkZ02wUD2_6~^RMEzA9~$)Y3b3dVAJg!njaVC-nMKxxmpLVD_>MCXrJ zo6>%IYkxJ7(E)|L9IxkZr3bY-GR^_sQ47v67I$8b6>y@jS_(CoqeHiqvD#-RT<1?a z{wZ7vh_@;x9N&tc|QEDwKlp99h* z#tpWV9Ks`sAxQCu~y3tg|2)75_CoP5+QdECS@+#~H z=vMlcTQ7)Wkg2^b630rMcYBH8U+|@Qlv!U;;K8tT_m{rMhY+YH@k-;)j-T~I#oQG; zFX;^ns+_3#gu(jX9h1R3@-Isz@BMW8mZ*~Ttb0XbRkJ5P;N8Kp(&2_UNYsZ|9}HLE zoM`cIdsee=;+q-Il(zE1imm$(Yg54>i~@wJVa^M1i8C*pQB~+U-7+7gq5g$s8DSk` zm~DWB!Szq}H0y!y5QQ02%6YX+!qBn*Gi*3)%f&qEyhNm5DJWXw8OxT6Y$9ysFDJj2 zF;OgWfhW$G!IS3_FkatgnJ{34hXOLo@UFq$^AKmds-QjZvdUej+8}h{6r;~#rX0Te z?){gKu6vn`5c#%ru4569^xd}&P2&61?t`+)Zp?me_!edVA zf@I)Oz$x_trdy-oj)pD^eA>p34Tn#qD+y8#Fo$AcdO>UT1&#Q^<--Z3jt|lW3VCTp zJiN_U?Yawd99By3n-)DA@qo=`Mggu7b*JJ6U87MLX$4uZq8dki0Y3`X!Le2a&oG#Xwhr==JZ+(S2E_2 z@`jXj%!VI?G$5xm1Rp@o`_>x*+aq%pg8C|jBeBNmHBvzby=e_CZBNe>FK$BiKFT0LkHih>wEP|Bip}O4J+`t ziLOhlMJq>ZZr)%7y0mfq$;{lwJ;T+%v4T>!F{bz6MqcCoNZ?1P{?q1wMsc|sXq;`+ zw-9*wEjCNHM2%;r%Q?5Njr_@GQ~K$iNlu8)xc zt$ZGDyX5oxCgyRq1a#3n?t^Bi{_~$z_$Sq@bGo9Mhy`2S)}I^MPb;KzbyzI5n;(>{ zvA)PA8r(I`q4bQ*iUy>cNF{)_DANR}Guj%oFy||L1u5sx*svPusE!#~s|4_y;B%mY z6gpJN>#1kM#U78zBWua4ch6c0Vz8cpk5fp(Gd86|p^oIciBX6z4fs$oJ2WbR+MeX% zH$J70?oyvf0(sOTzq=8X2r0Q#YLe>&jd17Y-*#+rC_F%7qHzy$!g^HA8HQQQDV~n~ zpFN^c=S+3sF}?0+)`)@hjJ!_KprdS3%No%0t^hsHJ?kQLgsxE00fU4_td@BSFZpGP zgjOsO_SblMMKy)|-d8&IvHhBjDJ?SA-EuLA7_1VJBuJRloGKiP7SuhSr~gl@d_OZH zWb;(P_wb;?DUp#LC9|Gu1+UiomImK!7Hq8Wduqw{;f=^wDQ_tk*UJtPlzzRAuJWz? zx~^b#a44K+i#hJP|AJh7b`o-y!MD)cGA+iTTO}L&l0`pX&v?vz zEa$ghmfkvk4GxCRGd?`)Wu{->ndu(BbA%*ixw`+G-%vc?$ITIsE2=cbcp0w1@^ zUavsO27Eww^%8`nTuny@G=UN40Mws7P6Pk)x1c7(7!Oqk9IGopTG6VX@Mi zl%9>}1d$Un?8;8j#XpYbq zk)qXhy{+{xet&0Y8?7aEIWB*_@p8PAle%xe-E(dc5gJbwE6mrF6{!$`x;YxReGkc2 zocfDMUP(CkC=6xlp~o=!dg*e7hG;4;_wk7lk6ea2UOF4*5n18Yjl!&NA67dNLWVu9 zxCD7=p#)|=%&NjPtMQReKywLPv6evLA45@Y<0Kw=vM?N9Xowb z4}AYrP?2-q3jsOb-hdd%1S6%&I$6of6W1QCf1t3BX?7$8w{_U=sp(pAGFs`f>Aa`O z_LjY8FdbYI(hcJ#;%=wpPM`_mh&`iCK z@RIPD-j2eAHW&l3@U6mM>+?Y3=?aySw2Ub#CV#&i7|ciHdL?a`P%8dRjYyQkW{5($ zC6%EA?fKvLxhn^D4=$l6R$zP+0Gl`6v!4KLmfyOU@G^NQ)PqG_fK|~iw9OHtp*dP0 zJeO;hl(1-Wn?PnbhaSE*7jLFKD@h>kb!&0S0DJDgV$3BhhYw8Sz_jYB#!O~5DbYVr zHzntT^h|IguCk~(RcNiuq&6zjFH-DkiPS0>)3gFmnkBlkK-8~f65B_Sb|PVgXa6a8 zwJ5z_&yvo@mQsW{#x4T*GZ%ZkPT0}|D?xEWX}!CnmmcSzno~BoAQJ2EnGHL~Km+3) z^a3fhj5-l##1oC1KLr%f25*3wl%+g&tU3J~)sz9c2MIL&uj2{u0rQ1^iNMM+#l_e4 znl1i!=iu~H*$2M^!IK9M12?5D0`mlO{V;g}Oy^X3Rkp^5pgzJ-?1<)KyFz`u;aWDe zBce=(pxBHfi1}CmV<>Fbt71iwR|A;et`Hz z#-ib|f$|*DV>>ta8hafbb>Y=Ny`Ls0o5IDQx_Wxyv9Yn{uYRB`9Vm0tM8kd(0dq!s zxW64Vs`PW@ezMbsrjMpT3wA0^bnri&7XL9LAGCnD3QIUGPfX-- zGsug)Y#&N|!BN>C5&4xY)AGjF4sj5K!dHlQ869K+>-s8?;r=7-iP39J)OszFT%OqQ zqekB1REoSe-8;lD?qM2>318sIQitKsn^cEN@2HB^nXjLY;{Kt5%z%gMp{l9Ochl_{ zy!ZFz{YOZrrWI>-o`;Q`GNfkv*Lw_`{QXK#WW3=}8#&pb+GQ~9F&ioq(bkzFJ&-%- z^685;*YOY=JUi)`+;v;#mfPZA zOCKTy(C?4)3lH)OFI~Ye-b&}}vpm8MCiuxc8o%n8ki~A{k#?6rO>yz5HAVe_owaic&01P2w(h+BN3OxQ=2q27dDRP>Kb$MpKTaAQeS_kS~=GK=1D1%6g&5( zBJ_B8%?;FaZhNPDRzv=rs-1FzZ^Gs5E>$$=FONLY#z_NX@q7k{g+cWA$23W!jKpR$ zo=>SBr(i<7?LaQs1@Ccp_UEgHUV4Y;iL-33GCG_RExrWcc93kr_!1tslgjU*-}uNK zLt>O_NJ9YEl(rc2keStd`yNT9TR(HuNx;K#BEhI@Yg#ZU7R6C>ypZ7vdf7_xV;E<^ zIy#K_S9m%)_7dzF3^RXMX z6HN+dwU0B*DilnFXuvYVEVY5~#n6f@+HoCY`dn{#fP6UGGf4Cp>RNl< zJFs%#;X?(zbQtet&={%(I>%&_=b}1u?zu3jtAyg``Q|7RPoh({f<<*ifr2i=wacCC zjuOnA+c0Rv*Qn26ZwCZK&u%25nT9?ACJ_DUK}xiya(dr2-mLYP1cjiaoG?rh4g&AG z(EpUtY3L3DeOnVTqg0w}vPWLXv&pkOQ*Iemet`E%tr2Tl!2cxXZaIitS-6);2f~5j zlQJih2@~6q_RXW3aK`?36L7hWxN^zsHxjis-c2NPC~A=f=W>F7u@4$ozggGH=6-*pKN$cI)@72S8CBxmIO z(0~)No$Uv=+<}Vbgvh0tK>O+b`h3)>g7)3xE)x^=E7&9}oi}9$SQu`Yv=ia5G1}rkO zH!DS5&5AZzFGgGOkddQCILuO2_SOwn{P$^KWgG_5Vx@bo5%e7$e7G+LO>5|p8*Uxb z@E2@6G^yDTi{N`G-17{t9!n3QU#wj17l%RLS*4U@Tfjh9fz}<%C|q@_kU951X@U9q zN;yGU3p;rEMmAp@lq6yVLmR)_`f0>ouh97-ZYKdPjFnc8ME{HEuq6v+NK}ocm}Wb+ z)l{MLY`QEZB|R3t#bPa8E}Ody2fW_4WJbO`i4#Z$kWGLWQl`X zB*?VP#ODPcKSBD$Yc1&$O%bUz2n)Y%cNydl1`g8LC<5pNnGdnG<_%Yc`q#-Fn)73U zDXCc!r)i;5K<{=@gi3&QB@bvbYfgp7TX-Sw)azQR+vMQ(Whu~q-a2tSD}y=ngI-!C z?JfXr4Xb69q6D$e@YB;G;jOjotU5PzAJAZz!NVA3yv2Rrimg#+?fY*M4uPo_=zU2h z8R^>kSodt?QA56;u?@-}9UIx@QSg_L2ZKYm-TC=>HxG|@h>KuWp*#gpqWRRTS^h^i z-Mqb}MgXb~-ZMU<|J+(gD3@%N)K}TJQw-KfNKB}4`C)`U;pHgU#o!&|gpQtn*rjI0 z3qBw8<^t|MpH^mKOB!bOWkD*sG{#=H{cLdn678adOVw%zK6+8>N@xt4dFVYzT>BFb z(99alF$1HoU%zHWa8L#XR&uHl zTrHQ2^*|j^Y>70wl6f9B%-;BQ{Q@33p-@x!+|toOx1{tmCO81~muERtc#55Hr&UR7 z==DX;ICbyjI*ry-va)otI zd=uZ>g7RI%cy&7J1m4*l5JoKn9tZ^l%rH9x{CNnmVGL5FK9m-A%a5yMrXxU-5x zy9pJLAz>TMQ^y40$wSfL z=_}c)X)*uNwdxR$t9JUL=1>k>Bpy^Gd9qlKe&jyRu@)iFwvUzM&VjVyA z!tsr8uKELG-mns3-{zLLtMw1*w2k8&`X5W34JhyTlsPf}2C6wegp@x_ajd%#;0 z(vS??20O>wd-q*vN${bwCs-J2(|v5L`i_?q1HdN6vSYb}5Ck+0+Anb4n}ZdPBN}rH zs!I3@Z@g0lr4fqjuvJq;9JeJm4?sw`sV4vBi*Ebdy1rG>>g;GO=Nemr6fQQkUU zxmXTQI(IolIX~p31rharQ}w3)@LT_y!bcq!W?AYCH{OeOaMB>L5INcLLW$4O9ob=6U$zVMQ><6_+nD>L=0Y$+ke83z+}Q90>ny+W zWuI*}H@bY*2uL+;x=iQTR7kCYQ$%rdUtgRG_q*{|Z`PU-UHtRq@stge%t%gmCP(nx7h?cKQg*+O4}qLk3OJ0% zeC-PZDw`EBa(A4$M?+f?Qn=8rMb%rrhHav3dF<+KN<=onFw_PhAn%(A|paI7*;MPU6q@{_}$t#^+WJF8_(!|8A6WvT~J` zMwin8&u0XkOhHKP7B#n1_@H+x;9iGmX&Sb;U~5VP8U-vm0Y5(JVZhqqBdda9wi{Y5 zoY(B)(k<_18GWcN=RTIuU?zaMi%1?Dbfqp8j~T@bzaOE%0$ee8Rsh8`kTF0cT&>%| z^Z#^F!`$(i-R6y4`ZNIa|JAZUZVF}+vy*0%rha}J1OXos2_muit^RSAsA02lr!hnX zZ{`DVQYH-$gE@Zg5}Ms&dbyaELFge8V@_E-#gHj|tOL}ex!3jn`sQ3?v+7TY1#h!;=xrrTmCcQ+T~ z5z1c2pT@X@BSxb~<|U6mo>YC|gpd7adDs(>XzItXLjI6D1uSx^eBRf?jCiCTH$A_5 zeD64r;fOW^F$m04EVK5)3C6TP!8d#E0mK4wZS@+>BLzsywg0q!U1@Sn-@kv?GG{!p zIGi~yWx>I9$YeM5law?z{b-Eqr8$%4N<$1e^k2y`k^#7ltg1k}CImbO-+?=53Wp*3 z`K*j7?7s$P>$;1+0#`@tF-K~x@roTt@=C3zluwF^^PcMB0prvSN@}pREbu#n#Y3N@ zvi>!fTFY`^jGzMHX!MA!??o5g)vN6hb29spO-($QYB36L(P|gn$o#EkSKj)FsE;$X@O0wo)eO%U>dyGPwXlwf#ly1Lf07k@#3-a~p$9Nqk_P;HsHS@# JuVVH5{{y7pFR1_k diff --git a/test/image/mocks/gl3d_errorbars_zx.json b/test/image/mocks/gl3d_errorbars_zx.json index 54b592faa9e..24867638d66 100644 --- a/test/image/mocks/gl3d_errorbars_zx.json +++ b/test/image/mocks/gl3d_errorbars_zx.json @@ -35,7 +35,8 @@ "error_x": { "type": "constant", "value": 0.1, - "color": "black" + "color": "black", + "thickness": 10 }, "marker": { "symbol": "square"