From 750cd3e67c977aad9755cca171da9926343e8807 Mon Sep 17 00:00:00 2001
From: mattmcw <matt@sixteenmillimeter.com>
Date: Fri, 13 Sep 2024 19:01:20 -0400
Subject: [PATCH] Label the gate masks

---
 app/data/cfg.json         |  2 +-
 app/package-lock.json     |  2 +-
 app/package.json          |  2 +-
 data/cfg.json             |  2 +-
 package-lock.json         |  4 ++--
 package.json              |  2 +-
 processing/mcopy/cfg.json |  2 +-
 scad/mcopy_gate.scad      | 19 ++++++++++++++++++-
 8 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/data/cfg.json b/app/data/cfg.json
index 5402799..d04401b 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.127",
+  "version": "1.8.128",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/app/package-lock.json b/app/package-lock.json
index 7ca6a32..c545bcf 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.127",
+  "version": "1.8.128",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/app/package.json b/app/package.json
index e233c04..5559610 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy-app",
-  "version": "1.8.127",
+  "version": "1.8.128",
   "description": "GUI for the mcopy small gauge film optical printer platform",
   "main": "main.js",
   "scripts": {
diff --git a/data/cfg.json b/data/cfg.json
index 5402799..d04401b 100644
--- a/data/cfg.json
+++ b/data/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.127",
+  "version": "1.8.128",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/package-lock.json b/package-lock.json
index 64cae6a..664afe7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mcopy",
-  "version": "1.8.127",
+  "version": "1.8.128",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mcopy",
-      "version": "1.8.127",
+      "version": "1.8.128",
       "license": "MIT",
       "dependencies": {
         "alert": "file:app/lib/alert",
diff --git a/package.json b/package.json
index a8304fb..8745917 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcopy",
-  "version": "1.8.127",
+  "version": "1.8.128",
   "description": "Small gauge film optical printer platform",
   "main": "build.js",
   "directories": {
diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json
index 5402799..d04401b 100644
--- a/processing/mcopy/cfg.json
+++ b/processing/mcopy/cfg.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.8.127",
+  "version": "1.8.128",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
diff --git a/scad/mcopy_gate.scad b/scad/mcopy_gate.scad
index c8e1a22..5d24563 100644
--- a/scad/mcopy_gate.scad
+++ b/scad/mcopy_gate.scad
@@ -71,12 +71,27 @@ module front_plate () {
     }
 }
 
+module text_void (string = "example", pos = [0, 0, 0], rot = [0, 0, 0], letter_size = 5, letter_height = 2) {
+    translate(pos) rotate(rot) linear_extrude(height = letter_height) {
+        text(string, size = letter_size, font = "Liberation Sans", halign = "center", valign = "center", $fn = 16);
+    }    
+}
+
+module gate_mask_text (format = "") {
+    if (format == "standard16") {
+        text_void("16mm", pos= [11.5, 0, -3], rot = [90, 0, 90], letter_size = 4);
+    } else if (format == "super16") {
+        text_void("super16", pos= [11.5, 0, -4], rot = [90, 0, 90], letter_size = 4);
+    }
+}
+
 module gate_mask_slide (pos = [0, 0, 0], pad = 0.0, format = "") {
     Z = -1;
     GuideAdjust = -1.5;
     FormatBevelY = format == "super16" ? 5 : 5.5;
 
     translate(pos) {
+        //gate_mask_text(format);
         difference () {
             union () {
                 translate([0, 0, Z]) cube([20, FrontPlateVoidY + pad, PlateZ + 2], center = true);
@@ -88,15 +103,17 @@ module gate_mask_slide (pos = [0, 0, 0], pad = 0.0, format = "") {
                     }
                 }
                 if (format != "") {
-                    translate([(20 / 2) + .6, 0, -3.5]) cube([2, FrontPlateVoidY + 8, PlateZ + 2 + 5], center = true);
+                    translate([(20 / 2) + .6, 0, -3.5]) rotate([0, 90, 0]) rounded_cube([PlateZ + 2 + 5, FrontPlateVoidY + 8, 2], d = 2, $fn = 20, center = true);
                 }
             }
             
             // difference
             if (format != "") {
+                gate_mask_text(format);
                 difference () {
                     film_clearance_void([0, 0, 1 + 0.2]);
                     if (format == "standard16" || format == "super16") {
+                        
                         difference () {
                             cube([BackPlateVoidX + 10, BackPlateVoidY + 6, 10], center = true);
                             translate([0, BackPlateVoidY / 2 + FormatBevelY, 4.5]) rotate([-20, 0, 0]) cube([FrontPlateClearanceX + 3, 10, 10], center = true);