Fix: 'Should Lift Pen' not being respected / preventing drawings from completing #146

- Note: Should lift pen, only shows the 'moves' the path finding module had to take, there is still work to be done to create a continuous line PFM

Author: SonarSonic

src/main/java/drawingbot/pfm/AbstractSketchPFM.java

@@ -37,6 +37,7 @@ public abstract class AbstractSketchPFM extends AbstractDarkestPFM {
     public double lineProgress = 0;
     public double lumProgress = 0;
     public double actualProgress = 0;
+    public int squiggleCount = 0;
 
     // ERASING \\
     public float radiusMin = 1F, radiusMax = 4F;
@@ -113,15 +114,15 @@ public void run() {
             findDarkestPixelMethod.accept(tools.getPixelData(), context.current);
 
             // Create a linking geometry, to draw this forced pen move
-            if(!shouldLiftPen && context.hasResult()){
+            if(!shouldLiftPen && squiggleCount > 0 && context.last[0] != context.current[0] && context.last[1] != context.current[1]){
                 addLinkingGeometry(tools.getPixelData(), context.last, context.current);
             }
 
             beginSquiggle();
 
             // Keep track of the squiggle's deviation
             float initialDarkness = tools.getPixelData().getLuminance(context.getX(), context.getY());
-            float allowableDarkness = !shouldLiftPen ? Float.MAX_VALUE : initialDarkness + Math.max(1, 255 * squiggleMaxDeviation);
+            float allowableDarkness = !shouldLiftPen ? desiredLuminance : initialDarkness + Math.max(1, desiredLuminance * squiggleMaxDeviation);
             boolean failed = false;
 
             // Run the loop until it is stopped in the case of should lift pen, or run it until the maximum squiggle length if we should lift the pen
@@ -149,6 +150,11 @@ public void run() {
 
                 }
 
+                if(!shouldLiftPen && context.getAvgLuminance() > allowableDarkness){
+                    failed = true;
+                    break;
+                }
+
                 // The generated geometry has passed all our tests, add it too the drawing & update the context
                 addPathFindingResult(context, tools.getPixelData());
                 context.last = context.getPosition();
@@ -188,7 +194,7 @@ public void beginSquiggle(){
     }
 
     public void endSquiggle(){
-
+        squiggleCount++;
     }
 
     protected boolean updateProgress(PlottingTools tools){