Makelangelo 5 frame is now drawing again

Author: i-make-robots

WeavingRadonJava/app.layout

@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<app-layout>
+<layout main-frame="true" location="487,73" size="1208,922" state="0">
+<westToolbar>
+</westToolbar>
+<eastToolbar>
+</eastToolbar>
+<southToolbar>
+</southToolbar>
+<split orientation="1" divider-proportion="0.7118786573410034">
+<left>
+<tabbed>
+<selectedTab persistentID="8e50154c-a149-4e95-9db5-4611d24cc0cc">
+</selectedTab>
+<tab persistentID="8e50154c-a149-4e95-9db5-4611d24cc0cc">
+<properties></properties>
+</tab>
+<tab persistentID="e675ab55-fea9-49a5-a04d-51daa9cd31e6">
+<properties></properties>
+</tab>
+</tabbed>
+</left>
+<right>
+<tabbed>
+<selectedTab persistentID="f2308391-8388-4f90-89f0-61caca03eb18">
+</selectedTab>
+<tab persistentID="f2308391-8388-4f90-89f0-61caca03eb18">
+<properties></properties>
+</tab>
+<tab persistentID="eb1ea92b-fc66-4c54-a5a9-3e4f8203bd5d">
+<properties></properties>
+</tab>
+</tabbed>
+</right>
+</split>
+</layout>
+<undocked>
+</undocked>
+</app-layout>

WeavingRadonJava/pom.xml

@@ -93,6 +93,12 @@
             <artifactId>vecmath</artifactId>
             <version>1.5.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

WeavingRadonJava/src/main/java/com/marginallyclever/weavingradon/WeavingApp.java

@@ -10,43 +10,43 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import ModernDocking.app.AppState;
 import ModernDocking.app.Docking;
 import ModernDocking.app.RootDockingPanel;
+import ModernDocking.exception.DockingLayoutException;
 import ModernDocking.ext.ui.DockingUI;
 import com.formdev.flatlaf.FlatLaf;
 import com.formdev.flatlaf.FlatLightLaf;
-import com.marginallyclever.weavingradon.core.MulticolorThreader;
-import com.marginallyclever.weavingradon.core.Loom;
-import com.marginallyclever.weavingradon.core.RenderHintHelper;
-import com.marginallyclever.weavingradon.core.MonochromaticThreader;
+import com.marginallyclever.weavingradon.core.*;
 import com.marginallyclever.weavingradon.ui.*;
 
 public class WeavingApp {
     public static final int DIAMETER = 800;
+    public static final int NUM_NAILS = 188;
     public static final int TITLEBAR_HEIGHT = 30;
     public static final int DOCKING_TAB_HEIGHT = 30;
-    public static final int ALPHA = 127;
+    public static final int ALPHA = 64;
     public static final int TOOLBAR_HEIGHT = 30;
 
     private final JFrame frame;
     private final ArrayList<DockingPanel> windows = new ArrayList<>();
     private final JFileChooser fileChooser;
 
-    private final Loom loom = new Loom(DIAMETER/2, 100);
+    private final Loom loom = new Loom(DIAMETER/2, NUM_NAILS);
     private final LoomPanel loomPanel;
     private final RadonPanel radonPanel;
 
-    //public final RadonThreader myThreader = new SingleThreader(Color.WHITE);
-    public final MulticolorThreader myThreader = new MulticolorThreader();
-    public final MonochromaticThreader radonThreaderC = new MonochromaticThreader(new Color(  0,255,255, ALPHA));
-    public final MonochromaticThreader radonThreaderM = new MonochromaticThreader(new Color(255,  0,255, ALPHA));
-    public final MonochromaticThreader radonThreaderY = new MonochromaticThreader(new Color(255,255,  0, ALPHA));
-    public final MonochromaticThreader radonThreaderK = new MonochromaticThreader(new Color(  0,  0,  0, ALPHA));
-    public final MonochromaticThreader radonThreaderW = new MonochromaticThreader(new Color(255,255,255, ALPHA));
+    private final RadonThreader myThreader;
+    /*
+    private final MonochromaticThreader radonThreaderC = new MonochromaticThreader(new Color(  0,255,255, ALPHA));
+    private final MonochromaticThreader radonThreaderM = new MonochromaticThreader(new Color(255,  0,255, ALPHA));
+    private final MonochromaticThreader radonThreaderY = new MonochromaticThreader(new Color(255,255,  0, ALPHA));
+    private final MonochromaticThreader radonThreaderK = new MonochromaticThreader(new Color(  0,  0,  0, ALPHA));
+    private final MonochromaticThreader radonThreaderW = new MonochromaticThreader(new Color(255,255,255, ALPHA));*/
 
     private final OneLineOnImage singleLine;
     private final RadonPanel singleRadon;
-    public final MonochromaticThreader radonThreaderB = new MonochromaticThreader(new Color(255,255,255));
+    private final MonochromaticThreader radonThreaderB = new MonochromaticThreader(new Color(255,255,255));
 
     public static void main(String[] args) {
         SwingUtilities.invokeLater(WeavingApp::new);
@@ -61,6 +61,23 @@ public WeavingApp() {
         //frame.setLocationByPlatform(true);
         frame.setLocationRelativeTo(null);
 
+        myThreader = new MonochromaticThreader(new Color(255,255,255, ALPHA));
+/*
+        MulticolorThreader mct = new MulticolorThreader();
+        mct.addColor(new Color(  0,255,255, ALPHA));
+        mct.addColor(new Color(255,  0,255, ALPHA));
+        mct.addColor(new Color(255,255,  0, ALPHA));
+        mct.addColor(new Color(  0,  0,  0, ALPHA));
+        mct.addColor(new Color(255,255,255, ALPHA));
+        myThreader = mct;
+*/
+/*
+        mct.addThreader(radonThreaderC);
+        mct.addThreader(radonThreaderM);
+        mct.addThreader(radonThreaderY);
+        mct.addThreader(radonThreaderK);
+        mct.addThreader(radonThreaderW);
+*/
         // create panels
         loomPanel = new LoomPanel();
         radonPanel = new RadonPanel(loomPanel);
@@ -70,16 +87,11 @@ public WeavingApp() {
         singleRadon = new RadonPanel(singleLine);
         singleLine.setRadon(radonThreaderB,singleRadon);
 
-        myThreader.addThreader(radonThreaderC);
-        myThreader.addThreader(radonThreaderM);
-        myThreader.addThreader(radonThreaderY);
-        myThreader.addThreader(radonThreaderK);
-        myThreader.addThreader(radonThreaderW);
-
         // setup the docking system and dock the panels.
         initDocking();
         createDefaultLayout();
         resetDefaultLayout();
+        saveAndRestoreLayout();
         frame.setJMenuBar(new MainMenu(this));
 
         // create a file chooser for images
@@ -152,6 +164,19 @@ private void resetDefaultLayout() {
         //Docking.dock(windows.get(1), windows.get(3), DockingRegion.CENTER);
     }
 
+    private void saveAndRestoreLayout() {
+        // now that the main frame is set up with the defaults, we can restore the layout
+        AppState.setPersistFile(new File("app.layout"));
+        AppState.setAutoPersist(true);
+
+        try {
+            AppState.restore();
+        } catch (DockingLayoutException e) {
+            // something happened trying to load the layout file, record it here
+            e.printStackTrace();
+        }
+    }
+
     public void openFile(ActionEvent actionEvent) {
         // show the file chooser dialog
         if(fileChooser.showOpenDialog(frame)== JFileChooser. APPROVE_OPTION) {
@@ -163,7 +188,7 @@ public void openFile(ActionEvent actionEvent) {
                 loom.reset();
                 // build a radon transform for every thread, based on the color filter for that threader.
                 myThreader.setLoomAndImage(loom,square);
-                myThreader.maskCurrentRadonByAllThreads();
+                myThreader.maskRadonTransformByAllThreads();
 
                 loomPanel.setLoomAndImage(loom,square);
                 radonPanel.setRadonTransform(myThreader.getRadonTransform());

WeavingRadonJava/src/main/java/com/marginallyclever/weavingradon/core/Loom.java

@@ -20,7 +20,7 @@ public class Loom {
 
     public final List<Vector2d> nails = new ArrayList<>();
     public final List<LoomThread> selectedThreads = new ArrayList<>();
-    public final List<LoomThread> potentialThreads = new ArrayList<>();
+    public final List<LoomThread> allThreads = new ArrayList<>();
 
     public Loom(int radius,int numNails) {
         this.radius = radius;
@@ -55,8 +55,8 @@ private void createNails() {
         for(int i = 0; i< numNails; ++i) {
             double angle = i * Math.PI * 2 / numNails;
             nails.add(new Vector2d(
-                    radius + Math.sin(angle) * radius,
-                    radius + Math.cos(angle) * radius
+                    Math.sin(angle) * radius,
+                    Math.cos(angle) * radius
             ));
         }
     }
@@ -67,66 +67,76 @@ private void createNails() {
     private void createThreads() {
         System.out.println("createThreads");
         selectedThreads.clear();
-        potentialThreads.clear();
+        allThreads.clear();
 
-        double maxR = 0;
         for (int i = 0; i < numNails; i++) {
             Vector2d start = nails.get(i);
-            double sx = start.x - radius;
-            double sy = start.y - radius;
+            double sx = start.x;
+            double sy = start.y;
 
             for (int j = i + 1; j < numNails; j++) {
                 Vector2d end = nails.get(j);
-                double dx = end.x - start.x;
-                double dy = end.y - start.y;
-                double len = Math.sqrt(dx * dx + dy * dy);
+                double dx = end.x - sx;
+                double dy = end.y - sy;
 
-                int theta = (int)Math.toDegrees(Math.atan2(-dx, dy));
+                double theta = Math.toDegrees(Math.atan2(-dx, dy));
 
                 // Ensure theta is within [0-180)
                 if(theta < 0) theta += 180;
                 if(theta >= 180) theta -= 180;
 
                 double angle = Math.toRadians(theta);
                 int r = (int)(sx * Math.cos(angle)
-                        + sy * Math.sin(angle));
+                            + sy * Math.sin(angle));
 
                 //System.out.println("theta="+theta+" r="+r);
-                maxR = Math.max(maxR, Math.abs(r));
-                LoomThread thread = new LoomThread(start, end, new ThetaR(theta, r,0), new Color(255, 255, 255, WeavingApp.ALPHA),len);
-                potentialThreads.add(thread);
+                LoomThread thread = new LoomThread(start, end, theta, r, new Color(255,255,255, WeavingApp.ALPHA));
+                allThreads.add(thread);
             }
         }
     }
 
-    public void addNextBestThread(LoomThread bestThread) {
+    public void selectThread(LoomThread bestThread) {
         if (bestThread == null) return;
-        potentialThreads.remove(bestThread);
+        //potentialThreads.remove(bestThread);
         selectedThreads.add(bestThread);
     }
 
     public LoomThread findThreadClosestToThetaR(ThetaR target) {
         LoomThread nearestThread = null;
         double minDistance = Double.MAX_VALUE;
 
-        for (LoomThread thread : potentialThreads) {
-            double x = thread.thetaR.theta - target.theta;
-            double y = thread.thetaR.r - target.r;
-            double distanceSquared = ( x*x + y*y );
+        for (LoomThread thread : allThreads) {
+            double dTheta = thread.thetaR.theta - target.theta;
+            double dr = thread.thetaR.r - target.r;
+            double distanceSquared = Math.sqrt( dTheta*dTheta + dr*dr );
             if (distanceSquared < minDistance) {
                 minDistance = distanceSquared;
                 nearestThread = thread;
             }
         }
 
-        //if(minDistance>2) return null;
-        //System.out.println("matches "+ nearestThread );
+        if(minDistance>2) {
+            System.out.println("near hit "+target + " vs "+ nearestThread );/*
+            double previous = minDistance;
+
+            for (LoomThread thread : selectedThreads) {
+                double dTheta = thread.thetaR.theta - target.theta;
+                double dr = thread.thetaR.r - target.r;
+                double distanceSquared = Math.sqrt( dTheta*dTheta + dr*dr );
+                if (distanceSquared < minDistance) {
+                    minDistance = distanceSquared;
+                    nearestThread = thread;
+                }
+            }
+            System.out.println("difference "+ nearestThread + " "+previous+"->"+minDistance);*/
+        }
         //System.out.println(threads.size() +"/"+remainingThreads.size());
         return nearestThread;
     }
 
     public boolean shouldStop() {
-        return potentialThreads.size() <= numNails*0.2;
+        return allThreads.size() <= numNails*0.2;
     }
 
     public int getNumNails() {

WeavingRadonJava/src/main/java/com/marginallyclever/weavingradon/core/LoomThread.java

@@ -2,7 +2,6 @@
 
 import javax.vecmath.Vector2d;
 import java.awt.*;
-import java.awt.image.BufferedImage;
 
 /**
  * Thread on a Loom.
@@ -11,29 +10,23 @@ public class LoomThread {
     public final Vector2d start;  // xy
     public final Vector2d end;  // xy
     public final ThetaR thetaR;
-    public final double length;
     public Color col;  // rgba
 
-    public LoomThread(Vector2d start, Vector2d end, ThetaR thetaR, Color col, double length) {
+    public LoomThread(Vector2d start, Vector2d end, double theta, int r, Color col) {
         this.start = start;
         this.end = end;
-        this.thetaR = thetaR;
+        this.thetaR = new ThetaR(theta, r,0);
         this.col = col;
-        this.length = length;
     }
 
     public LoomThread(LoomThread b) {
         this.start = new Vector2d(b.start);
         this.end = new Vector2d(b.end);
         this.thetaR = new ThetaR(b.thetaR);
         this.col = new Color(b.col.getRGB());
-        this.length = b.length;
     }
 
-    public void display(BufferedImage image) {
-        Graphics2D g2 = image.createGraphics();
-        RenderHintHelper.setRenderHints(g2);
-
+    public void display(Graphics g2) {
         g2.setColor(col);
         g2.drawLine((int)start.x, (int)start.y, (int)end.x, (int)end.y);
         g2.dispose();