jaseg/gerbonara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix converting values for excellon files. Give error for incremental mode

Browse source
This commit is contained in:
Garret Fick 2016-04-05 22:40:12 +08:00
parent ad29fac873
commit 2eac1e427c
2 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gerber/excellon.py
View file

@ -85,14 +85,10 @@ class DrillHit(object):
self.position = position
def to_inch(self):
if self.tool.units == 'metric':
self.tool.to_inch()
self.position = tuple(map(inch, self.position))
self.position = tuple(map(inch, self.position))
def to_metric(self):
if self.tool.units == 'inch':
self.tool.to_metric()
self.position = tuple(map(metric, self.position))
self.position = tuple(map(metric, self.position))
@property
def bounding_box(self):
@ -121,16 +117,12 @@ class DrillSlot(object):
self.slot_type = slot_type
def to_inch(self):
if self.tool.units == 'metric':
self.tool.to_inch()
self.start = tuple(map(inch, self.start))
self.end = tuple(map(inch, self.end))
self.start = tuple(map(inch, self.start))
self.end = tuple(map(inch, self.end))
def to_metric(self):
if self.tool.units == 'inch':
self.tool.to_metric()
self.start = tuple(map(metric, self.start))
self.end = tuple(map(metric, self.end))
self.start = tuple(map(metric, self.start))
self.end = tuple(map(metric, self.end))
@property
def bounding_box(self):
@ -253,7 +245,7 @@ class ExcellonFile(CamFile):
for primitive in self.primitives:
primitive.to_inch()
for hit in self.hits:
hit.position = tuple(map(inch, hit.position))
hit.to_inch()
def to_metric(self):
@ -268,7 +260,7 @@ class ExcellonFile(CamFile):
for primitive in self.primitives:
primitive.to_metric()
for hit in self.hits:
hit.position = tuple(map(metric, hit.position))
hit.to_metric()
def offset(self, x_offset=0, y_offset=0):
for statement in self.statements:

5
gerber/render/excellon_backend.py
View file

@ -36,6 +36,11 @@ class ExcellonContext(GerberContext):
self.header.append(UnitStmt.from_settings(self.settings))
if self.settings.notation == 'incremental':
raise NotImplementedError('Incremental mode is not implemented')
else:
self.body.append(AbsoluteModeStmt())
def _start_comments(self):
# Write the digits used - this isn't valid Excellon statement, so we write as a comment