From 19a8fb00487ca182bd3127b4def52719d8be3e30 Mon Sep 17 00:00:00 2001 From: Hamilton Kibbe Date: Tue, 13 Dec 2016 20:22:54 -0500 Subject: Add max_width and max_height arguments to --- examples/pcb_bottom.png | Bin 36992 -> 49825 bytes examples/pcb_example.py | 6 +++--- examples/pcb_top.png | Bin 92371 -> 104847 bytes examples/pcb_transparent_copper.png | Bin 85285 -> 110043 bytes gerber/render/cairo_backend.py | 24 ++++++++++++++++++++++-- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/examples/pcb_bottom.png b/examples/pcb_bottom.png index 1834c06..e7fc616 100644 Binary files a/examples/pcb_bottom.png and b/examples/pcb_bottom.png differ diff --git a/examples/pcb_example.py b/examples/pcb_example.py index e6a56fc..9e066a8 100644 --- a/examples/pcb_example.py +++ b/examples/pcb_example.py @@ -37,16 +37,16 @@ pcb = PCB.from_directory(GERBER_FOLDER) # Render PCB top view ctx.render_layers(pcb.top_layers, os.path.join(os.path.dirname(__file__), 'pcb_top.png',), - theme.THEMES['OSH Park']) + theme.THEMES['OSH Park'], max_width=800, max_height=600) # Render PCB bottom view ctx.render_layers(pcb.bottom_layers, os.path.join(os.path.dirname(__file__), 'pcb_bottom.png'), - theme.THEMES['OSH Park']) + theme.THEMES['OSH Park'], max_width=800, max_height=600) # Render copper layers only ctx.render_layers(pcb.copper_layers + pcb.drill_layers, os.path.join(os.path.dirname(__file__), 'pcb_transparent_copper.png'), - theme.THEMES['Transparent Copper']) + theme.THEMES['Transparent Copper'], max_width=800, max_height=600) diff --git a/examples/pcb_top.png b/examples/pcb_top.png index b6b65d0..ea0cc5b 100644 Binary files a/examples/pcb_top.png and b/examples/pcb_top.png differ diff --git a/examples/pcb_transparent_copper.png b/examples/pcb_transparent_copper.png index 9aa0f0c..0c8642f 100644 Binary files a/examples/pcb_transparent_copper.png and b/examples/pcb_transparent_copper.png differ diff --git a/gerber/render/cairo_backend.py b/gerber/render/cairo_backend.py index e6af67f..76be60a 100644 --- a/gerber/render/cairo_backend.py +++ b/gerber/render/cairo_backend.py @@ -97,10 +97,29 @@ class GerberCairoContext(GerberContext): self.dump(filename, verbose) def render_layers(self, layers, filename, theme=THEMES['default'], - verbose=False): + verbose=False, max_width=800, max_height=600): """ Render a set of layers """ + # Calculate scale parameter + x_range = [10000, -10000] + y_range = [10000, -10000] + for layer in layers: + bounds = layer.bounds + if bounds is not None: + layer_x, layer_y = bounds + x_range[0] = min(x_range[0], layer_x[0]) + x_range[1] = max(x_range[1], layer_x[1]) + y_range[0] = min(y_range[0], layer_y[0]) + y_range[1] = max(y_range[1], layer_y[1]) + width = x_range[1] - x_range[0] + height = y_range[1] - y_range[0] + + scale = math.floor(min(float(max_width)/width, float(max_height)/height)) + self.scale = (scale, scale) + self.clear() + + # Render layers bgsettings = theme['background'] for layer in layers: settings = theme.get(layer.layer_class, RenderSettings()) @@ -293,7 +312,7 @@ class GerberCairoContext(GerberContext): angle2=(2 * math.pi)) mask.ctx.fill() - if hasattr(circle, 'hole_diameter') and circle.hole_diameter > 0: + if hasattr(circle, 'hole_diameter') and circle.hole_diameter is not None and circle.hole_diameter > 0: mask.ctx.set_operator(cairo.OPERATOR_CLEAR) mask.ctx.arc(center[0], center[1], @@ -303,6 +322,7 @@ class GerberCairoContext(GerberContext): mask.ctx.fill() if (hasattr(circle, 'hole_width') and hasattr(circle, 'hole_height') + and circle.hole_width is not None and circle.hole_height is not None and circle.hole_width > 0 and circle.hole_height > 0): mask.ctx.set_operator(cairo.OPERATOR_CLEAR if circle.level_polarity == 'dark' -- cgit