Skip to content

fix: manual edits inside positioned group should use absolute manual center #2565

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.

Sign up for GitHub

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
r-audio wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −5
Open

fix: manual edits inside positioned group should use absolute manual center #2565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions lib/components/base-components/PrimitiveComponent/PrimitiveComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,11 +506,8 @@ export abstract class PrimitiveComponent<
) {
const rotation = this._getPcbRotationBeforeLayout() ?? 0
return compose(
this.parent?._computePcbGlobalTransformBeforeLayout() ?? identity(),
compose(
translate(manualPlacement.x, manualPlacement.y),
rotate((rotation * Math.PI) / 180),
),
translate(manualPlacement.x, manualPlacement.y),
rotate((rotation * Math.PI) / 180),
)
}

Expand Down
44 changes: 44 additions & 0 deletions tests/components/normal-components/board-layout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,47 @@ test("board with manual layout edits", () => {

expect(circuit.getCircuitJson()).toMatchPcbSnapshot(import.meta.path)
})

test("manual layout edits inside positioned group use absolute manual center", () => {
const { circuit } = getTestFixture()

circuit.add(
<board
width="40mm"
height="20mm"
manualEdits={{
pcb_placements: [
{
selector: ".C1",
center: { x: 11.4, y: 4.3 },
relative_to: "group_center",
},
],
}}
>
<group name="region" pcbX={16} pcbY={0}>
<chip
name="U1"
footprint="soic8"
pinLabels={{ pin1: "VCC", pin8: "GND" }}
/>
<capacitor
name="C1"
capacitance="100nF"
footprint="0402"
connections={{ pin1: "U1.VCC", pin2: "U1.GND" }}
/>
</group>
</board>,
)

circuit.render()

const capacitor = circuit.selectOne(".C1")
expect(capacitor).not.toBeNull()

const capacitorPosition = capacitor!._getGlobalPcbPositionBeforeLayout()

expect(capacitorPosition.x).toBeCloseTo(11.4, 1)
expect(capacitorPosition.y).toBeCloseTo(4.3, 1)
})
Loading