Merge pull request #5 from brendabell/30-stitch-km

first crack at 30-stitch knitmaster card

modules/pcgenerator.py

@@ -51,6 +51,22 @@ specs = {
 		'stitches': 24,
 		'corner_offset': 2,
 	},
+	'30-stitch-km': {
+		'card_width': 142,
+		'blank_rows': 2,
+		'row_height': 5.0,
+		'stitch_width': 3.6,
+		'pattern_hole_diameter': 2.7,
+		'pattern_hole_xoffset': 17.50,
+		'clip_hole_diameter': 3.5,
+		'clip_hole_xoffset': 5.0,
+		'clip_hole_yoffset': 5.0,
+		'tractor_hole_diameter': 3.0,
+		'tractor_hole_xoffset': 12.0,
+		'tractor_hole_yoffset': 2.5,
+		'stitches': 30,
+		'corner_offset': 2,
+	},
 	'40-stitch-deco': {
 		'card_width': 243,
 		'blank_rows': 3,

templates/pcgenerator.html

@@ -58,11 +58,11 @@
 					<td colspan="2">
 						<select name="machine">
 							<option value="12-stitch-br-sr">12-stitch Brother/Silver Reed/Studio</option>
-							<option value="24-stitch-br-sr">24-stitch Brother/Silver Reed/Studio</option>
-							<option value="40-stitch-deco">40-stitch Passap Deco</option>
 							<option value="18-stitch-mk70">18-stitch Empisal MK70</option>
+							<option value="24-stitch-br-sr">24-stitch Brother/Silver Reed/Studio</option>
+							<option value="30-stitch-km">30-stitch Knitmaster</option>
+							<option value="40-stitch-deco">40-stitch Passap Deco</option>
 						</select>
-						<p><b>NOTICE: Support for Deco and MK70 is currently experimental and has not been fully tested.</b>
 				</td>
 				</tr>
 				<tr>

test/test.py

@@ -4,11 +4,12 @@ from modules.pcgenerator import PCGenerator
 import cairosvg
 
 #pattern='--x---\n--xxxx\n-xxxx-\nxxxx--\n---x--\n'
-pattern='-x\nx-\n'
+pattern='xxxxxx'
 #machine = '12-stitch-br-sr'
 #machine = '18-stitch-mk70'
 #machine = '24-stitch-br-sr'
-machine = '40-stitch-deco'
+#machine = '40-stitch-deco'
+machine = '30-stitch-km'
 generator = PCGenerator(None, pattern, machine, 10)
 result = generator.generate()
 text_file = open("{}.svg".format(machine), "w")