summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/elements/satin_column.py15
-rw-r--r--templates/select_elements.xml2
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/elements/satin_column.py b/lib/elements/satin_column.py
index 54ae02d5..bf81fd0d 100644
--- a/lib/elements/satin_column.py
+++ b/lib/elements/satin_column.py
@@ -680,13 +680,14 @@ class SatinColumn(EmbroideryElement):
yield TwoRungsWarning(self.flattened_rails[0].interpolate(0.5, normalized=True))
if len(self.csp) == 2 and len(self.rails[0]) != len(self.rails[1]):
yield UnequalPointsWarning(self.flattened_rails[0].interpolate(0.5, normalized=True))
- for rung in self.flattened_rungs:
- for rail in self.flattened_rails:
- intersection = rung.intersection(rail)
- if intersection.is_empty:
- yield DanglingRungWarning(rung.interpolate(0.5, normalized=True))
- elif not isinstance(intersection, shgeo.Point):
- yield TooManyIntersectionsWarning(rung.interpolate(0.5, normalized=True))
+ if len(self.csp) > 2:
+ for rung in self.flattened_rungs:
+ for rail in self.flattened_rails:
+ intersection = rung.intersection(rail)
+ if intersection.is_empty:
+ yield DanglingRungWarning(rung.interpolate(0.5, normalized=True))
+ elif not isinstance(intersection, shgeo.Point):
+ yield TooManyIntersectionsWarning(rung.interpolate(0.5, normalized=True))
def validation_errors(self):
# The node should have exactly two paths with the same number of points - or it should
diff --git a/templates/select_elements.xml b/templates/select_elements.xml
index 6ff4ef1e..15e15f69 100644
--- a/templates/select_elements.xml
+++ b/templates/select_elements.xml
@@ -42,7 +42,7 @@
<param indent="1" name="rung-count" type="optiongroup" appearance="combo" gui-text="Rung count"
gui-description="Only select satins with this rung count">
<option value="all">No restriction</option>
- <option value="zero">No Rungs</optiagon>
+ <option value="zero">No Rungs</option>
<option value="two">Two Rungs</option>
</param>
</vbox>