jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Pather / RenderPather] Fix handling of jog polarity

Browse Source
This commit is contained in:
jan 2025-11-20 13:00:57 -08:00
parent 2b835ec3a4
commit 355365c0dc
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
masque/builder/pather.py
View File

@ -352,16 +352,17 @@ class Pather(Builder, PatherMixin):
except NotImplementedError: except NotImplementedError:
# Fall back to drawing two L-bends # Fall back to drawing two L-bends
ccw0 = jog > 0 ccw0 = jog > 0
kwargs_no_out = (kwargs | {'out_ptype': None}) kwargs_no_out = kwargs | {'out_ptype': None}
t_tree0 = tool.path( ccw0, length / 2, port_names=tool_port_names, in_ptype=in_ptype, **kwargs_no_out) t_tree0 = tool.path( ccw0, length / 2, port_names=tool_port_names, in_ptype=in_ptype, **kwargs_no_out)
t_pat0 = t_tree0.top_pattern() t_pat0 = t_tree0.top_pattern()
(_, jog0), _ = t_pat0[tool_port_names[0]].measure_travel(t_pat0[tool_port_names[1]]) (_, jog0), _ = t_pat0[tool_port_names[0]].measure_travel(t_pat0[tool_port_names[1]])
t_tree1 = tool.path(not ccw0, jog - jog0, port_names=tool_port_names, in_ptype=t_pat0[tool_port_names[1]].ptype, **kwargs) t_tree1 = tool.path(not ccw0, abs(jog - jog0), port_names=tool_port_names, in_ptype=t_pat0[tool_port_names[1]].ptype, **kwargs)
t_pat1 = t_tree1.top_pattern() t_pat1 = t_tree1.top_pattern()
(_, jog1), _ = t_pat1[tool_port_names[0]].measure_travel(t_pat1[tool_port_names[1]]) (_, jog1), _ = t_pat1[tool_port_names[0]].measure_travel(t_pat1[tool_port_names[1]])
self.path(portspec, ccw0, length - jog1, **kwargs_no_out) kwargs_plug = kwargs | {'plug_into': plug_into}
self.path(portspec, not ccw0, jog - jog0, **kwargs) self.path(portspec, ccw0, length - abs(jog1), **kwargs_no_out)
self.path(portspec, not ccw0, abs(jog - jog0), **kwargs_plug)
return self return self
tname = self.library << tree tname = self.library << tree

2
masque/builder/pather_mixin.py
View File

@ -321,7 +321,7 @@ class PatherMixin(PortList, metaclass=ABCMeta):
else: else:
# S-bend, delegate to implementations # S-bend, delegate to implementations
(travel, jog), _ = port_src.measure_travel(port_dst) (travel, jog), _ = port_src.measure_travel(port_dst)
self.pathS(portspec_src, -travel, jog, **dst_args) self.pathS(portspec_src, -travel, -jog, **dst_args)
elif numpy.isclose(angle, 0): elif numpy.isclose(angle, 0):
raise BuildError('Don\'t know how to route a U-bend yet (TODO)!') raise BuildError('Don\'t know how to route a U-bend yet (TODO)!')
else: else:

11
masque/builder/renderpather.py
View File

@ -488,12 +488,13 @@ class RenderPather(PatherMixin):
ccw0 = jog > 0 ccw0 = jog > 0
kwargs_no_out = (kwargs | {'out_ptype': None}) kwargs_no_out = (kwargs | {'out_ptype': None})
t_port0, _ = tool.planL( ccw0, length / 2, in_ptype=in_ptype, **kwargs_no_out) t_port0, _ = tool.planL( ccw0, length / 2, in_ptype=in_ptype, **kwargs_no_out)
(_, jog0), _ = Port((0, 0), 0).measure_travel(t_port0) jog0 = Port((0, 0), 0).measure_travel(t_port0)[0][1]
t_port1, _ = tool.planL(not ccw0, jog - jog0, in_ptype=t_port0.ptype, **kwargs) t_port1, _ = tool.planL(not ccw0, abs(jog - jog0), in_ptype=t_port0.ptype, **kwargs)
(_, jog1), _ = Port((0, 0), 0).measure_travel(t_port1) jog1 = Port((0, 0), 0).measure_travel(t_port1)[0][1]
self.path(portspec, ccw0, length - jog1, **kwargs_no_out) kwargs_plug = kwargs | {'plug_into': plug_into}
self.path(portspec, not ccw0, jog - jog0, **kwargs) self.path(portspec, ccw0, length - abs(jog1), **kwargs_no_out)
self.path(portspec, not ccw0, abs(jog - jog0), **kwargs_plug)
return self return self
out_port.rotate_around((0, 0), pi + port_rot) out_port.rotate_around((0, 0), pi + port_rot)