Added suppoort for toyota 747

data/12-stitch-toy-747.json

@@ -0,0 +1,22 @@
+{
+    "card_width": 142.0,
+    "stitches": 12,
+    "row_height": 5.5,
+    "stitch_width": 10.0,
+    "pattern_hole_diameter": 3.5,
+    "pattern_hole_xoffset": 16.0,
+    "pattern_hole_yoffset": 44.0,
+    "clip_hole_diameter": 0.0,
+    "clip_hole_xoffset": 0.0,
+    "clip_hole_yoffset": 0.0,
+    "tractor_hole_diameter": 2.7,
+    "tractor_hole_xoffset": 9.0,
+    "tractor_hole_yoffset": 0.0,
+    "overlapping_rows": 0,
+    "overlapping_row_xoffset": 0.0,
+    "overlapping_row_yoffset": 0.0,
+    "corner_offset": 1.0,
+    "force_solid_fill": false,
+    "half_hole_at_bottom": false
+  }
+  

modules/pcgenerator.py

@@ -96,7 +96,7 @@ class PCGenerator:
 		global machine_config
 
 		self.handler = handler
-                data_dir = os.path.join(os.path.dirname(__file__), '../data/')
+		data_dir = os.path.join(os.path.dirname(__file__), '../data/')
 		with open("{}/{}.json".format(data_dir, machine_id)) as json_config:
 			machine_config = json.loads(json_config.read())
 		if is_blank:
@@ -107,7 +107,7 @@ class PCGenerator:
 			machine_id,
 			len(self.data[0]),
 			len(self.data),
-			machine_config['stitches'] / len(self.data[0]),
+			(int)(machine_config['stitches'] / len(self.data[0])),
 			vert_repeat,
 			is_blank,
 			is_solid_fill)

templates/pcgenerator.html

@@ -78,13 +78,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 			<table>
 				<tr>
 					<td style="text-align:right">Select file to upload:<br>&nbsp;</td>
-					<td colspan="2"><input type="file" name="upfile"><br><small>(maximum file size 4000 characters)<small></td>
+					<td colspan="2"><input type="file" name="upfile" accept=".txt">
+						<br><small>(file must have .txt extension; maximum file size 4000 characters)<small>
+					</td>
 				</tr>
 				<tr>
 					<td style="text-align:right">Select machine type:<br>&nbsp;</td>
 					<td colspan="2">
 						<select name="machine">
 							<option value="12-stitch-br-sr">12-stitch 4.5mm Brother/Silver Reed/Studio</option>
+							<option value="12-stitch-toy-747">12-stitch 4.5mm Toyota 747 (expiramental)</option>
 							<option value="18-stitch-mk70">18-stitch 6mm Empisal MK70</option>
 							<option value="24-stitch-br-sr">24-stitch 4.5mm Brother/Silver Reed/Studio</option>
 							<option value="30-stitch-km">30-stitch 3.6mm Knitmaster</option>
@@ -94,7 +97,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 							<option value="40-stitch-jac-5_0">5mm Jac40 (5 metr.)</option>
 							<option value="60-stitch-ec1">60-stitch EC1 (template only)</option>
 						</select>
-				</td>
+					</td>
 				</tr>
 				<tr>
 					<td style="text-align:right"># Vertical repeats (up to 100):</td>