Merge pull request #23 from EmbroidePy/0.1.16

Jef Stop Extended

Author: tatarize

core/src/main/java/org/embroideryio/embroideryio/JefReader.java

@@ -6,6 +6,7 @@
 public class JefReader extends EmbReader {
 
     public void read_jef_stitches() throws IOException {
+        int color_index = 1;
         byte[] b = new byte[2];
         while (true) {
             if (readFully(b) != b.length) break;
@@ -29,7 +30,15 @@ public void read_jef_stitches() throws IOException {
                     }
                     continue;
                 case 0x01:
-                    pattern.color_change();
+                    
+                    if (pattern.threadlist.get(color_index) == null) {
+                        pattern.stop();
+                        pattern.threadlist.remove(color_index);
+                    }
+                    else {
+                        pattern.color_change();
+                        color_index += 1;
+                    }
                     continue;
                 case 0x10:
                     break;
@@ -48,7 +57,13 @@ public void read() throws IOException {
         skip(88);
         for (int i = 0; i < count_colors; i++) {
             int index = Math.abs(readInt32LE());
-            pattern.add(jefThread[index % jefThread.length]);
+            if (index == 0) {
+                // If we have color 0. Go ahead and set that to None.
+                pattern.threadlist.add(null);
+            }
+            else {
+                pattern.add(jefThread[index % jefThread.length]);
+            }
         }
         seek(stitch_offset);
         read_jef_stitches();

core/src/main/java/org/embroideryio/embroideryio/JefWriter.java

@@ -4,6 +4,9 @@
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 
 public class JefWriter extends EmbWriter {
@@ -25,24 +28,67 @@ public JefWriter() {
     @Override
     public void write() throws IOException {
         boolean trims = getBoolean("trims", true);
-        
+
         Date date = new Date();
         String date_string = new SimpleDateFormat("yyyyMMddHHmmss").format(date);
         date_string = (String) get("date", date_string);
-        
+
         Points stitches = pattern.getStitches();
 
         pattern.fixColorCount();
-        int color_count = pattern.getThreadlist().size();
-
+        
+        EmbThreadJef[] jef_threads = EmbThreadJef.getThreadSet();
+        int last_index = -1;
+        EmbThread last_thread = null;
+        ArrayList<Integer> palette = new ArrayList<>();
+        
+        boolean color_toggled = false;
+        int color_count = 0;  // Color and Stop count.
+        int index_in_threadlist = 0;
+        stitches = pattern.getStitches();
+        for (int i = 0, s = stitches.size(); i < s; i++) {
+            //Iterate all stitches.
+            int flags = stitches.getData(i) & COMMAND_MASK;
+            if ((flags == COLOR_CHANGE) || (index_in_threadlist == 0)) {
+                // If color change *or* initial color unset.
+                EmbThread thread = pattern.threadlist.get(index_in_threadlist);
+                index_in_threadlist += 1;
+                color_count += 1;
+                int index_of_jefthread = EmbThread.findNearestColorIndex(thread.getColor(), Arrays.asList(jef_threads));
+                if ((last_index == index_of_jefthread) && (last_thread != thread)) {
+                    //Last thread and current thread pigeonhole to same jefcolor.
+                    //We set that thread to None. And get the second closest color.
+                    EmbThreadJef repeated_thread = jef_threads[index_of_jefthread];
+                    int repeated_index = index_of_jefthread;
+                    jef_threads[index_of_jefthread] = null;
+                    index_of_jefthread = EmbThread.findNearestColorIndex(thread.getColor(), Arrays.asList(jef_threads));
+                    jef_threads[repeated_index] = repeated_thread;
+                }
+                palette.add(index_of_jefthread);
+                last_index = index_of_jefthread;
+                last_thread = thread;
+                color_toggled = false;
+            }
+            if (flags == STOP) {
+                color_count += 1;
+                color_toggled = !color_toggled;
+                if (color_toggled) {
+                    palette.add(0);
+                }
+                else {
+                    palette.add(last_index);
+                }
+            }
+        }
+        
         int offsets = 0x74 + (color_count * 8);
         writeInt32LE(offsets);
         writeInt32LE(0x14);
         write(date_string.getBytes());
         writeInt8(0x00);
         writeInt8(0x00);
         writeInt32LE(color_count);
-        
+
         int command_count = 1; // 1 command for END;
         for (int i = 0, ie = stitches.size(); i < ie; i++) {
             int data = stitches.getData(i) & COMMAND_MASK;
@@ -68,7 +114,7 @@ public void write() throws IOException {
             break;
         }
         writeInt32LE(command_count);
-
+        
         float[] bounds = pattern.getBounds();
         int design_width = (int) (bounds[2] - bounds[0]);
         int design_height = (int) (bounds[3] - bounds[1]);
@@ -103,11 +149,10 @@ public void write() throws IOException {
         y_hoop_edge = 1000 - half_height;
         write_hoop_edge_distance(x_hoop_edge, y_hoop_edge);
 
-        EmbThread[] threadSet = EmbThreadJef.getThreadSet();
-        for (EmbThread thread : pattern.threadlist) {
-            int thread_index = EmbThread.findNearestIndex(thread.color, threadSet);
-            writeInt32LE(thread_index);
+        for (Integer t : palette) {
+            writeInt32LE(t);
         }
+        
         for (int i = 0; i < color_count; i++) {
             writeInt32LE(0x0D);
         }