aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.rst6
-rwxr-xr-xgerbolyze/gerbolyze.py10
2 files changed, 8 insertions, 8 deletions
diff --git a/README.rst b/README.rst
index f2dd4c4..0324166 100644
--- a/README.rst
+++ b/README.rst
@@ -331,6 +331,12 @@ The default subtraction script is:
out.silk -= in.mask
+``gerbolyze vectorize``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+``gerbolyze vectorize`` is a wrapper provided for compatibility with Gerbolyze version 1. It does nothing more than
+internally call ``gerbolyze paste`` with some default arguments set.
+
.. _svg_flatten:
``svg-flatten``
~~~~~~~~~~~~~~~
diff --git a/gerbolyze/gerbolyze.py b/gerbolyze/gerbolyze.py
index 396ca18..79bc69c 100755
--- a/gerbolyze/gerbolyze.py
+++ b/gerbolyze/gerbolyze.py
@@ -62,7 +62,6 @@ def vectorize(ctx, side, layer, exact, source, target, image, trace_space):
@click.option('--dilate', default=0.1, help='Default dilation for subtraction operations in mm')
@click.option('--no-subtract', 'no_subtract', flag_value=True, help='Disable subtraction')
@click.option('--subtract', help='Use user subtraction script from argument (see description above)')
-@click.option('--input-on-top/--overlay-on-top', default=True, help='Set paint order of input and overlay')
@click.option('--trace-space', type=float, default=0.1, help='passed through to svg-flatten')
@click.option('--vectorizer', help='passed through to svg-flatten')
@click.option('--vectorizer-map', help='passed through to svg-flatten')
@@ -73,7 +72,6 @@ def paste(input_gerbers, output_gerbers,
bbox,
dilate, no_subtract, subtract,
preserve_aspect_ratio,
- input_on_top,
trace_space, vectorizer, vectorizer_map, exclude_groups):
""" Render vector data and raster images from SVG file into gerbers. """
@@ -169,9 +167,6 @@ def paste(input_gerbers, output_gerbers,
print('compositing')
comp = gerberex.GerberComposition()
- if not input_on_top:
- # input below everything
- comp.merge(gerberex.rs274x.GerberFile.from_gerber_file(in_grb.cam_source))
# overlay on bottom
overlay_grb.offset(bounds[0][0], bounds[1][0])
comp.merge(overlay_grb)
@@ -181,9 +176,8 @@ def paste(input_gerbers, output_gerbers,
print('processing dilation', d_layer, amount)
dilated = do_dilate(d_layer, amount)
comp.merge(dilated)
- if input_on_top:
- # input on top of everything
- comp.merge(gerberex.rs274x.GerberFile.from_gerber_file(in_grb.cam_source))
+ # input on top of everything
+ comp.merge(gerberex.rs274x.GerberFile.from_gerber_file(in_grb.cam_source))
if input_gerbers.is_dir():
this_out = output_gerbers / in_grb_path.name