diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/auto_run.py | 4 | ||||
| -rw-r--r-- | lib/extensions/auto_satin.py | 4 | ||||
| -rw-r--r-- | lib/extensions/cut_satin.py | 2 | ||||
| -rw-r--r-- | lib/extensions/gradient_blocks.py | 6 | ||||
| -rw-r--r-- | lib/extensions/redwork.py | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/lib/extensions/auto_run.py b/lib/extensions/auto_run.py index 02997fd0..3b2003e4 100644 --- a/lib/extensions/auto_run.py +++ b/lib/extensions/auto_run.py @@ -35,10 +35,10 @@ class AutoRun(CommandsExtension): autorun(elements, self.options.preserve_order, break_up, starting_point, ending_point, self.options.trim) def get_starting_point(self): - return self.get_command_point("run_start") + return self.get_command_point("autoroute_start") def get_ending_point(self): - return self.get_command_point("run_end") + return self.get_command_point("autoroute_end") def get_command_point(self, command_type): command = None diff --git a/lib/extensions/auto_satin.py b/lib/extensions/auto_satin.py index 8536e4ee..d5456bcb 100644 --- a/lib/extensions/auto_satin.py +++ b/lib/extensions/auto_satin.py @@ -22,10 +22,10 @@ class AutoSatin(CommandsExtension): self.arg_parser.add_argument("-p", "--preserve_order", dest="preserve_order", type=inkex.Boolean, default=False) def get_starting_point(self): - return self.get_point("satin_start") + return self.get_point("autoroute_start") def get_ending_point(self): - return self.get_point("satin_end") + return self.get_point("autoroute_end") def get_point(self, command_type): command = None diff --git a/lib/extensions/cut_satin.py b/lib/extensions/cut_satin.py index a2c4f504..132c727f 100644 --- a/lib/extensions/cut_satin.py +++ b/lib/extensions/cut_satin.py @@ -39,6 +39,8 @@ class CutSatin(InkstitchExtension): command.connector.getparent().remove(command.connector) new_satins = satin.split(split_point) + if None in new_satins: + continue transform = get_correction_transform(satin.node) parent = satin.node.getparent() index = parent.index(satin.node) diff --git a/lib/extensions/gradient_blocks.py b/lib/extensions/gradient_blocks.py index 68e1e8e9..b87e5f9e 100644 --- a/lib/extensions/gradient_blocks.py +++ b/lib/extensions/gradient_blocks.py @@ -26,7 +26,7 @@ class GradientBlocks(CommandsExtension): This will break apart fill objects with a gradient fill into solid color blocks with end_row_spacing. ''' - COMMANDS = ['fill_start', 'fill_end'] + COMMANDS = ['starting_point', 'ending_point'] def __init__(self, *args, **kwargs): CommandsExtension.__init__(self, *args, **kwargs) @@ -112,8 +112,8 @@ class GradientBlocks(CommandsExtension): nearest = nearest_points(current.shape, previous.shape) pos_current = self._get_command_postion(current, nearest[0]) pos_previous = self._get_command_postion(previous, nearest[1]) - add_commands(current, ['fill_end'], pos_current) - add_commands(previous, ['fill_start'], pos_previous) + add_commands(current, ['ending_point'], pos_current) + add_commands(previous, ['starting_point'], pos_previous) def _get_command_postion(self, fill, point): center = fill.shape.centroid diff --git a/lib/extensions/redwork.py b/lib/extensions/redwork.py index 7bc237e9..9ad2aca5 100644 --- a/lib/extensions/redwork.py +++ b/lib/extensions/redwork.py @@ -47,10 +47,10 @@ class Redwork(InkstitchExtension): self.merge_distance = self.options.merge_distance * PIXELS_PER_MM self.minimum_path_length = self.options.minimum_path_length * PIXELS_PER_MM - starting_point = self._get_starting_point('run_start') + starting_point = self._get_starting_point('autoroute_start') # as the resulting path starts and ends at same place we can also use ending point if not starting_point: - starting_point = self._get_starting_point('run_end') + starting_point = self._get_starting_point('autoroute_end') multi_line_string = self._elements_to_multi_line_string(elements) if starting_point: |