2D matrix symbols with custom module width should maintain aspect ratio

Author: gredler

src/main/java/uk/org/okapibarcode/backend/MaxiCode.java

@@ -398,7 +398,7 @@ protected void encode() {
                 }
             }
             pattern[i] = bin2pat(bin);
-            row_height[i] = 1;
+            row_height[i] = moduleWidth;
         }
     }
 
@@ -907,27 +907,31 @@ protected void plotSymbol() {
 
         resetPlotElements();
 
-        symbol_height = 72;
-        symbol_width = 74;
+        // this is a very different symbology, but for consistency with all of the other
+        // 2D matrix symbologies, we scale the symbol up by the module width (the hexagons
+        // are considered "modules" in the MaxiCode spec)
+        int m = moduleWidth;
+        symbol_height = 72 * m;
+        symbol_width = 74 * m;
 
         // hexagons
         for (int row = 0; row < 33; row++) {
             for (int col = 0; col < 30; col++) {
                 if (grid[row][col]) {
-                    double x = (2.46 * col) + 1.23;
+                    double x = ((2.46 * col) + 1.23) * m;
                     if ((row & 1) != 0) {
-                        x += 1.23;
+                        x += 1.23 * m;
                     }
-                    double y = (2.135 * row) + 1.43;
-                    hexagons.add(new Hexagon(x, y));
+                    double y = ((2.135 * row) + 1.43) * m;
+                    hexagons.add(new Hexagon(x, y, m));
                 }
             }
         }
 
         // circles
         double[] radii = { 10.85, 8.97, 7.10, 5.22, 3.31, 1.43 };
         for (int i = 0; i < radii.length; i++) {
-            target.add(new Circle(35.76, 35.60, radii[i]));
+            target.add(new Circle(35.76 * m, 35.60 * m, radii[i] * m));
         }
     }
 

src/main/java/uk/org/okapibarcode/graphics/Hexagon.java

@@ -35,12 +35,12 @@ public final class Hexagon {
     public final double[] pointX = new double[6];
     public final double[] pointY = new double[6];
 
-    public Hexagon(double centreX, double centreY) {
+    public Hexagon(double centreX, double centreY, int factor) {
         this.centreX = centreX;
         this.centreY = centreY;
         for (int i = 0; i < 6; i++) {
-            pointX[i] = centreX + (OFFSET_X[i] * INK_SPREAD);
-            pointY[i] = centreY + (OFFSET_Y[i] * INK_SPREAD);
+            pointX[i] = centreX + (OFFSET_X[i] * INK_SPREAD * factor);
+            pointY[i] = centreY + (OFFSET_Y[i] * INK_SPREAD * factor);
         }
     }
 

src/test/java/uk/org/okapibarcode/graphics/HexagonTest.java

@@ -30,20 +30,20 @@ public class HexagonTest {
     @Test
     public void testHexagon() {
 
-        Hexagon hex1 = new Hexagon(1, 2);
+        Hexagon hex1 = new Hexagon(1, 2, 1);
         assertEquals(1, hex1.centreX, 0.001);
         assertEquals(2, hex1.centreY, 0.001);
         assertEquals("Hexagon[centreX=1.0, centreY=2.0]", hex1.toString());
 
-        Hexagon hex2 = new Hexagon(1, 2);
+        Hexagon hex2 = new Hexagon(1, 2, 1);
         assertEqual(hex1, hex2);
 
         Object obj = new Object();
         assertNotEquals(hex1, obj);
         assertNotEquals(obj, hex1);
 
-        assertNotEqual(hex1, new Hexagon(9, 2));
-        assertNotEqual(hex1, new Hexagon(1, 9));
+        assertNotEqual(hex1, new Hexagon(9, 2, 1));
+        assertNotEqual(hex1, new Hexagon(1, 9, 1));
     }
 
     private static void assertEqual(Hexagon hex1, Hexagon hex2) {

src/test/resources/uk/org/okapibarcode/backend/maxicode/mode-4-module-width-2.png

@@ -0,0 +1,160 @@
+PROPERTIES
+
+mode=4
+moduleWidth=2
+content=ABC
+
+LOG
+
+ECI Mode: 3
+ECI Charset: ISO-8859-1
+Mode: 4
+ECC Codewords: 40
+Codewords: 4 1 2 3 33 33 33 33 33 33 13 1 28 60 35 56 0 48 52 15 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 60 60 40 40 9 9 43 43 14 14 50 50 12 12 53 53 57 57 58 58 36 36 28 28 10 10 53 53 37 37 30 30 14 14 5 5 31 31 40 40
+
+CODEWORDS
+
+4		# mode 4
+1		# A
+2		# B
+3		# C
+33		# start padding
+33
+33
+33
+33
+33
+13		# start primary message error correction
+1
+28
+60
+35
+56
+0
+48
+52
+15		# end primary message error correction
+33		# start secondary message
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+33
+60		# start secondary message error correction
+60
+40
+40
+9
+9
+43
+43
+14
+14
+50
+50
+12
+12
+53
+53
+57
+57
+58
+58
+36
+36
+28
+28
+10
+10
+53
+53
+37
+37
+30
+30
+14
+14
+5
+5
+31
+31
+40
+40		# end secondary message error correction