Update composition.py

Add DrillSlot support to excellon composition.
This commit is contained in:
Marin Mikaël 2019-07-24 01:19:09 +09:00 committed by GitHub
parent a33e9a1686
commit 89b5b714c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,6 +7,7 @@ from functools import reduce
from gerber.cam import FileSettings from gerber.cam import FileSettings
from gerber.gerber_statements import EofStmt from gerber.gerber_statements import EofStmt
from gerber.excellon_statements import * from gerber.excellon_statements import *
from gerber.excellon import DrillSlot, DrillHit
import gerberex.rs274x import gerberex.rs274x
import gerberex.excellon import gerberex.excellon
import gerberex.dxf import gerberex.dxf
@ -149,7 +150,10 @@ class DrillComposition(Composition):
yield ToolSelectionStmt(t.number).to_excellon(self.settings) yield ToolSelectionStmt(t.number).to_excellon(self.settings)
for h in self.hits: for h in self.hits:
if h.tool.number == t.number: if h.tool.number == t.number:
yield CoordinateStmt(*h.position).to_excellon(self.settings) if type(h) == DrillSlot:
yield SlotStmt(*h.start, *h.end).to_excellon(self.settings)
elif type(h) == DrillHit:
yield CoordinateStmt(*h.position).to_excellon(self.settings)
for num, statement in self.dxf_statements: for num, statement in self.dxf_statements:
if num == t.number: if num == t.number:
yield statement.to_excellon(self.settings) yield statement.to_excellon(self.settings)