From f0bcc608b1ded8548c01701a782b673bb681a8f5 Mon Sep 17 00:00:00 2001 From: MangaValk Date: Sun, 15 Nov 2026 16:05:41 +0100 Subject: [PATCH] Render gauge needles pixel-exact The needle is the display's own routine, measured on 112 needles in the Editor simulator: tip from quadrant-reduced sin/cos, truncated; line from tip to centre with a biased DDA; wider needles stamp wid x wid squares along a line shortened by wid - 1. Length follows the height. Co-Authored-By: Claude Opus 5.5 --- .claude/skills/nextion-hmi/SKILL.md | 3 +- README.md | 4 +-- demo/render/home.png | Bin 5541 -> 5531 bytes docs/COVERAGE.md | 2 +- docs/RENDER.md | 11 +++++-- src/nxhmi/render.py | 46 +++++++++++++++++++++++----- tests/test_render.py | 15 +++++++++ 7 files changed, 67 insertions(+), 14 deletions(-) diff --git a/.claude/skills/nextion-hmi/SKILL.md b/.claude/skills/nextion-hmi/SKILL.md index 4a4f85c..e9f909a 100644 --- a/.claude/skills/nextion-hmi/SKILL.md +++ b/.claude/skills/nextion-hmi/SKILL.md @@ -42,5 +42,4 @@ Back up the user's file first (copy it) unless they said not to; edits write in - Writes projects for Nextion Editor 1.68.2; the user still compiles/uploads the `.tft` with the Editor (or Nexus for uploading). nxhmi cannot compile `.tft` files yet. -- Rendering: QR codes are a placeholder, gauge needles can differ by a few pixels, - Intelligent-only components are not drawn. +- Rendering: QR codes are a placeholder, Intelligent-only components are not drawn. diff --git a/README.md b/README.md index 7edd4cc..ded3d08 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ Every percentage is a count with a stated basis, so it can be checked (details i | Picture formats | **50 %** (1/2) | raw RGB565 (Basic) done; compressed format (Intelligent) not yet | | Font modes | **50 %** (1/2) | black/white done (incl. TrueType import); anti-aliased not yet | | Readable attribute names in JSON | **65 %** (20/31 types) | value lists taken from the Editor for all Basic types; Intelligent-only types still raw numbers | -| Rendering, Basic components | **90 %** (18/20 pixel-exact) | gauge ~99.5 %, QR code placeholder | -| Rendering, all components | **58 %** (18/31 pixel-exact) | Intelligent-only components not rendered yet | +| Rendering, Basic components | **95 %** (19/20 pixel-exact) | QR code placeholder | +| Rendering, all components | **61 %** (19/31 pixel-exact) | Intelligent-only components not rendered yet | | `.tft` compilation | **31 %** (2.5/8 milestones) | layout mapped, layout table decoded, trailer checksum (same-length edits only); not usable yet | ## Compatibility diff --git a/demo/render/home.png b/demo/render/home.png index cf370b1838847fdcd6d50679498a6b65bc9f40f8..9a9904c717109bc9e60c2123011d8dfec2a36830 100644 GIT binary patch literal 5531 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 M<{jkps*7oHHf9{>OV literal 5541 zcmY*dc|4R|`yab#P{^7!k~P`)QOXjDtTC3#zKnJ3OL}Z&DY9hASSu6C*atnSj0R&6 zlVwKI7}O9WJN;&;_kDkV%;$68=gc|hy3e`3%XQMPUo!@>39mpzSnBX0|31KrbdP~ktJljL0Sn)0JR#Ct@iTY4+1AYGw^8z&8n~&NhmfMCEsy2 zdLfZ}MdI9J$;(00-#8g{?!I5nK^KCO&cAol=vBn?_kWlTcYnynUdH~e^z|&qEiA8M z%k|Ge@wple1Op0Y7c&3Et6TIRt(9&hWw}%3O&oLskN=qL+SUAf*(p6#$I{>ua$RNa zew0xlzkgvpBVY^hn%YBcpX+v?tS%Fh2D#= zIh<6;1`815p#uW$GO9Lo<6&isUcJ1O=fkQ`p1$a4Te`^NU2r&KAMn^!;Z6PSsFk^5 z)9V+fy#RM>Sr_&t3Ze^&x*uhHwbh%i_tl@6?I-K8SNf)V7G=6H%X5 zvY$wg?QZIIobZrdqJHim!k_^eNE*qbF8mQ?hCg;ZZ`=9_o~WR((sCh(%}L!eUkk>b zjf0W1fLmNQ)x7fcTu_H!0CY4I8d2!_NkC~J`sEmK4>O2xs3O?0JGMEfm1%-F!SM-9 zfLgrUV;oJ`eaiWE+Bp@)4tfdo!`4YBoRSJ)AF)HaQzBT1#lU4>jI}X(ie&05tH>=_?va=O}@C0{uU(evm&Wp6J&sV-4Lw1srTSr z$gzq5=(h)EfV9z+&u6PKmdEzP+u-Xe_mdL>R%ROUbfPcN75AWvUTSmgmznfNkd~b< zm;iA@U(<}ILdAs*P(iiKTkEjY~L`vtZy?k;Jl@cs4pLM zns3nS2t~xsc4b2XOQ*=8t@C8El15Woc%TM;8y$eo?(d9CJ^j2B-Pn!}Z2dGVeGdkv zrWKKd)NItm9Q2(u>Rziais%m9MU$$mA|O?#=-M=5LH5iyNS{7;FYI(3?2VcpxZ*3% z`_GKOCFo>k)I;BvS7SPvS7m6hM$tel@ZVp)T z0>TOh-q`PYm@-ZAH3$eSjF^CcivdPkRe#4Dx%@?j44b!| z(DY%x+kT^XPws2j#_sd8|A|1j{q0E>0PC1Cj8ng}IqoeA&U}QzO7D<+G{{Y+{WMLd zo)8r*GHLNONz8z9R&M~7AKPgba)hm5j3fIbCaHRoOX%W6_9#Q>BoGPx>t@HZ?;Wc>|X%adIa+Qvus+G z0gSS*5>M$UFfHfYx_|=owzRbc1#w%^vo9Fdcz9G#lb-?~R4p_#-d+rNFWIT)9TTq7 zPKwD$_WQ_w%-FXx^z!6WhooLJXnU)wbD>N3w38>U#=iP@u}j{JbV9&(z3gUrAj4gH zIE>{Jg-0>}X{mrZcRx$uTIPXJ<+Y-W{w@!3Uj#cPxCDP^`^(1S3{e=;3GdM1xwUIL ziZRc9(J%x4RT&Izt}Ud0{wztadyeP^4-M}q{XBO~45h(79@}&307KvUYQI9-Qeg!h zBzJC!vtnKz+<)>riR79t=6S-I3v0k(Ih+TP@Gc$H%w*h9b0n&Y#aB zg7?<8aR15F!Kt|Lw_ul5nZ4m90+wVVzCcXAXk_Q|+1rY@dmf1Vphs_TqyuuF11#0vzkkwPjrIN;3E{1+gURt_u{ZkUE2!EBe)NAF zTD5atn26@q`k}#mrJ_A4uzI;f*0WN&4pTCxsuRfv1qsoI1(dH!Um_nD+^rjX)VR1| zm=!W4PPgt%WYwYSmNG3J#1TopaJ8uOZQyx~=&ef8|oLELT1lka&IcjMiKwSSfSl zNQ06e+l$C9%prFv2%Y~Bh}K!huYf}cbD=Fk2(%%Uy=cTTv5JqQp&0E1x?yxEq9@wj zuh3YL+FFh$HjD02QYd;C*{M+)>}}pi z0d6UBi1{!2x`VHX#>X$jW}h!ScLK;LFZcR+Grfmy(90vu=IWfY+$3ekZ0#^+WKzk4 z$}1p-``&p}dO0K$+WRp(t#xtg=KV#to&)i^XVDpznOy)3f!^+~;z(O`qcUBsa69FJB8O|k(?xcUY@_JB;dh#rrZ)X}#$Hy1;-AKbc$_W$Khn4*vrKEE1_r0Q{ zE~U#KlX**Azchdg3vliqmlG^F*I|V?ug4oN@oaaDM)GQza<8u_KniAYm~*tFHwy#p z?x^xmg`udIw?|4FMknS;+e;}um}3BpYNFD{RiC8%+|B8R=1>K}VvdbofaTIVA1I5Z ze(@GG+GV6QuPJ6b+pah~QgU&;EcdDEuTWibV8S}uZIdagN+}osYWmONevAJk1hS+h zHs`%7AO_#lPorvrKJMu_p;C>PH~)bm-P0M;`c`L$sZC8nW(M4U?Ayf?Sdg;=k@b1m zv7OaLk`fS*mrKV^>-~lb)lX6b0?1S( z{|~ZrOGRhQds?>_B&lO7X-4CN?#N@I(NWHr?_a*({bLa`bA=93Yev8GZHq8JjY8S_ z99hsS{Xi+|#5)Ves0R3Ov~|8vG?hLcA40*FPGN71?T>!Lr?2y30kC7VKz!J#O20r; zY7>h<^W1Od6%QL&E*}{RRfj-tIP6W7_00f`-d>5$(eU9{?d9jG@JdZ-uqm1mBKDiO zCj9#KEPnrhfAe_%y~w@3`f(_oTG1QI@;I`U8S-o4LFJu2d*E3V+{)?EOrYSSJma5h zqXoOD>Lw`a3UVDW7ff8)g`IAKZ-@G4Fsd1W9|#r95P)6aXHn5 z{!x}EGQ|`&DvW*2tAp6L-|4KJ(vpj77MfbE#QF*XLjD2&SZKyuzdrwoyT%ZLY(e+}1Ci6@i zsSY5vk=UZ-Hd>wW1F~xm%<}uz1m1+$)Z_g6BYuy64?n5zx^IqLr#zqYEi%_r$gyjV z5kwlq?5=0y>T42g{GaTvXe7k0O^)p)e~5_;n(L5W;~OVWec^=4pqz$W;&(!}Gc<}b z>di@`5ITHxODM9`vBgiq=lrPR{xmL3+8e0-ppRvw-KC?NNL-Z4vuFy?5Sw3eFeV?D zQJ>gebV`AfjCoyc#+L>r&^($uUl(4G49rWWrp>QiJDEqe6FK*8we~8h#p7i;7)L}b z&0R&BKHisqp44lCb~Gm+XDq)8YM3%Pqot)4XKg(Z*dgH@QAadfyxvS8^{j)+a)xCO-d{ zA@6aCesnKIZe%dUjM_tg^8{AAdcrHM|B=LqJu=ZunK^97_rrdA=JM1a%7bW&p3Ed~ zjnwbVO>tox-t6oQ^BLDenJYC3(c@QxwtV^0h`ImVzr6M0%%K>&4^}QE~9RG)m$N2Q_qG^W>!NE3IxkHkkRGK@f1} zfgbE!#i8jo@ux!h{pbpqt#R$su|GO44Lqwn9skShWG+R6u-e5A`04suDLAreCt5uw z@(?{`0eQxbCg!&cpEh{f%-k z8v;~9l5xF@A+3G;@NtLJum5XcbI2-Fm6EfnUO;CPuCsN&J@#n8&0%3|a_xk4X;*3p zK0mNWFj2;r;ijARlyN9NAl*kyR-2*2OPlkc_KjkZYcwVjUU2$@DqJ`aJG36^#Kv&b zhU}c>87hMdc*5yd>mzn@lKy50ZLnkX)J1c|SGt9oCF9$vCM3t@v4xMm&5L?PKxKUQ z<9fYuJyD3)VayepoHwtLb*;5=c=xhR5jvBaJL$JG!d&Xqb$IePON6|*2Mu0KjA@*$ zGh009KaCfGBpi-YwZ~rYBfVuOr9_-~QArn`#JS)-+CI%C0F>c|g0f37i}00}){uP6 zJq;Xr_0X6J`iL;?#bGO}LOmc3VODls+Sf=ghr{$b+?6NS94HopwC_TUv)#m?Q<|EY ztaKQ}IufBzF!0@C#0xT2o?5A<(nT`{o8L zqFBPH0HE`s2)0Tk(L0^P+iJ11V`ayWu=jOLgPNdg`q|%@o1TX$=C%V$zdCb(Sjy=X zbW0@-PgqcW>lLCM^bFY&LH$D_&x>iRB+WP_%d@dV5RT}dj2z6!s+IicMdhK^a>28ZR zg?U?HP(vQ#{CVIf?^vD&BcsZYne4(Bdm(4l0%lkJsI#_@iVon@{~kR3u71_b!iK;L zW2Mt8jQzDFUr7PBJ52ZWG{tTwZccwT(yBD|@-_molngJAXaV1^yO#C>wP!*l?eOJ1 za#)7`QmHOxOAy;cl7c$@mh=VQrW#0UU%@Hx2Z( zcg{~mUbtf2Y&a{jbfCVH7}Xyplp}bb3!9a%6Wtruemo+sn^Lt1M)nqe3V?KbQIge> zbSCQfYs;b~2d!&nBqVqEIdH7k5dV0%pJXf#QyL>3`D_hR!IFCrWW(zHTR9-X31C$h z!i9Ai%2Q8KD?e_OMI|CuW;dCN?K9&4t%A}Vi89W;vSH;0$4|XM-k!q2@7=MBo8N95 zAg^UHh*`wj5tOc3A6+qsp!|263NxR90g?l*w1VoEZOFH?mp0{w@3r=O@zYsS3aB>& zJuhKSC9QyP#l2-HQm9WiA{n|!dev*o!Mk2~D+d0M#=v7RO4?t7^bMJ9E!!fnknMIq z`ltTk=YYWLhjq&OmZ#1$%ar9|8bh r*r + 1` then `x -= 1`; repeat while `x >= y`. Filled circles are every pixel inside that ring. Verified for every radius 1..159 against the Editor's simulator. +- Gauge needle (verified on 112 needles): centre `(w//2, h//2)`, length `h//2 - wid` (the + *height* sets it, also for non-square gauges, so the needle can leave the box). Tip = + centre + `(int(-len*cos a), int(-len*sin a))` with `val` in degrees, 0 = left, 90 = up, where + sin/cos are taken after reducing the angle to 0..90 degrees (so `sin 30` is a hair under 0.5 + and `24*sin 30` truncates to 11). The line runs from the tip to the centre: step the major + axis, minor offset `(k*minor + minor - 1) // major`. Width > 1: every line pixel is stamped + with a `wid` x `wid` square starting at `-(wid//2)`. - Slider: auto cursor (255) is a square as thick as the slider; position = `int(frac * free)`. - Waveform: vertical grid lines from the left edge, horizontal ones counted from the bottom. diff --git a/src/nxhmi/render.py b/src/nxhmi/render.py index ac6b94d..c79929c 100644 --- a/src/nxhmi/render.py +++ b/src/nxhmi/render.py @@ -51,6 +51,41 @@ def disc_rows(r: int): return rows +def qsin(deg: int) -> float: + """sin() as the display computes it: reduced to 0..90 degrees first, so sin(30) is a hair + under 0.5 and the truncated needle tip lands one pixel short on exact halves.""" + deg %= 360 + sign = 1 + if deg >= 180: + deg, sign = deg - 180, -1 + if deg > 90: + deg = 180 - deg + return sign * math.sin(math.radians(deg)) + + +def needle_line(x0: int, y0: int, x1: int, y1: int): + """Line from the tip (x0, y0) to the centre (x1, y1): step the major axis, minor offset + `(k * minor + minor - 1) // major` (the gauge needle routine).""" + dx, dy = abs(x1 - x0), abs(y1 - y0) + sx, sy = (1 if x1 >= x0 else -1), (1 if y1 >= y0 else -1) + if dx >= dy: + return [(x0 + sx * k, y0 + sy * ((k * dy + max(dy - 1, 0)) // dx if dx else 0)) for k in range(dx + 1)] + return [(x0 + sx * ((k * dx + max(dx - 1, 0)) // dy), y0 + sy * k) for k in range(dy + 1)] + + +def gauge_needle(w: int, h: int, val: int, wid: int): + """Pixels of a gauge needle relative to the component's top-left corner. + Centre (w//2, h//2); tip at length h//2 - wid; every pixel of that thin line is stamped + with a wid x wid square starting at -(wid//2). The needle may leave the component box.""" + wid = max(1, wid) + cx, cy = w // 2, h // 2 + r = h // 2 - wid + tip = (cx + int(-r * qsin(val + 90)), cy + int(-r * qsin(val))) + lo = -(wid // 2) + return {(x + ax, y + ay) for x, y in needle_line(*tip, cx, cy) + for ax in range(lo, lo + wid) for ay in range(lo, lo + wid)} + + def rgb(v: int): r, g, b = v >> 11, (v >> 5) & 63, v & 31 return (r << 3 | r >> 2, g << 2 | g >> 4, b << 3 | b >> 2) @@ -380,15 +415,12 @@ class Renderer: fill(r // 2, rgb(c.get("pco") or 0)) def gauge(self, img, c): - from PIL import ImageDraw x, y, w, h = self._box(c) self._background(img, c, x, y, w, h) - d = ImageDraw.Draw(img) - r = min(w, h) // 2 - 1 - cx, cy = x + w // 2, y + h // 2 - a = math.radians(c.get("val") or 0) - d.line((cx, cy, cx - int(r * math.cos(a)), cy - int(r * math.sin(a))), fill=rgb(c.get("pco") or 0), - width=max(1, c.get("wid") or 1)) + px, col = img.load(), rgb(c.get("pco") or 0) + for ax, ay in gauge_needle(w, h, c.get("val") or 0, c.get("wid") or 1): + if 0 <= x + ax < img.width and 0 <= y + ay < img.height: + px[x + ax, y + ay] = col def waveform(self, img, c): from PIL import ImageDraw diff --git a/tests/test_render.py b/tests/test_render.py index 4178a77..4cb0b22 100644 --- a/tests/test_render.py +++ b/tests/test_render.py @@ -90,6 +90,21 @@ class Render(unittest.TestCase): self.assertEqual(img.getpixel((39 + 19, 39)), (0, 0, 255)) self.assertEqual(img.getpixel((39 + 20, 39)), (255, 255, 0)) + def test_gauge_needle(self): + from nxhmi.render import gauge_needle, qsin + # all measured in the Editor simulator + thin = gauge_needle(58, 58, 9, 1) # tip (2, 25), runs of 7 counted from the centre + self.assertEqual(len(thin), 28) + self.assertEqual({y for x, y in thin if 22 <= x <= 28}, {28}) + self.assertEqual({y for x, y in thin if 2 <= x <= 7}, {25}) + self.assertIn((29, 29), thin) + self.assertLess(qsin(30), 0.5) # reduced to 0..90 degrees, a hair under 0.5 + self.assertIn((15, 14), gauge_needle(70, 50, 30, 1)) # tip: 24*sin(30) truncates to 11 + self.assertIn((-4, 19), gauge_needle(50, 70, 30, 1)) # radius from height, leaves the box + self.assertEqual(len(gauge_needle(58, 58, 46, 5)), 174) # 5x5 squares along a shorter line + self.assertEqual(len(gauge_needle(58, 58, 69, 8)), 265) + self.assertEqual(gauge_needle(58, 58, 0, 2), {(x, y) for x in range(1, 30) for y in (28, 29)}) + def test_demo_pages_render(self): from nxhmi.render import Renderer r = Renderer(HMIFile.load(FIXTURE))