-
Notifications
You must be signed in to change notification settings - Fork 61
feat: Render copper text via circuit-to-canvas on copper layers #677
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
rushabhcodes
wants to merge
5
commits into
tscircuit:main
Choose a base branch
from
rushabhcodes:fix-copper-text
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
58d46e7
feat: Render copper text via circuit-to-canvas on copper layers
rushabhcodes 78dcd1a
fix: Adjust copper text rendering order to ensure visibility over kno…
rushabhcodes 154b915
fix: Remove unnecessary traces under knockout text in copper text fix…
rushabhcodes 0ab3553
fix: Remove copper text filtering from primitive drawing
rushabhcodes a6420b3
fix: Add traces underneath knockout text for visibility verification
rushabhcodes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import type { AnyCircuitElement, PcbRenderLayer } from "circuit-json" | ||
| import { | ||
| CircuitToCanvasDrawer, | ||
| DEFAULT_PCB_COLOR_MAP, | ||
| type PcbColorMap, | ||
| } from "circuit-to-canvas" | ||
| import type { Matrix } from "transformation-matrix" | ||
| import colors from "./colors" | ||
|
|
||
| const PCB_VIEWER_COLOR_MAP: PcbColorMap = { | ||
| ...DEFAULT_PCB_COLOR_MAP, | ||
| copper: { | ||
| top: colors.board.copper.f, | ||
| bottom: colors.board.copper.b, | ||
| inner1: colors.board.copper.in1, | ||
| inner2: colors.board.copper.in2, | ||
| inner3: colors.board.copper.in3, | ||
| inner4: colors.board.copper.in4, | ||
| inner5: colors.board.copper.in5, | ||
| inner6: colors.board.copper.in6, | ||
| }, | ||
| } | ||
|
|
||
| export function isCopperTextElement(element: AnyCircuitElement) { | ||
| return element.type === "pcb_copper_text" | ||
| } | ||
|
|
||
| export function drawCopperTextElementsForLayer({ | ||
| canvas, | ||
| elements, | ||
| layers, | ||
| realToCanvasMat, | ||
| }: { | ||
| canvas: HTMLCanvasElement | ||
| elements: AnyCircuitElement[] | ||
| layers: PcbRenderLayer[] | ||
| realToCanvasMat: Matrix | ||
| }) { | ||
| const drawer = new CircuitToCanvasDrawer(canvas) | ||
|
|
||
| drawer.configure({ | ||
| colorOverrides: PCB_VIEWER_COLOR_MAP, | ||
| }) | ||
|
|
||
| drawer.realToCanvasMat = realToCanvasMat | ||
|
|
||
| const copperTextElements = elements.filter(isCopperTextElement) | ||
|
|
||
| drawer.drawElements(copperTextElements, { layers }) | ||
| } | ||
74 changes: 0 additions & 74 deletions
74
src/lib/element-to-primitive/convert-pcb-copper-text-to-primitive.ts
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.