Merge pull request #21 from EmbroidePy/0.1.14

PMV Tweaks

Author: tatarize

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

@@ -25,7 +25,7 @@ public void read_pmv_stitches(EmbReader reader) throws IOException {
                     x = -(64 - x); // 6 bit signed number.
                 }
                 x *= 2.5;
-                y *= 2.5;
+                y -= 2.5;
                 int dx = x;
                 pattern.stitchAbs(px + x, y);
                 px += dx;

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

@@ -72,7 +72,7 @@ public void write() throws IOException {
             }
             int data = pattern.getData(i) & COMMAND_MASK;
             float x = pattern.getX(i);
-            float y = pattern.getY(i);
+            float y = -pattern.getY(i);
             x *= scale_x;
             y -= center_y;
             y *= scale_y;
@@ -82,10 +82,10 @@ public void write() throws IOException {
             if (data != STITCH && data != JUMP) {
                 continue;
             }
-            if (int_x > int_max_x) {
+            if (xx > int_max_x) {
                 int_max_x = int_x;
             }
-            if (int_x < int_min_x) {
+            if (xx < int_min_x) {
                 int_min_x = int_x;
             }
             if (int_y > int_max_y) {
@@ -119,7 +119,7 @@ public void write() throws IOException {
         write_length_lookup_table(length_range);
         int width_range = int_max_y - int_min_y;
         write_width_lookup_table(width_range);
-        writeInt16LE(0x12);
+        writeInt16LE(0x12); // (250,1000)
         write(new byte[]{
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -145,18 +145,18 @@ private void write_length_lookup_table(int length_range) throws IOException {
     }
 
     private void write_width_lookup_table(int width_range) throws IOException {
-        int pos = width_range / 2;
-        writeInt8(pos);
         if (width_range == 0) {
+            writeInt8(0);
             writeInt8(1);
             writeInt16LE(8192);
             writeInt16LE(1000);
             return;
         }
         int steps = 15;
-        writeInt8(steps);
         double second_max = 28000.0 / ((float) width_range);
         double second_step = second_max / ((float) steps - 1);
+        writeInt8(steps-1);
+        writeInt8(steps);
         for (int i = 0; i < steps; i++) {
             int width_at_step = 50 * i;
             int other_at_step = (int) Math.rint(second_step * i);