Skip to content

Commit 603acb3

Browse files
committed
fix(7segment): incorrect pin position
also remove useless enclosing div
1 parent 51f3666 commit 603acb3

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

src/7segment-element.ts

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ export class SevenSegmentElement extends LitElement {
4040
const pinXY = (n: number) => {
4141
const { startX, cols, bottomY } = this.pinPositions;
4242
const col = (n - 1) % cols;
43-
const row = Math.floor((n - 1) / cols);
43+
const row = 1 - Math.floor((n - 1) / cols);
4444
const xOffset = 1.27;
4545
const mmToPix = 3.78;
46-
const x = startX + xOffset + col * 2.54;
46+
const x = startX + xOffset + (row ? col : cols - col - 1) * 2.54;
4747
const y = this.pins === 'top' ? (row ? bottomY + 1 : 1) : row ? bottomY + 2 : 0;
4848
return { number: n, x: x * mmToPix, y: y * mmToPix };
4949
};
@@ -173,27 +173,25 @@ export class SevenSegmentElement extends LitElement {
173173
digitShapes.push(this.renderDigit(3.5 + i * 12.7, i * 8));
174174
}
175175
return html`
176-
<div style="position:relative">
177-
<svg
178-
width="${width}mm"
179-
height="${height}mm"
180-
version="1.1"
181-
viewBox="0 0 ${width} ${height}"
182-
xmlns="http://www.w3.org/2000/svg"
183-
>
184-
<defs>
185-
<pattern id="pin-pattern" height="2" width="2.54" patternUnits="userSpaceOnUse">
186-
${pins === 'extend'
187-
? svg`<rect x="1.02" y="0" height="2" width="0.5" fill="#aaa" />`
188-
: svg`<circle cx="1.27" cy="1" r=0.5 fill="#aaa" />`}
189-
</pattern>
190-
</defs>
191-
<rect x="0" y="${yOffset}" width="${width}" height="19" />
192-
${digitShapes}<!-- -->
193-
${colon ? this.renderColon() : null}<!-- -->
194-
${pins !== 'none' ? this.renderPins() : null}
195-
</svg>
196-
</div>
176+
<svg
177+
width="${width}mm"
178+
height="${height}mm"
179+
version="1.1"
180+
viewBox="0 0 ${width} ${height}"
181+
xmlns="http://www.w3.org/2000/svg"
182+
>
183+
<defs>
184+
<pattern id="pin-pattern" height="2" width="2.54" patternUnits="userSpaceOnUse">
185+
${pins === 'extend'
186+
? svg`<rect x="1.02" y="0" height="2" width="0.5" fill="#aaa" />`
187+
: svg`<circle cx="1.27" cy="1" r=0.5 fill="#aaa" />`}
188+
</pattern>
189+
</defs>
190+
<rect x="0" y="${yOffset}" width="${width}" height="19" />
191+
${digitShapes}<!-- -->
192+
${colon ? this.renderColon() : null}<!-- -->
193+
${pins !== 'none' ? this.renderPins() : null}
194+
</svg>
197195
`;
198196
}
199197
}

0 commit comments

Comments
 (0)