From ef83ff75a0c6f83f63ee38e1617c097a887affe8 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Tue, 11 Dec 2018 19:58:13 -0500 Subject: use proper defaults for fill and stroke in Params (#362) --- lib/extensions/params.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/extensions') diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 1f3032ca..386ce5dd 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -680,15 +680,16 @@ class Params(InkstitchExtension): element = EmbroideryElement(node) classes = [] - if element.get_style("fill"): - classes.append(AutoFill) - classes.append(Fill) + if not is_command(node): + if element.get_style("fill", "black") != "none": + classes.append(AutoFill) + classes.append(Fill) - if element.get_style("stroke") and not is_command(node): - classes.append(Stroke) + if element.get_style("stroke") is not None: + classes.append(Stroke) - if element.get_style("stroke-dasharray") is None: - classes.append(SatinColumn) + if element.get_style("stroke-dasharray") is None: + classes.append(SatinColumn) return classes -- cgit v1.3.1 From e47fcaa8da14a4a40f151e90915f3d0d208ec7b8 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Tue, 11 Dec 2018 19:58:20 -0500 Subject: tidy up imports --- lib/extensions/params.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'lib/extensions') diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 386ce5dd..6525cae2 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -1,23 +1,24 @@ # -*- coding: UTF-8 -*- +from collections import defaultdict +from copy import copy +from itertools import groupby +import json import os import sys -import json -import traceback from threading import Thread, Event -from copy import copy +import traceback + import wx from wx.lib.scrolledpanel import ScrolledPanel -from collections import defaultdict -from itertools import groupby -from .base import InkstitchExtension +from ..commands import is_command +from ..elements import EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn from ..i18n import _ +from ..simulator import EmbroiderySimulator from ..stitch_plan import patches_to_stitch_plan -from ..elements import EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn from ..utils import get_resource_dir -from ..simulator import EmbroiderySimulator -from ..commands import is_command +from .base import InkstitchExtension def presets_path(): -- cgit v1.3.1 From dc77f5cebcdfa4e1fdeff9c8b231061f5b07de42 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Tue, 18 Dec 2018 20:25:08 -0500 Subject: fix style --- lib/extensions/params.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/extensions') diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 8cd0debe..074a4288 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -3,7 +3,6 @@ from collections import defaultdict from copy import copy from itertools import groupby -import json import os import sys @@ -13,7 +12,6 @@ from wx.lib.scrolledpanel import ScrolledPanel from ..commands import is_command from ..elements import EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn -from ..simulator import EmbroiderySimulator from ..gui import PresetsPanel, SimulatorPreview from ..i18n import _ from ..utils import get_resource_dir -- cgit v1.3.1 From 32458c619a38928f403e5924c8ba864fe7ae346c Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Wed, 19 Dec 2018 14:39:47 -0500 Subject: fix fill == none detection --- lib/extensions/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/extensions') diff --git a/lib/extensions/params.py b/lib/extensions/params.py index 074a4288..4d04ba23 100644 --- a/lib/extensions/params.py +++ b/lib/extensions/params.py @@ -462,7 +462,7 @@ class Params(InkstitchExtension): classes = [] if not is_command(node): - if element.get_style("fill", "black") != "none": + if element.get_style("fill", "black") is not None: classes.append(AutoFill) classes.append(Fill) -- cgit v1.3.1 From 7b04eb123423d52aa088c9f5976079a0297ed5b6 Mon Sep 17 00:00:00 2001 From: Kaalleen <36401965+kaalleen@users.noreply.github.com> Date: Tue, 1 Jan 2019 19:47:28 +0100 Subject: Fix print metadata (#372) --- lib/extensions/print_pdf.py | 1 - print/templates/operator_detailedview.html | 4 ++-- print/templates/operator_overview.html | 2 +- print/templates/print_detail.html | 2 +- print/templates/print_overview.html | 2 +- print/templates/ui.html | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) (limited to 'lib/extensions') diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index d2e2365d..c718fa09 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -365,7 +365,6 @@ class Print(InkstitchExtension): 'num_trims': stitch_plan.num_trims, 'dimensions': stitch_plan.dimensions_mm, 'num_stitches': stitch_plan.num_stitches, - 'estimated_time': '', # TODO 'estimated_thread': '', # TODO }, svg_overview=overview_svg, diff --git a/print/templates/operator_detailedview.html b/print/templates/operator_detailedview.html index 608b3661..c74a7a72 100644 --- a/print/templates/operator_detailedview.html +++ b/print/templates/operator_detailedview.html @@ -18,7 +18,7 @@ ##

- {{ svg_overview|safe }} + {{ svg_overview|replace("

  • ", "")|replace("
    • ", "")|safe }}

    {{ _('Unique Colors') }}: {{ job.num_colors }} @@ -51,7 +51,7 @@

    - {{ color_block.svg_preview|safe }} + {{ color_block.svg_preview|replace("

  • ", "")|replace("
    • ", "")|safe }}

    {{ color_block.color.name }} diff --git a/print/templates/operator_overview.html b/print/templates/operator_overview.html index 359d4f50..8f70b4f0 100644 --- a/print/templates/operator_overview.html +++ b/print/templates/operator_overview.html @@ -26,7 +26,7 @@

    - {{ svg_overview|safe }} + {{ svg_overview|replace("
  • ", "")|replace("
    • ", "")|safe }} {% include 'ui_svg_action_buttons.html' %}
    diff --git a/print/templates/print_detail.html b/print/templates/print_detail.html index 0c6bbefe..0dca4978 100644 --- a/print/templates/print_detail.html +++ b/print/templates/print_detail.html @@ -16,7 +16,7 @@
    - {{color_block.svg_preview|safe}} + {{color_block.svg_preview|replace("
  • ", "")|replace("
    • ", "")|safe}} {% include 'ui_svg_action_buttons.html' %}
    diff --git a/print/templates/print_overview.html b/print/templates/print_overview.html index a2548070..d5111562 100644 --- a/print/templates/print_overview.html +++ b/print/templates/print_overview.html @@ -26,7 +26,7 @@
    - {{ svg_overview|safe }} + {{ svg_overview|replace("
  • ", "")|replace("
    • ", "")|safe }} {% include 'ui_svg_action_buttons.html' %}
    diff --git a/print/templates/ui.html b/print/templates/ui.html index 2db3a81d..71908b52 100644 --- a/print/templates/ui.html +++ b/print/templates/ui.html @@ -112,12 +112,12 @@
    {{ _('Display Time On') }} -

    +

    -

    +
    -- cgit v1.3.1 From 52bf2c80b66889d471745260bf1679289d1c59e3 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Sat, 9 Feb 2019 20:37:14 -0500 Subject: fix style --- lib/extensions/convert_to_satin.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'lib/extensions') diff --git a/lib/extensions/convert_to_satin.py b/lib/extensions/convert_to_satin.py index ef4ac557..2b586e36 100644 --- a/lib/extensions/convert_to_satin.py +++ b/lib/extensions/convert_to_satin.py @@ -1,17 +1,18 @@ -import inkex -from shapely import geometry as shgeo +from copy import deepcopy from itertools import chain, groupby -import numpy -from numpy import diff, sign, setdiff1d import math -from copy import deepcopy -from .base import InkstitchExtension -from ..svg.tags import SVG_PATH_TAG -from ..svg import get_correction_transform, PIXELS_PER_MM +import inkex +from numpy import diff, sign, setdiff1d +import numpy +from shapely import geometry as shgeo + from ..elements import Stroke -from ..utils import Point from ..i18n import _ +from ..svg import get_correction_transform, PIXELS_PER_MM +from ..svg.tags import SVG_PATH_TAG +from ..utils import Point +from .base import InkstitchExtension class SelfIntersectionError(Exception): @@ -112,10 +113,10 @@ class ConvertToSatin(InkstitchExtension): if not isinstance(left_rail, shgeo.LineString) or \ not isinstance(right_rail, shgeo.LineString): - # If the parallel offsets come out as anything but a LineString, that means the - # path intersects itself, when taking its stroke width into consideration. See - # the last example for parallel_offset() in the Shapely documentation: - # https://shapely.readthedocs.io/en/latest/manual.html#object.parallel_offset + # If the parallel offsets come out as anything but a LineString, that means the + # path intersects itself, when taking its stroke width into consideration. See + # the last example for parallel_offset() in the Shapely documentation: + # https://shapely.readthedocs.io/en/latest/manual.html#object.parallel_offset raise SelfIntersectionError() # for whatever reason, shapely returns a right-side offset's coordinates in reverse -- cgit v1.3.1