From 6d2db67e6d0973ce26ce3a6700ca44295f73fea7 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Sat, 18 Oct 2014 01:44:51 -0400 Subject: Refactor rendering --- gerber/layers.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 gerber/layers.py (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py new file mode 100644 index 0000000..b10cf16 --- /dev/null +++ b/gerber/layers.py @@ -0,0 +1,54 @@ +#! /usr/bin/env python +# -*- coding: utf-8 -*- + +# copyright 2014 Hamilton Kibbe +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +top_copper_ext = ['gtl', 'cmp', 'top', ] +top_copper_name = ['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', ] + +bottom_copper_ext = ['gbl', 'sld', 'bot', 'sol', ] +bottom_coppper_name = ['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', ] + +internal_layer_ext = ['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1', + 'g2', 'g3', 'g4', 'g5', 'g6', ] +internal_layer_name = ['art', 'internal'] + +power_plane_name = ['pgp', 'pwr', ] +ground_plane_name = ['gp1', 'gp2', 'gp3', 'gp4', 'gt5', 'gp6', 'gnd', + 'ground', ] + +top_silk_ext = ['gto', 'sst', 'plc', 'ts', 'skt', ] +top_silk_name = ['sst01', 'topsilk', 'silk', 'slk', 'sst', ] + +bottom_silk_ext = ['gbo', 'ssb', 'pls', 'bs', 'skb', ] +bottom_silk_name = ['sst', 'bsilk', 'ssb', 'botsilk', ] + +top_mask_ext = ['gts', 'stc', 'tmk', 'smt', 'tr', ] +top_mask_name = ['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask', + 'mst', ] + +bottom_mask_ext = ['gbs', 'sts', 'bmk', 'smb', 'br', ] +bottom_mask_name = ['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', ] + +top_paste_ext = ['gtp', 'tm'] +top_paste_name = ['sp01', 'toppaste', 'pst'] + +bottom_paste_ext = ['gbp', 'bm'] +bottom_paste_name = ['sp02', 'botpaste', 'psb'] + +board_outline_ext = ['gko'] +board_outline_name = ['BDR', 'border', 'out', ] + + -- cgit From 6f876edd09d9b81649691e529f85653f14b8fd1c Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Tue, 22 Dec 2015 02:45:48 -0500 Subject: Add PCB interface this incorporates some of @chintal's layers.py changes PCB.from_directory() simplifies loading of multiple gerbers the PCB() class should be pretty helpful going forward... the context classes could use some cleaning up, although I'd like to wait until the freecad stuff gets merged, that way we can try to refactor the context base to support more use cases --- gerber/layers.py | 246 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 209 insertions(+), 37 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index b10cf16..c6a5bf7 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -15,40 +15,212 @@ # See the License for the specific language governing permissions and # limitations under the License. -top_copper_ext = ['gtl', 'cmp', 'top', ] -top_copper_name = ['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', ] - -bottom_copper_ext = ['gbl', 'sld', 'bot', 'sol', ] -bottom_coppper_name = ['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', ] - -internal_layer_ext = ['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1', - 'g2', 'g3', 'g4', 'g5', 'g6', ] -internal_layer_name = ['art', 'internal'] - -power_plane_name = ['pgp', 'pwr', ] -ground_plane_name = ['gp1', 'gp2', 'gp3', 'gp4', 'gt5', 'gp6', 'gnd', - 'ground', ] - -top_silk_ext = ['gto', 'sst', 'plc', 'ts', 'skt', ] -top_silk_name = ['sst01', 'topsilk', 'silk', 'slk', 'sst', ] - -bottom_silk_ext = ['gbo', 'ssb', 'pls', 'bs', 'skb', ] -bottom_silk_name = ['sst', 'bsilk', 'ssb', 'botsilk', ] - -top_mask_ext = ['gts', 'stc', 'tmk', 'smt', 'tr', ] -top_mask_name = ['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask', - 'mst', ] - -bottom_mask_ext = ['gbs', 'sts', 'bmk', 'smb', 'br', ] -bottom_mask_name = ['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', ] - -top_paste_ext = ['gtp', 'tm'] -top_paste_name = ['sp01', 'toppaste', 'pst'] - -bottom_paste_ext = ['gbp', 'bm'] -bottom_paste_name = ['sp02', 'botpaste', 'psb'] - -board_outline_ext = ['gko'] -board_outline_name = ['BDR', 'border', 'out', ] - - +import os +import re +from collections import namedtuple + +from .excellon import ExcellonFile +from .ipc356 import IPC_D_356 +from .render.render import Renderable + +Hint = namedtuple('Hint', 'layer ext name') + +hints = [ + Hint(layer='top', + ext=['gtl', 'cmp', 'top', ], + name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', ] + ), + Hint(layer='bottom', + ext=['gbl', 'sld', 'bot', 'sol', 'bottom', ], + name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', ] + ), + Hint(layer='internal', + ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1', + 'g2', 'g3', 'g4', 'g5', 'g6', ], + name=['art', 'internal', 'pgp', 'pwr', 'gp1', 'gp2', 'gp3', 'gp4', + 'gt5', 'gp6', 'gnd', 'ground', ] + ), + Hint(layer='topsilk', + ext=['gto', 'sst', 'plc', 'ts', 'skt', 'topsilk', ], + name=['sst01', 'topsilk', 'silk', 'slk', 'sst', ] + ), + Hint(layer='bottomsilk', + ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', ], + name=['bsilk', 'ssb', 'botsilk', ] + ), + Hint(layer='topmask', + ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ], + name=['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask', + 'mst', ] + ), + Hint(layer='bottommask', + ext=['gbs', 'sts', 'bmk', 'smb', 'br', 'bottommask', ], + name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', ] + ), + Hint(layer='toppaste', + ext=['gtp', 'tm', 'toppaste', ], + name=['sp01', 'toppaste', 'pst'] + ), + Hint(layer='bottompaste', + ext=['gbp', 'bm', 'bottompaste', ], + name=['sp02', 'botpaste', 'psb'] + ), + Hint(layer='outline', + ext=['gko', 'outline', ], + name=['BDR', 'border', 'out', ] + ), + Hint(layer='ipc_netlist', + ext=['ipc'], + name=[], + ), +] + + +def guess_layer_class(filename): + try: + directory, name = os.path.split(filename) + name, ext = os.path.splitext(name.lower()) + for hint in hints: + patterns = [r'^(\w*[.-])*{}([.-]\w*)?$'.format(x) for x in hint.name] + if ext[1:] in hint.ext or any(re.findall(p, name, re.IGNORECASE) for p in patterns): + return hint.layer + except: + pass + return 'unknown' + + +def sort_layers(layers): + layer_order = ['outline', 'toppaste', 'topsilk', 'topmask', 'top', + 'internal', 'bottom', 'bottommask', 'bottomsilk', + 'bottompaste', 'drill', ] + output = [] + drill_layers = [layer for layer in layers if layer.layer_class == 'drill'] + internal_layers = list(sorted([layer for layer in layers if layer.layer_class == 'internal'])) + + for layer_class in layer_order: + if layer_class == 'internal': + output += internal_layers + elif layer_class == 'drill': + output += drill_layers + else: + for layer in layers: + if layer.layer_class == layer_class: + output.append(layer) + return output + + +class PCBLayer(Renderable): + """ Base class for PCB Layers + + Parameters + ---------- + source : CAMFile + CAMFile representing the layer + + + Attributes + ---------- + filename : string + Source Filename + + """ + @classmethod + def from_gerber(cls, camfile): + filename = camfile.filename + layer_class = guess_layer_class(filename) + if isinstance(camfile, ExcellonFile) or (layer_class == 'drill'): + return DrillLayer.from_gerber(camfile) + elif layer_class == 'internal': + return InternalLayer.from_gerber(camfile) + if isinstance(camfile, IPC_D_356): + layer_class = 'ipc_netlist' + return cls(filename, layer_class, camfile) + + def __init__(self, filename=None, layer_class=None, cam_source=None, **kwargs): + super(PCBLayer, self).__init__(**kwargs) + self.filename = filename + self.layer_class = layer_class + self.cam_source = cam_source + self.surface = None + self.primitives = cam_source.primitives if cam_source is not None else [] + + @property + def bounds(self): + if self.cam_source is not None: + return self.cam_source.bounds + else: + return None + + +class DrillLayer(PCBLayer): + @classmethod + def from_gerber(cls, camfile): + return cls(camfile.filename, camfile) + + def __init__(self, filename=None, cam_source=None, layers=None, **kwargs): + super(DrillLayer, self).__init__(filename, 'drill', cam_source, **kwargs) + self.layers = layers if layers is not None else ['top', 'bottom'] + + +class InternalLayer(PCBLayer): + @classmethod + def from_gerber(cls, camfile): + filename = camfile.filename + try: + order = int(re.search(r'\d+', filename).group()) + except: + order = 0 + return cls(filename, camfile, order) + + def __init__(self, filename=None, cam_source=None, order=0, **kwargs): + super(InternalLayer, self).__init__(filename, 'internal', cam_source, **kwargs) + self.order = order + + def __eq__(self, other): + if not hasattr(other, 'order'): + raise TypeError() + return (self.order == other.order) + + def __ne__(self, other): + if not hasattr(other, 'order'): + raise TypeError() + return (self.order != other.order) + + def __gt__(self, other): + if not hasattr(other, 'order'): + raise TypeError() + return (self.order > other.order) + + def __lt__(self, other): + if not hasattr(other, 'order'): + raise TypeError() + return (self.order < other.order) + + def __ge__(self, other): + if not hasattr(other, 'order'): + raise TypeError() + return (self.order >= other.order) + + def __le__(self, other): + if not hasattr(other, 'order'): + raise TypeError() + return (self.order <= other.order) + + +class LayerSet(Renderable): + def __init__(self, name, layers, **kwargs): + super(LayerSet, self).__init__(**kwargs) + self.name = name + self.layers = list(layers) + + def __len__(self): + return len(self.layers) + + def __getitem__(self, item): + return self.layers[item] + + def to_render(self): + return self.layers + + def apply_theme(self, theme): + pass -- cgit From 6a005436b475e3517fd6a583473b60e601bcc661 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Fri, 1 Jan 2016 12:25:38 -0500 Subject: Refactor a little pulled all rendering stuff out of the pcb/layer objects --- gerber/layers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index c6a5bf7..2b73893 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -21,7 +21,7 @@ from collections import namedtuple from .excellon import ExcellonFile from .ipc356 import IPC_D_356 -from .render.render import Renderable + Hint = namedtuple('Hint', 'layer ext name') @@ -109,7 +109,7 @@ def sort_layers(layers): return output -class PCBLayer(Renderable): +class PCBLayer(object): """ Base class for PCB Layers Parameters @@ -207,7 +207,7 @@ class InternalLayer(PCBLayer): return (self.order <= other.order) -class LayerSet(Renderable): +class LayerSet(object): def __init__(self, name, layers, **kwargs): super(LayerSet, self).__init__(**kwargs) self.name = name -- cgit From 5476da8aa3f4ee424f56f4f2491e7af1c4b7b758 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Thu, 21 Jan 2016 03:57:44 -0500 Subject: Fix a bunch of rendering bugs. - 'clear' polarity primitives no longer erase background - Added aperture macro support for polygons - Added aperture macro rendring support - Renderer now creates a new surface for each layer and merges them instead of working directly on a single surface - Updated examples accordingly --- gerber/layers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index 2b73893..29e452b 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -95,7 +95,8 @@ def sort_layers(layers): 'bottompaste', 'drill', ] output = [] drill_layers = [layer for layer in layers if layer.layer_class == 'drill'] - internal_layers = list(sorted([layer for layer in layers if layer.layer_class == 'internal'])) + internal_layers = list(sorted([layer for layer in layers + if layer.layer_class == 'internal'])) for layer_class in layer_order: if layer_class == 'internal': @@ -151,6 +152,8 @@ class PCBLayer(object): else: return None + def __repr__(self): + return ''.format(self.layer_class) class DrillLayer(PCBLayer): @classmethod @@ -163,6 +166,7 @@ class DrillLayer(PCBLayer): class InternalLayer(PCBLayer): + @classmethod def from_gerber(cls, camfile): filename = camfile.filename @@ -208,6 +212,7 @@ class InternalLayer(PCBLayer): class LayerSet(object): + def __init__(self, name, layers, **kwargs): super(LayerSet, self).__init__(**kwargs) self.name = name -- cgit From 5df38c014fd09792995b2b12b1982c535c962c9a Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Thu, 28 Jan 2016 12:19:03 -0500 Subject: Cleanup, rendering fixes. fixed rendering of tented vias fixed rendering of semi-transparent layers fixed file type detection issues added some examples --- gerber/layers.py | 66 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index 29e452b..93f0e36 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -19,8 +19,9 @@ import os import re from collections import namedtuple +from . import common from .excellon import ExcellonFile -from .ipc356 import IPC_D_356 +from .ipc356 import IPCNetlist Hint = namedtuple('Hint', 'layer ext name') @@ -73,9 +74,21 @@ hints = [ ext=['ipc'], name=[], ), + Hint(layer='drawing', + ext=['fab'], + name=['assembly drawing', 'assembly', 'fabrication', 'fab drawing'] + ), ] +def load_layer(filename): + return PCBLayer.from_cam(common.read(filename)) + + +def load_layer_data(data, filename=None): + return PCBLayer.from_cam(common.loads(data, filename)) + + def guess_layer_class(filename): try: directory, name = os.path.split(filename) @@ -89,24 +102,30 @@ def guess_layer_class(filename): return 'unknown' -def sort_layers(layers): +def sort_layers(layers, from_top=True): layer_order = ['outline', 'toppaste', 'topsilk', 'topmask', 'top', 'internal', 'bottom', 'bottommask', 'bottomsilk', - 'bottompaste', 'drill', ] + 'bottompaste'] + append_after = ['drill', 'drawing'] + output = [] - drill_layers = [layer for layer in layers if layer.layer_class == 'drill'] internal_layers = list(sorted([layer for layer in layers if layer.layer_class == 'internal'])) for layer_class in layer_order: if layer_class == 'internal': output += internal_layers - elif layer_class == 'drill': - output += drill_layers else: for layer in layers: if layer.layer_class == layer_class: output.append(layer) + if not from_top: + output = list(reversed(output)) + + for layer_class in append_after: + for layer in layers: + if layer.layer_class == layer_class: + output.append(layer) return output @@ -126,14 +145,14 @@ class PCBLayer(object): """ @classmethod - def from_gerber(cls, camfile): + def from_cam(cls, camfile): filename = camfile.filename layer_class = guess_layer_class(filename) if isinstance(camfile, ExcellonFile) or (layer_class == 'drill'): - return DrillLayer.from_gerber(camfile) + return DrillLayer.from_cam(camfile) elif layer_class == 'internal': - return InternalLayer.from_gerber(camfile) - if isinstance(camfile, IPC_D_356): + return InternalLayer.from_cam(camfile) + if isinstance(camfile, IPCNetlist): layer_class = 'ipc_netlist' return cls(filename, layer_class, camfile) @@ -155,9 +174,10 @@ class PCBLayer(object): def __repr__(self): return ''.format(self.layer_class) + class DrillLayer(PCBLayer): @classmethod - def from_gerber(cls, camfile): + def from_cam(cls, camfile): return cls(camfile.filename, camfile) def __init__(self, filename=None, cam_source=None, layers=None, **kwargs): @@ -168,11 +188,11 @@ class DrillLayer(PCBLayer): class InternalLayer(PCBLayer): @classmethod - def from_gerber(cls, camfile): + def from_cam(cls, camfile): filename = camfile.filename try: order = int(re.search(r'\d+', filename).group()) - except: + except AttributeError: order = 0 return cls(filename, camfile, order) @@ -209,23 +229,3 @@ class InternalLayer(PCBLayer): if not hasattr(other, 'order'): raise TypeError() return (self.order <= other.order) - - -class LayerSet(object): - - def __init__(self, name, layers, **kwargs): - super(LayerSet, self).__init__(**kwargs) - self.name = name - self.layers = list(layers) - - def __len__(self): - return len(self.layers) - - def __getitem__(self, item): - return self.layers[item] - - def to_render(self): - return self.layers - - def apply_theme(self, theme): - pass -- cgit From 8cd842a41a55ab3d8f558a2e3e198beba7da58a1 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Thu, 21 Jan 2016 03:57:44 -0500 Subject: Manually mere rendering changes --- gerber/layers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index 2b73893..29e452b 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -95,7 +95,8 @@ def sort_layers(layers): 'bottompaste', 'drill', ] output = [] drill_layers = [layer for layer in layers if layer.layer_class == 'drill'] - internal_layers = list(sorted([layer for layer in layers if layer.layer_class == 'internal'])) + internal_layers = list(sorted([layer for layer in layers + if layer.layer_class == 'internal'])) for layer_class in layer_order: if layer_class == 'internal': @@ -151,6 +152,8 @@ class PCBLayer(object): else: return None + def __repr__(self): + return ''.format(self.layer_class) class DrillLayer(PCBLayer): @classmethod @@ -163,6 +166,7 @@ class DrillLayer(PCBLayer): class InternalLayer(PCBLayer): + @classmethod def from_gerber(cls, camfile): filename = camfile.filename @@ -208,6 +212,7 @@ class InternalLayer(PCBLayer): class LayerSet(object): + def __init__(self, name, layers, **kwargs): super(LayerSet, self).__init__(**kwargs) self.name = name -- cgit From 0fedaedb6ebb8cc6abfc218d224a3ab69bb71b56 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Thu, 29 Sep 2016 19:43:28 -0400 Subject: Add more layer hints as seen in the wild --- gerber/layers.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index 93f0e36..c9e451a 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -29,46 +29,46 @@ Hint = namedtuple('Hint', 'layer ext name') hints = [ Hint(layer='top', ext=['gtl', 'cmp', 'top', ], - name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', ] + name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', 'F.Cu', ] ), Hint(layer='bottom', ext=['gbl', 'sld', 'bot', 'sol', 'bottom', ], - name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', ] + name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', 'B.Cu', ] ), Hint(layer='internal', ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1', 'g2', 'g3', 'g4', 'g5', 'g6', ], name=['art', 'internal', 'pgp', 'pwr', 'gp1', 'gp2', 'gp3', 'gp4', - 'gt5', 'gp6', 'gnd', 'ground', ] + 'gt5', 'gp6', 'gnd', 'ground', 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu'] ), Hint(layer='topsilk', ext=['gto', 'sst', 'plc', 'ts', 'skt', 'topsilk', ], - name=['sst01', 'topsilk', 'silk', 'slk', 'sst', ] + name=['sst01', 'topsilk', 'silk', 'slk', 'sst', 'F.SilkS'] ), Hint(layer='bottomsilk', - ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', ], + ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', 'B.SilkS'], name=['bsilk', 'ssb', 'botsilk', ] ), Hint(layer='topmask', ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ], name=['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask', - 'mst', ] + 'mst', 'F.Mask',] ), Hint(layer='bottommask', ext=['gbs', 'sts', 'bmk', 'smb', 'br', 'bottommask', ], - name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', ] + name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', 'B.Mask',] ), Hint(layer='toppaste', ext=['gtp', 'tm', 'toppaste', ], - name=['sp01', 'toppaste', 'pst'] + name=['sp01', 'toppaste', 'pst', 'F.Paste'] ), Hint(layer='bottompaste', ext=['gbp', 'bm', 'bottompaste', ], - name=['sp02', 'botpaste', 'psb'] + name=['sp02', 'botpaste', 'psb', 'B.Paste', ] ), Hint(layer='outline', ext=['gko', 'outline', ], - name=['BDR', 'border', 'out', ] + name=['BDR', 'border', 'out', 'Edge.Cuts', ] ), Hint(layer='ipc_netlist', ext=['ipc'], -- cgit From 22e668c75f24174d2090443ed98e804b3737bd84 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Sat, 5 Nov 2016 18:30:21 -0400 Subject: Fix tests --- gerber/layers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index c9e451a..212695a 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -46,8 +46,8 @@ hints = [ name=['sst01', 'topsilk', 'silk', 'slk', 'sst', 'F.SilkS'] ), Hint(layer='bottomsilk', - ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', 'B.SilkS'], - name=['bsilk', 'ssb', 'botsilk', ] + ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk',], + name=['bsilk', 'ssb', 'botsilk', 'B.SilkS'] ), Hint(layer='topmask', ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ], -- cgit From ffeaf788f090b10307247775b43dd7c0b0fd7342 Mon Sep 17 00:00:00 2001 From: ju5t Date: Thu, 1 Dec 2016 21:08:17 +0100 Subject: (#61) Add regex option to discover layer classes --- gerber/layers.py | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index bd55fb9..8d47816 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -24,59 +24,71 @@ from .excellon import ExcellonFile from .ipc356 import IPCNetlist -Hint = namedtuple('Hint', 'layer ext name') +Hint = namedtuple('Hint', 'layer ext name regex') hints = [ Hint(layer='top', ext=['gtl', 'cmp', 'top', ], - name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', 'F.Cu', ] + name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', 'F.Cu', ], + regex='' ), Hint(layer='bottom', ext=['gbl', 'sld', 'bot', 'sol', 'bottom', ], - name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', 'B.Cu', ] + name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', 'B.Cu', ], + regex='' ), Hint(layer='internal', ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1', 'g2', 'g3', 'g4', 'g5', 'g6', ], name=['art', 'internal', 'pgp', 'pwr', 'gp1', 'gp2', 'gp3', 'gp4', - 'gt5', 'gp6', 'gnd', 'ground', 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu'] + 'gt5', 'gp6', 'gnd', 'ground', 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu'], + regex='' ), Hint(layer='topsilk', ext=['gto', 'sst', 'plc', 'ts', 'skt', 'topsilk', ], - name=['sst01', 'topsilk', 'silk', 'slk', 'sst', 'F.SilkS'] + name=['sst01', 'topsilk', 'silk', 'slk', 'sst', 'F.SilkS'], + regex='' ), Hint(layer='bottomsilk', ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk',], - name=['bsilk', 'ssb', 'botsilk', 'B.SilkS'] + name=['bsilk', 'ssb', 'botsilk', 'B.SilkS'], + regex='' ), Hint(layer='topmask', ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ], name=['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask', - 'mst', 'F.Mask',] + 'mst', 'F.Mask',], + regex='' ), Hint(layer='bottommask', ext=['gbs', 'sts', 'bmk', 'smb', 'br', 'bottommask', ], - name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', 'B.Mask',] + name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', 'B.Mask',], + regex='' ), Hint(layer='toppaste', ext=['gtp', 'tm', 'toppaste', ], - name=['sp01', 'toppaste', 'pst', 'F.Paste'] + name=['sp01', 'toppaste', 'pst', 'F.Paste'], + regex='' ), Hint(layer='bottompaste', ext=['gbp', 'bm', 'bottompaste', ], - name=['sp02', 'botpaste', 'psb', 'B.Paste', ] + name=['sp02', 'botpaste', 'psb', 'B.Paste', ], + regex='' ), Hint(layer='outline', ext=['gko', 'outline', ], - name=['BDR', 'border', 'out', 'Edge.Cuts', ] + name=['BDR', 'border', 'out', 'Edge.Cuts', ], + regex='' ), Hint(layer='ipc_netlist', ext=['ipc'], name=[], + regex='' ), Hint(layer='drawing', ext=['fab'], - name=['assembly drawing', 'assembly', 'fabrication', 'fab drawing'] + name=['assembly drawing', 'assembly', 'fabrication', 'fab drawing'], + regex='' ), ] @@ -94,6 +106,10 @@ def guess_layer_class(filename): directory, name = os.path.split(filename) name, ext = os.path.splitext(name.lower()) for hint in hints: + if hint.regex: + if re.findall(hint.regex, name, re.IGNORECASE): + return hint.layer + patterns = [r'^(\w*[.-])*{}([.-]\w*)?$'.format(x) for x in hint.name] if ext[1:] in hint.ext or any(re.findall(p, name, re.IGNORECASE) for p in patterns): return hint.layer -- cgit From 9ae238bf7ab4bc74d101605a9dbaddc098b9348d Mon Sep 17 00:00:00 2001 From: ju5t Date: Wed, 1 Nov 2017 16:23:22 +0100 Subject: Check gerber content for layer hints --- gerber/layers.py | 60 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 13 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index 8d47816..c80baa4 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -24,71 +24,83 @@ from .excellon import ExcellonFile from .ipc356 import IPCNetlist -Hint = namedtuple('Hint', 'layer ext name regex') +Hint = namedtuple('Hint', 'layer ext name regex content') hints = [ Hint(layer='top', ext=['gtl', 'cmp', 'top', ], name=['art01', 'top', 'GTL', 'layer1', 'soldcom', 'comp', 'F.Cu', ], - regex='' + regex='', + content=[] ), Hint(layer='bottom', ext=['gbl', 'sld', 'bot', 'sol', 'bottom', ], name=['art02', 'bottom', 'bot', 'GBL', 'layer2', 'soldsold', 'B.Cu', ], - regex='' + regex='', + content=[] ), Hint(layer='internal', ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1', 'g2', 'g3', 'g4', 'g5', 'g6', ], name=['art', 'internal', 'pgp', 'pwr', 'gp1', 'gp2', 'gp3', 'gp4', 'gt5', 'gp6', 'gnd', 'ground', 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu'], - regex='' + regex='', + content=[] ), Hint(layer='topsilk', ext=['gto', 'sst', 'plc', 'ts', 'skt', 'topsilk', ], name=['sst01', 'topsilk', 'silk', 'slk', 'sst', 'F.SilkS'], - regex='' + regex='', + content=[] ), Hint(layer='bottomsilk', ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk',], name=['bsilk', 'ssb', 'botsilk', 'B.SilkS'], - regex='' + regex='', + content=[] ), Hint(layer='topmask', ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ], name=['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask', 'mst', 'F.Mask',], - regex='' + regex='', + content=[] ), Hint(layer='bottommask', ext=['gbs', 'sts', 'bmk', 'smb', 'br', 'bottommask', ], name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', 'B.Mask',], - regex='' + regex='', + content=[] ), Hint(layer='toppaste', ext=['gtp', 'tm', 'toppaste', ], name=['sp01', 'toppaste', 'pst', 'F.Paste'], - regex='' + regex='', + content=[] ), Hint(layer='bottompaste', ext=['gbp', 'bm', 'bottompaste', ], name=['sp02', 'botpaste', 'psb', 'B.Paste', ], - regex='' + regex='', + content=[] ), Hint(layer='outline', ext=['gko', 'outline', ], name=['BDR', 'border', 'out', 'Edge.Cuts', ], - regex='' + regex='', + content=[] ), Hint(layer='ipc_netlist', ext=['ipc'], name=[], - regex='' + regex='', + content=[] ), Hint(layer='drawing', ext=['fab'], name=['assembly drawing', 'assembly', 'fabrication', 'fab drawing'], - regex='' + regex='', + content=[] ), ] @@ -102,6 +114,13 @@ def load_layer_data(data, filename=None): def guess_layer_class(filename): + try: + layer = guess_layer_class_by_content(filename) + if layer: + return layer + except: + pass + try: directory, name = os.path.split(filename) name, ext = os.path.splitext(name.lower()) @@ -118,6 +137,21 @@ def guess_layer_class(filename): return 'unknown' +def guess_layer_class_by_content(filename): + try: + file = open(filename, 'r') + for line in file: + for hint in hints: + if len(hint.content) > 0: + patterns = [r'^(.*){}(.*)$'.format(x) for x in hint.content] + if any(re.findall(p, line, re.IGNORECASE) for p in patterns): + return hint.layer + except: + pass + + return False + + def sort_layers(layers, from_top=True): layer_order = ['outline', 'toppaste', 'topsilk', 'topmask', 'top', 'internal', 'bottom', 'bottommask', 'bottomsilk', -- cgit From 8dd8a87fc0fddadd590c926afe6928958d78839a Mon Sep 17 00:00:00 2001 From: ju5t Date: Tue, 26 Jun 2018 22:17:45 +0200 Subject: Match full filename instead of the base name Regular expressions only matched the base name. This matches the entire filename which allows for more advanced regular expressions. --- gerber/layers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index c80baa4..5c26412 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -122,11 +122,11 @@ def guess_layer_class(filename): pass try: - directory, name = os.path.split(filename) - name, ext = os.path.splitext(name.lower()) + directory, filename = os.path.split(filename) + name, ext = os.path.splitext(filename.lower()) for hint in hints: if hint.regex: - if re.findall(hint.regex, name, re.IGNORECASE): + if re.findall(hint.regex, filename, re.IGNORECASE): return hint.layer patterns = [r'^(\w*[.-])*{}([.-]\w*)?$'.format(x) for x in hint.name] -- cgit From 4aca5b8a02be8d648b7a2d5f462c6b80c6a6edda Mon Sep 17 00:00:00 2001 From: Chintalagiri Shashank Date: Fri, 10 May 2019 23:40:56 +0530 Subject: Correctly recognize gEDA pcb generated gerber filenames --- gerber/layers.py | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'gerber/layers.py') diff --git a/gerber/layers.py b/gerber/layers.py index 5c26412..69e1c0d 100644 --- a/gerber/layers.py +++ b/gerber/layers.py @@ -40,10 +40,12 @@ hints = [ content=[] ), Hint(layer='internal', - ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', 'g1', - 'g2', 'g3', 'g4', 'g5', 'g6', ], - name=['art', 'internal', 'pgp', 'pwr', 'gp1', 'gp2', 'gp3', 'gp4', - 'gt5', 'gp6', 'gnd', 'ground', 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu'], + ext=['in', 'gt1', 'gt2', 'gt3', 'gt4', 'gt5', 'gt6', + 'g1', 'g2', 'g3', 'g4', 'g5', 'g6', ], + name=['art', 'internal', 'pgp', 'pwr', 'gnd', 'ground', + 'gp1', 'gp2', 'gp3', 'gp4', 'gt5', 'gp6', + 'In1.Cu', 'In2.Cu', 'In3.Cu', 'In4.Cu', + 'group3', 'group4', 'group5', 'group6', 'group7', 'group8', ], regex='', content=[] ), @@ -54,21 +56,22 @@ hints = [ content=[] ), Hint(layer='bottomsilk', - ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk',], - name=['bsilk', 'ssb', 'botsilk', 'B.SilkS'], + ext=['gbo', 'ssb', 'pls', 'bs', 'skb', 'bottomsilk', ], + name=['bsilk', 'ssb', 'botsilk', 'bottomsilk', 'B.SilkS'], regex='', content=[] ), Hint(layer='topmask', ext=['gts', 'stc', 'tmk', 'smt', 'tr', 'topmask', ], name=['sm01', 'cmask', 'tmask', 'mask1', 'maskcom', 'topmask', - 'mst', 'F.Mask',], + 'mst', 'F.Mask', ], regex='', content=[] ), Hint(layer='bottommask', ext=['gbs', 'sts', 'bmk', 'smb', 'br', 'bottommask', ], - name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'msb', 'B.Mask',], + name=['sm', 'bmask', 'mask2', 'masksold', 'botmask', 'bottommask', + 'msb', 'B.Mask', ], regex='', content=[] ), @@ -80,13 +83,13 @@ hints = [ ), Hint(layer='bottompaste', ext=['gbp', 'bm', 'bottompaste', ], - name=['sp02', 'botpaste', 'psb', 'B.Paste', ], + name=['sp02', 'botpaste', 'bottompaste', 'psb', 'B.Paste', ], regex='', content=[] ), Hint(layer='outline', ext=['gko', 'outline', ], - name=['BDR', 'border', 'out', 'Edge.Cuts', ], + name=['BDR', 'border', 'out', 'outline', 'Edge.Cuts', ], regex='', content=[] ), @@ -98,13 +101,21 @@ hints = [ ), Hint(layer='drawing', ext=['fab'], - name=['assembly drawing', 'assembly', 'fabrication', 'fab drawing'], + name=['assembly drawing', 'assembly', 'fabrication', + 'fab drawing', 'fab'], regex='', content=[] ), ] +def layer_signatures(layer_class): + for hint in hints: + if hint.layer == layer_class: + return hint.ext + hint.name + return [] + + def load_layer(filename): return PCBLayer.from_cam(common.read(filename)) -- cgit