Merge pull request #3 from brendabell/feature/add-empisal-mk70

Feature/add empisal mk70

modules/pcgenerator.py

@@ -19,6 +19,22 @@ specs = {
 		'stitches': 12,
 		'corner_offset': 2,
 	},
+	'18-stitch-mk70': {
+		'card_width': 142,
+		'blank_rows': 2,
+		'row_height': 5.0,
+		'stitch_width': 6.0,
+		'pattern_hole_radius': 3.5,
+		'pattern_hole_xoffset': 17.5,
+		'clip_hole_radius': 3.5,
+		'clip_hole_xoffset': 5.0,
+		'clip_hole_yoffset': 5.0,
+		'tractor_hole_radius': 3.0,
+		'tractor_hole_xoffset': 12.5,
+		'tractor_hole_yoffset': 2.5,
+		'stitches': 18,
+		'corner_offset': 2,
+	},
 	'24-stitch-br-sr': {
 		'card_width': 142,
 		'blank_rows': 2,
@@ -99,10 +115,10 @@ class Layout:
 		self.card_stitches = stitches
 		self.card_rows = rows
 
-		if self.card_rows > 200 or self.card_stitches > 30:
+		if self.card_rows > 200 or self.card_stitches > specs[machine_id]['stitches']:
 			raise ValueError(
-				"Your pattern seems to exceed 200 rows and/or 30 stitches. "
-				"Are you sure you uploaded the right text file?")
+				"Your pattern seems to exceed 200 rows and/or {} stitches. "
+				"Are you sure you uploaded the right text file?".format(specs[machine_id]['stitches']))
 
 		self.horz_repeat = horz_repeat
 		self.vert_repeat = vert_repeat

templates/pcgenerator.html

@@ -60,8 +60,9 @@
 							<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>
 						</select>
-						<p><b>NOTICE: Passap Deco support is currently experimental and has not been fully tested.</b>
+						<p><b>NOTICE: Support for Deco and MK70 is currently experimental and has not been fully tested.</b>
 				</td>
 				</tr>
 				<tr>
@@ -113,7 +114,7 @@
 
 		<p>The resulting SVG file can be imported into any application that understands SVG. You can also display the SVG in some browsers. Neither the text file or resulting SVG will be saved on this site. Be sure to keep them in a safe location so they don't get lost.
 
-		<p>Silhouette users have reported issues importing SVG files or having to resize the SVG in Inkscape before importing. If you have trouble with the SVG file, try checking the Convert To PNG button to see if that helps.
+		<p>Silhouette users have reported issues importing SVG files or having to resize the SVG in Inkscape before importing. If you have trouble with the SVG file, try checking the Convert To PNG button to see if that gives you a better result.
 
 		<h2>Bugs & Disclaimers</h2>
 		<p>This program has only been tested using Sure Cuts A Lot on a Pazzles Creative Mighty. YMMV!

test/houndstooth6.txt

@@ -0,0 +1,5 @@
+--x---
+--xxxx
+-xxxx-
+xxxx--
+---x--