Merge branch 'master' into dev

Author: i-make-robots

Changelog.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
 ### Fixed
 - First travel move was appearing in white instead of the travel color.
 
@@ -16,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Drag + drop a file now adds that file to the "Recent Files" list.
 
 ### Fixed
+
+- Infill of closed loops should now be properly filled.  Was occasionally failing the in/out test and creating a mess.
 - MickeyMoe1992 now properly obeys the margin limits, same as the other converters.
 - Render hints are now forced to enable antialiasing, etc.
 

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.marginallyclever</groupId>
 	<artifactId>Makelangelo</artifactId>
-	<version>7.78.4</version>
+	<version>7.78.5</version>
 	<name>Makelangelo</name>
 	<description>Makelangelo Software is a Java program that prepares art for CNC plotters.  It is especially designed for the Makelangelo Robot.
 It pairs really well with Marlin-polargraph, the code in the brain of the robot that receives instructions and moves the motors.</description>

src/main/java/com/marginallyclever/convenience/ColorHSB.java

@@ -3,7 +3,7 @@
 import java.awt.*;
 
 /**
- * HSB color class.  Each component is 0...1
+ * {@link ColorHSB} stores a color by its Hue, Saturation, and Brightness.  Each component is 0...1
  *
  * @author Dan Royer
  * @since 2022-08-31

src/main/java/com/marginallyclever/convenience/ColorPalette.java

@@ -42,12 +42,7 @@ public void addColor(Color c) {
      */
     @Deprecated(forRemoval = true)
     public void removeColor(Color c) {
-        for (final Iterator<Color> colorsIterator = colors.iterator(); colorsIterator.hasNext(); ) {
-            final Color nextColor = colorsIterator.next();
-            if (nextColor.equals(c)) {
-                colorsIterator.remove();
-            }
-        }
+        colors.removeIf(nextColor -> nextColor.equals(c));
     }
 
 

src/main/java/com/marginallyclever/convenience/ColorRGB.java

@@ -10,7 +10,6 @@
  *
  * @author Dan Royer
  */
-@Deprecated
 public class ColorRGB {
     public int red;
     public int green;

src/main/java/com/marginallyclever/makelangelo/MainFrame.java

@@ -9,7 +9,6 @@
 import com.marginallyclever.convenience.FileAccess;
 import com.marginallyclever.donatello.Donatello;
 import com.marginallyclever.donatello.nodefactorypanel.NodeFactoryPanel;
-import com.marginallyclever.makelangelo.actions.ZoomToFitMachineAction;
 import com.marginallyclever.makelangelo.applicationsettings.MetricsPreferences;
 import com.marginallyclever.makelangelo.donatelloimpl.DockableEditNodePanel;
 import com.marginallyclever.makelangelo.donatelloimpl.DonatelloDropTarget;
@@ -367,4 +366,8 @@ public PlotterSettingsManager getPlotterSettingsManager() {
     public void onPlotterSettingsUpdate(PlotterSettings lastSelectedProfile) {
         previewPanel.onPlotterSettingsUpdate(lastSelectedProfile);
     }
+
+    public RecentFiles getRecentFiles() {
+        return mainMenuBar.getRecentFiles();
+    }
 }

src/main/java/com/marginallyclever/makelangelo/makeart/imagefilter/FilterScale.java

@@ -31,9 +31,9 @@ public TransformedImage filter() {
         for (int y = 0; y < h; ++y) {
             for (int x = 0; x < w; ++x) {
                 ColorRGB diff = new ColorRGB(aa.getRGB(x, y));
-                diff.red   = (int)Math.max(0,Math.min(255,diff.red * scale));
-                diff.green = (int)Math.max(0,Math.min(255,diff.green * scale));
-                diff.blue  = (int)Math.max(0,Math.min(255,diff.blue * scale));
+                diff.red   = (int) Math.clamp(diff.red * scale, 0, 255);
+                diff.green = (int) Math.clamp(diff.green * scale, 0, 255);
+                diff.blue  = (int) Math.clamp(diff.blue * scale, 0, 255);
                 rr.setRGB(x, y, diff.toInt());
             }
         }

src/main/java/com/marginallyclever/makelangelo/makeart/io/LoadSVG.java

@@ -195,11 +195,7 @@ private void parsePolylineElement(Element pathNodes) {
 		}
 
 		myTurtle.add(t);
-		if(isFilled(element)) {
-			var filler = new InfillTurtle();
-			filler.setPenDiameter(myTurtle.getDiameter());
-			myTurtle.add(filler.run(t));
-		}
+		if(isFilled(element)) fillTurtle(t);
 	}
 
 	/**
@@ -402,11 +398,13 @@ private void parseRectElement(Element element) {
 		arcTurtle(t, x1,y2, rx,ry, Math.PI * -1.5,Math.PI * -1.0,m);
 		arcTurtle(t, x1,y1, rx,ry, Math.PI * -1.0,Math.PI * -0.5,m);
 		myTurtle.add(t);
-		if(isFilled(element)) {
-			var filler = new InfillTurtle();
-			filler.setPenDiameter(myTurtle.getDiameter());
-			myTurtle.add(filler.run(t));
-		}
+		if(isFilled(element)) fillTurtle(t);
+	}
+
+	private void fillTurtle(Turtle t) {
+		var filler = new InfillTurtle();
+		filler.setPenDiameter(myTurtle.getDiameter());
+		myTurtle.add(filler.run(t));
 	}
 
 	/**
@@ -457,11 +455,7 @@ private void parseCircleElement(Element element) {
 		//logger.debug("circ={}", circ);
 		printEllipse(t, m, cx, cy, r, r, circ);
 		myTurtle.add(t);
-		if(isFilled(element)) {
-			var filler = new InfillTurtle();
-			filler.setPenDiameter(myTurtle.getDiameter());
-			myTurtle.add(filler.run(t));
-		}
+		if(isFilled(element)) fillTurtle(t);
 	}
 
 	private void parseEllipseElement(Element element) {
@@ -482,11 +476,7 @@ private void parseEllipseElement(Element element) {
 		steps = Math.min(60,steps);
 		printEllipse(t, m, cx, cy, rx, ry, steps);
 		myTurtle.add(t);
-		if(isFilled(element)) {
-			var filler = new InfillTurtle();
-			filler.setPenDiameter(myTurtle.getDiameter());
-			myTurtle.add(filler.run(t));
-		}
+		if(isFilled(element)) fillTurtle(t);
 	}
 
 	private void printEllipse(Turtle t, Matrix3d m, double cx, double cy, double rx, double ry, double steps) {
@@ -533,11 +523,7 @@ private void parsePathElement(Element paths) throws Exception {
 			}
 		}
 		myTurtle.add(t);
-		if(isFilled(element)) {
-			var filler = new InfillTurtle();
-			filler.setPenDiameter(myTurtle.getDiameter());
-			myTurtle.add(filler.run(t));
-		}
+		if(isFilled(element)) fillTurtle(t);
 	}
 
 	private void doCubicCurveAbs(SVGPathSeg item, Matrix3d m,Turtle t) {

src/main/java/com/marginallyclever/makelangelo/makeart/turtletool/InfillTurtle.java

@@ -1,15 +1,15 @@
 package com.marginallyclever.makelangelo.makeart.turtletool;
 
-import com.marginallyclever.convenience.linecollection.LineCollection;
 import com.marginallyclever.convenience.LineSegment2D;
+import com.marginallyclever.convenience.linecollection.LineCollection;
 import com.marginallyclever.makelangelo.turtle.Turtle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import javax.vecmath.Vector2d;
 import javax.vecmath.Point2d;
-import java.awt.*;
+import javax.vecmath.Vector2d;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -19,6 +19,8 @@
  * @since 7.31.0
  */
 public class InfillTurtle {
+	private static final Logger logger = LoggerFactory.getLogger(InfillTurtle.class);
+
 	public static final double MINIMUM_PEN_DIAMETER = 0.1;
 
 	private double penDiameter = 0.8;
@@ -38,10 +40,11 @@ public Turtle run(Turtle input) {
 		List<Turtle> list = input.splitByToolChange();
 		for(Turtle t : list) {
 			LineCollection segments = infillFromTurtle(t);
-			result.setStroke(t.getColor(), t.getDiameter());
+			//result.setStroke(t.getColor(), t.getDiameter());
 			result.addLineSegments(segments);
 		}
 
+
 		return result;
 	}
 
@@ -68,16 +71,19 @@ private LineCollection infillFromTurtle(Turtle input) {
 		Vector2d minorDir = new Vector2d(Math.cos(Math.toRadians(angle+90)), Math.sin(Math.toRadians(angle+90)));
 		Vector2d minorStart = new Vector2d(bounds.getCenterX(),bounds.getCenterY());
 		minorStart.scaleAdd(-size,minorDir,minorStart);
+		Vector2d minorTemp = new Vector2d();
 		Vector2d majorStart = new Vector2d();
 		Vector2d majorEnd = new Vector2d();
 
-		for(double i=0;i<size*2;i+=penDiameter) {
-			majorStart.scaleAdd(-size,majorDir,minorStart);
-			majorEnd.scaleAdd(size,majorDir,minorStart);
+		var end = size*2;
+
+		for(double i=0;i<end;i+=penDiameter) {
+			minorTemp.scaleAdd(i,minorDir,minorStart);
+			majorStart.scaleAdd(-size,majorDir,minorTemp);
+			majorEnd.scaleAdd(size,majorDir,minorTemp);
 			line.start.set(majorStart.x,majorStart.y);
 			line.end.set(majorEnd.x,majorEnd.y);
 			results.addAll(trimLineToPath(line, convertedPath));
-			minorStart.scaleAdd(penDiameter,minorDir,minorStart);
 		}
 
 		return results;
@@ -87,7 +93,7 @@ private LineCollection infillFromTurtle(Turtle input) {
 	 * Add padding to a {@link Rectangle2D.Double} bounding rectangle.
 	 * 
 	 * @param before the original rectangle
-	 * @param percent the added percentage.
+	 * @param percent the added percentage. 0...100
 	 * @return the larger bounds
 	 */
 	private Rectangle2D.Double addPaddingToBounds(Rectangle2D.Double before, double percent) {
@@ -113,72 +119,59 @@ private Rectangle2D.Double addPaddingToBounds(Rectangle2D.Double before, double
 	 * example). Then, taken in pairs, they give you the end points of the segments
 	 * of the line that lie inside the polygon.
 	 * </p>
+	 * <p>Collect intersections and compute their parametric 't' along the infill line.
+	 * Sorting by projection (t) is more robust than sorting by x or y, and we
+	 * remove nearly-duplicate intersections caused by shared segment endpoints
+	 * or floating point noise.</p>
 	 * 
 	 * @param line  A {@link LineSegment2D} to clip
 	 * @param convertedPath The boundary line, which must be a closed loop
 	 * @return a list of remaining {@link LineSegment2D}.
 	 */
 	private LineCollection trimLineToPath(LineSegment2D line, LineCollection convertedPath) {
-		List<Point2d> intersections = new ArrayList<>();
+		record Hit(Point2d p,double t) {}
+		List<Hit> hits = new ArrayList<>();
+		Vector2d s1 = new Vector2d(line.end);
+		s1.sub(line.start);
+		double s1_len2 = s1.lengthSquared();
 
 		for (LineSegment2D s : convertedPath) {
 			Point2d p = getIntersection(line, s);
-			if (p != null) intersections.add(p);
+			if (p != null) {
+				double t = 0.0;
+				if (s1_len2 > 0) {
+					t = ((p.x - line.start.x) * s1.x + (p.y - line.start.y) * s1.y) / s1_len2;
+				}
+				hits.add(new Hit(p, t));
+			}
 		}
 
 		LineCollection results = new LineCollection();
-		int size = intersections.size();
-		if(size%2==0) {
-			if (size == 2) {
-				results.add(new LineSegment2D(intersections.get(0), intersections.get(1), line.color));
-			} else if (size > 2) {
-				results.addAll(sortIntersectionsIntoSegments(intersections, line.color));
+		if (hits.isEmpty()) return results;
+
+		// sort by t and deduplicate near-equal t values
+		hits.sort((a,b) -> Double.compare(a.t,b.t));
+		List<Hit> unique = new ArrayList<>();
+		double EPS = 1e-8;
+		for (Hit h : hits) {
+			if (unique.isEmpty() || Math.abs(h.t - unique.getLast().t) > EPS) {
+				unique.add(h);
 			}
 		}
 
-		return results;
-	}
-
-	/**
-	 * @param intersections A list of intersections. guaranteed to be 2 or more even
-	 *                      number of intersections.
-	 * @param color         Color to assign to line
-	 * @return return Intersections sorted by ascending x value. If x values match,
-	 *         sort by ascending y value.
-	 */
-	private LineCollection sortIntersectionsIntoSegments(List<Point2d> intersections, Color color) {
-		Point2d first = intersections.get(0);
-		Point2d second = intersections.get(1);
-		if (Double.compare(first.x, second.x) == 0) {
-			intersections.sort(new ComparePointsByY());
+		int size = unique.size();
+		if (size % 2 == 0) {
+			for (int i = 0; i < size - 1; i += 2) {
+				results.add(new LineSegment2D(unique.get(i).p, unique.get(i+1).p, line.color));
+			}
 		} else {
-			intersections.sort(new ComparePointsByX());
-		}
-
-		LineCollection results = new LineCollection();
-		int i = 0;
-		while (i < intersections.size()-1) {
-			results.add(new LineSegment2D(intersections.get(i), intersections.get(i + 1), color));
-			i += 2;
+			// odd number of intersections — something unexpected; log for debugging
+			logger.error("infill: odd intersection count=" + size);
 		}
 
 		return results;
 	}
 
-	static class ComparePointsByY implements Comparator<Point2d> {
-		@Override
-		public int compare(Point2d o1, Point2d o2) {
-			return Double.compare(o1.y, o2.y);
-		}
-	}
-
-	static class ComparePointsByX implements Comparator<Point2d> {
-		@Override
-		public int compare(Point2d o1, Point2d o2) {
-			return Double.compare(o1.x, o2.x);
-		}
-	}
-
 	/**
 	 * It is based on an algorithm in Andre LaMothe's "Tricks of the Windows Game Programming Gurus". See
 	 * <a href="https://stackoverflow.com/questions/563198/how-do-you-detect-where-two-line-segments-intersect">Stackoverflow</a>
@@ -194,6 +187,9 @@ private Point2d getIntersection(LineSegment2D alpha, LineSegment2D beta) {
 		double s2_y = beta.end.y - beta.start.y;
 
 		double denominator = (-s2_x * s1_y + s1_x * s2_y);
+		// avoid division by (near) zero -> parallel or nearly-parallel segments
+		if (Math.abs(denominator) < 1e-12) return null;
+
 		double s = (-s1_y * (alpha.start.x - beta.start.x) + s1_x * (alpha.start.y - beta.start.y)) / denominator;
 		double t = ( s2_x * (alpha.start.y - beta.start.y) - s2_y * (alpha.start.x - beta.start.x)) / denominator;