Merge pull request #31 from EmbroidePy/pec-correction

PEC Corrections for Initial Command

Author: tatarize

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

@@ -34,8 +34,9 @@ public void readPec() throws IOException {
         skip(0x1D0 - colorChanges);
         int stitch_block_end = readInt24LE() - 5 + tell();
         //The end of this value is 5 into the sttichblock.
-        // 3 bytes, '0x31, 0xff, 0xf0, 6 2-byte shorts. 15 total.
-        skip(0x0F);
+        
+        // 3 bytes, '0x31, 0xff, 0xf0, 4 2-byte shorts. 11 total.
+        skip(0x0B);
         readPecStitches();
         seek(stitch_block_end);
         int byte_size = pec_graphic_byte_stride * pec_graphic_icon_height;
@@ -109,7 +110,6 @@ public void process_pec_table(byte[] color_bytes) {
 
     public void map_pec_colors(byte[] color_bytes) {
         int color_count = color_bytes.length;
-        int color_index = 0;
         if (pattern.threadlist.isEmpty()) {
             //if the threadlist is empty, we are reading a file without header threads.
             process_pec_colors(color_bytes);

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

@@ -17,6 +17,8 @@ public class PecWriter extends EmbWriter {
 
     static final int PEC_ICON_WIDTH = 48;
     static final int PEC_ICON_HEIGHT = 38;
+    
+    static final boolean GROUP_LONG = false;
 
     public PecWriter() {
         super();
@@ -132,9 +134,6 @@ void write_pec_block() throws IOException {
         writeInt16LE((short) 0x1E0);
         writeInt16LE((short) 0x1B0);
 
-        writeInt16BE((0x9000 | -Math.round(pattern.getMinX())));
-        writeInt16BE((0x9000 | -Math.round(pattern.getMinY())));
-
         pec_encode();
 
         int stitch_block_length = tell() - stitch_block_start_position;
@@ -173,19 +172,28 @@ public static int encode_long_form(int value) {
         return value;
     }
 
-    public static int flagJump(int longForm) {
-        return longForm | (JUMP_CODE << 8);
+    private void write_value(int value) throws IOException {
+        write_value(value, false, 0);
     }
-
-    public static int flagTrim(int longForm) {
-        return longForm | (TRIM_CODE << 8);
+    
+    private void write_value(int value, boolean force_long, int flag) throws IOException {
+        if (!force_long && -64 < value && value < 63) {
+            writeInt8(value & MASK_07_BIT);
+        }
+        else {
+            value &= 0b00001111_11111111;
+            value |= 0b10000000_00000000;
+            value |= (flag << 8);
+            writeInt16BE(value);
+        }
     }
-
+    
     private void pec_encode() throws IOException {
         boolean color_two = true;
         Points stitches = pattern.getStitches();
         int dx, dy;
         boolean jumping = false;
+        boolean init = true;
         double xx = 0, yy = 0;
         for (int i = 0, ie = stitches.size(); i < ie; i++) {
             int data = stitches.getData(i) & COMMAND_MASK;
@@ -199,40 +207,44 @@ private void pec_encode() throws IOException {
                 case STITCH:
                     if (jumping) {
                         if ((dx != 0) && (dy != 0)) {
-                            writeInt8((byte) 0x00);
-                            writeInt8((byte) 0x00);
+                            write_value(0);
+                            write_value(0);
                         }
                         jumping = false;
                     }
-                    if (dx < 63 && dx > -64 && dy < 63 && dy > -64) {
-                        writeInt8(dx & MASK_07_BIT);
-                        writeInt8(dy & MASK_07_BIT);
-                    } else {
-                        dx = encode_long_form(dx);
-                        dy = encode_long_form(dy);
-                        writeInt16BE(dx);
-                        writeInt16BE(dy);
+                    if (GROUP_LONG && dx < 63 && dx > -64 && dy < 63 && dy > -64) {
+                        write_value(dx, true, 0);
+                        write_value(dy, true, 0);
+                    }
+                    else {
+                        write_value(dx);
+                        write_value(dy);
                     }
+                    init = false;
                     continue;
                 case JUMP:
                     jumping = true;
-                    dx = encode_long_form(dx);
-                    dx = flagTrim(dx);
-                    dy = encode_long_form(dy);
-                    dy = flagTrim(dy);
-                    writeInt16BE(dx);
-                    writeInt16BE(dy);
+                    if (init) {
+                        write_value(dx, true, JUMP_CODE);
+                        write_value(dy, true, JUMP_CODE);
+                    }
+                    else {
+                        write_value(dx, true, TRIM_CODE);
+                        write_value(dy, true, TRIM_CODE);
+                    }
+                    init = false;
                     continue;
                 case COLOR_CHANGE:
                     if (jumping) {
-                        writeInt8((byte) 0x00);
-                        writeInt8((byte) 0x00);
+                        write_value(0);
+                        write_value(0);
                         jumping = false;
                     }
                     writeInt8(0xfe);
                     writeInt8(0xb0);
                     writeInt8((color_two) ? 2 : 1);
                     color_two = !color_two;
+                    init = false;
                     continue;
                 case TRIM:
                     continue;