frame.identify 0.5.5 → 0.5.6

package/dist/ModalImageCropped.d.ts

@@ -28,6 +28,7 @@ export declare function ModalImageCropped(props: {
     dataUrl: string;
     modalIsOpen: boolean;
     onCloseModal: (rotationAngle: number, contourPoints: Point[], points: Point[], trademark?: Point) => () => void;
+    trademarkLineScale?: number;
     testMode?: boolean;
 }): import("react").JSX.Element;
 //# sourceMappingURL=ModalImageCropped.d.ts.map

package/dist/ModalImageCropped.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModalImageCropped.d.ts","sourceRoot":"","sources":["../src/ModalImageCropped.tsx"],"names":[],"mappings":"AAUA,OAAO,EAqBL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC;AAI1B;;;;;;;;;GASG;AAEH;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IACvC,KAAK,EAAE,YAAY,CAAC,OAAO,eAAe,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,CACZ,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,KAAK,EAAE,EACtB,MAAM,EAAE,KAAK,EAAE,EACf,SAAS,CAAC,EAAE,KAAK,KACd,MAAM,IAAI,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,+BAm1CA"}
+{"version":3,"file":"ModalImageCropped.d.ts","sourceRoot":"","sources":["../src/ModalImageCropped.tsx"],"names":[],"mappings":"AAUA,OAAO,EAqBL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC;AAI1B;;;;;;;;;GASG;AAEH;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IACvC,KAAK,EAAE,YAAY,CAAC,OAAO,eAAe,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,CACZ,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,KAAK,EAAE,EACtB,MAAM,EAAE,KAAK,EAAE,EACf,SAAS,CAAC,EAAE,KAAK,KACd,MAAM,IAAI,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,+BA81CA"}

package/dist/ModalImageLoaded.d.ts

@@ -9,6 +9,7 @@ export declare function ModalImageLoaded(props: {
     modalIsOpen: boolean;
     onAfterCloseModal: (sl: number, sh: number, dbl: number, rotationAngle: number, contourPoints: Point[], points: Point[], trademark?: Point) => () => void;
     onAfterCropImage?: (base64: string, sl: number, sh: number, dbl: number, x0: number, y0: number, width: number, height: number) => void;
+    trademarkLineScale?: number;
     testMode?: boolean;
 }): import("react").JSX.Element;
 //# sourceMappingURL=ModalImageLoaded.d.ts.map

package/dist/ModalImageLoaded.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModalImageLoaded.d.ts","sourceRoot":"","sources":["../src/ModalImageLoaded.tsx"],"names":[],"mappings":"AAIA,OAAO,EAKL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAqB,KAAK,EAAE,MAAM,GAAG,CAAC;AAG7C,MAAM,MAAM,sBAAsB,GAAG;IACnC,cAAc,EAAE,MAAM,IAAI,CAAC;CAC5B,CAAC;AAIF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,KAAK,EAAE,YAAY,CAAC,OAAO,eAAe,CAAC,CAAC;IAC5C,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,CACjB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,KAAK,EAAE,EACtB,MAAM,EAAE,KAAK,EAAE,EACf,SAAS,CAAC,EAAE,KAAK,KACd,MAAM,IAAI,CAAC;IAChB,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,KACX,IAAI,CAAC;IACV,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,+BA4YA"}
+{"version":3,"file":"ModalImageLoaded.d.ts","sourceRoot":"","sources":["../src/ModalImageLoaded.tsx"],"names":[],"mappings":"AAIA,OAAO,EAKL,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAqB,KAAK,EAAE,MAAM,GAAG,CAAC;AAG7C,MAAM,MAAM,sBAAsB,GAAG;IACnC,cAAc,EAAE,MAAM,IAAI,CAAC;CAC5B,CAAC;AAIF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,KAAK,EAAE,YAAY,CAAC,OAAO,eAAe,CAAC,CAAC;IAC5C,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,EAAE,CACjB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,KAAK,EAAE,EACtB,MAAM,EAAE,KAAK,EAAE,EACf,SAAS,CAAC,EAAE,KAAK,KACd,MAAM,IAAI,CAAC;IAChB,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,KACX,IAAI,CAAC;IACV,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,+BA6YA"}

package/dist/frame.identify.js

@@ -4762,6 +4762,7 @@ function ds(e) {
 						let a = O.context.SL ?? 0, o = O.context.SH ?? 0, s = O.context.AZG ?? 0;
 						e.onAfterCloseModal(a, o, s, t, n, r, i)(), f(!1);
 					},
+					trademarkLineScale: e.trademarkLineScale,
 					testMode: e.testMode
 				}, b),
 				/* @__PURE__ */ c(cs, {
@@ -6583,7 +6584,7 @@ function Kc(e) {
 		for (let e = 0; e < t.length; e += 1) {
 			let i = t[e], a = ce(i);
 			if (e > 0 && a < n) {
-				console.log(`switched from negative to positive at index ${e} -> [${i.x}, ${i.y}]`), r = e;
+				r = e;
 				break;
 			}
 			n = a;
@@ -6600,7 +6601,7 @@ function Kc(e) {
 			let n = i(t * 2 * Math.PI / 128);
 			return n.x > a && (a = n.x), n.x < o && (o = n.x), n.y > s && (s = n.y), n.y < c && (c = n.y), n;
 		});
-		if (console.log(`curvedPoints: x: [${o}, ${a}] -> ${a - o}; y: [${c}, ${s}] -> ${s - c}`), r) {
+		if (r) {
 			let t = a - o, n = s - c, r = e / t, i = l.map((e) => ({
 				x: e.x - o - t / 2,
 				y: e.y - c - n / 2
@@ -6610,7 +6611,7 @@ function Kc(e) {
 			} : void 0, d = -Infinity, f = Infinity, p = -Infinity, m = Infinity;
 			i.forEach((e) => {
 				e.x > d && (d = e.x), e.x < f && (f = e.x), e.y > p && (p = e.y), e.y < m && (m = e.y);
-			}), console.log(`centeredPoints: x: [${f}, ${d}] -> ${d - f}; y: [${m}, ${p}] -> ${p - m}`), console.log(`centeredTrademark: ${u?.x}, ${u?.y}`);
+			});
 			let h = i.map((e) => ({
 				x: e.x,
 				y: -e.y
@@ -6620,17 +6621,17 @@ function Kc(e) {
 			} : void 0, _ = -Infinity, v = Infinity, y = -Infinity, b = Infinity;
 			h.forEach((e) => {
 				e.x > _ && (_ = e.x), e.x < v && (v = e.x), e.y > y && (y = e.y), e.y < b && (b = e.y);
-			}), console.log(`mirroredPoints: x: [${v}, ${_}] -> ${_ - v}; y: [${b}, ${y}] -> ${y - b}`), console.log(`mirroredTrademark: ${g?.x}, ${g?.y}`);
+			});
 			let x = pe(h, r), S = g ? fe(g, r) : void 0, C = -Infinity, w = Infinity, T = -Infinity, E = Infinity;
 			x.forEach((e) => {
 				e.x > C && (C = e.x), e.x < w && (w = e.x), e.y > T && (T = e.y), e.y < E && (E = e.y);
-			}), console.log(`scaledPoints: x: [${w}, ${C}] -> ${C - w}; y: [${E}, ${T}] -> ${T - E}`), console.log(`scaledTrademark: ${S?.x}, ${S?.y}`), me(x) || (x.reverse(), x.forEach((e) => {
+			}), me(x) || (x.reverse(), x.forEach((e) => {
 				e.x > C && (C = e.x), e.x < w && (w = e.x), e.y > T && (T = e.y), e.y < E && (E = e.y);
-			}), console.log(`scaledPoints (reverted): x: [${w}, ${C}] -> ${C - w}; y: [${E}, ${T}] -> ${T - E}`));
+			}));
 			let D = de(x), k = Infinity, A = -Infinity, j = Infinity, M = -Infinity;
 			return D.forEach((e) => {
 				e.x > A && (A = e.x), e.x < k && (k = e.x), e.y > M && (M = e.y), e.y < j && (j = e.y);
-			}), console.log(`zeroedPoints: x: [${k}, ${A}] -> ${A - k}; y: [${j}, ${M}] -> ${M - j}`), {
+			}), {
 				polygon: D,
 				box: {
 					minX: o,
@@ -6658,7 +6659,6 @@ function Kc(e) {
 		de
 	]);
 	function ge(t, n, r) {
-		console.log(`getRT1Points: trademark: ${r?.x}, ${r?.y}`);
 		let i = he(t, n, p, !0), a = le(i.polygon);
 		if (e.testMode) {
 			let e = se(a);
@@ -6691,7 +6691,7 @@ function Kc(e) {
 		e.beginPath(), e.strokeStyle = "green", e.lineWidth = 3, e.fillStyle = "rgba(255, 0, 0, 0.3)", e.moveTo(H.polygon[0].x, H.polygon[0].y);
 		for (let t of H.polygon) e.lineTo(t.x, t.y);
 		return e.closePath(), e.fill(), e.stroke(), H;
-	}, [H]), ve = n(() => {
+	}, [H]), ve = n((e = .9) => {
 		if (R.value !== "Shape defined" && R.value !== "Trademark defined" || H.polygon.length === 0) return {
 			points: [],
 			center: {
@@ -6699,103 +6699,103 @@ function Kc(e) {
 				y: 0
 			}
 		};
-		let { polygon: e, box: t } = H, n = {
-			x: (t.minX + t.maxX) / 2,
-			y: (t.minY + t.maxY) / 2
-		};
+		let { polygon: t, box: n } = H, r = {
+			x: (n.minX + n.maxX) / 2,
+			y: (n.minY + n.maxY) / 2
+		}, i = e, a = e;
 		return {
-			points: e.map((e) => ({
-				x: (e.x - n.x) * .9 + n.x,
-				y: (e.y - n.y) * .9 + n.y
+			points: t.map((e) => ({
+				x: (e.x - r.x) * i + r.x,
+				y: (e.y - r.y) * a + r.y
 			})).slice(40, 80),
-			center: n
+			center: r
 		};
 	}, [H, R.value]);
 	function U(e, t, n) {
 		e.strokeStyle = "red", e.lineWidth = 3, n ? e.setLineDash([4, 3]) : e.setLineDash([]), e.beginPath(), e.moveTo(t[0].x, t[0].y), e.lineTo(n?.x ?? t[1].x, n?.y ?? t[1].y), e.stroke(), n && e.setLineDash([]);
 	}
-	let ye = n((e, t) => {
-		let n = s.current, r = u.current;
-		if (!n || !r) return [];
-		let i = n.getContext("2d");
-		x === 0 ? i.drawImage(r, 0, 0) : (i.clearRect(0, 0, n.width, n.height), i.save(), i.translate(n.width / 2, n.height / 2), i.rotate(x), i.drawImage(r, -r.naturalWidth / 2, -r.naturalHeight / 2), i.restore()), i.setLineDash([]);
-		let a = {
-			x: n.width / 2,
-			y: n.height / 2
+	let ye = n((t, n) => {
+		let r = s.current, i = u.current;
+		if (!r || !i) return [];
+		let a = r.getContext("2d");
+		x === 0 ? a.drawImage(i, 0, 0) : (a.clearRect(0, 0, r.width, r.height), a.save(), a.translate(r.width / 2, r.height / 2), a.rotate(x), a.drawImage(i, -i.naturalWidth / 2, -i.naturalHeight / 2), a.restore()), a.setLineDash([]);
+		let o = {
+			x: r.width / 2,
+			y: r.height / 2
 		};
-		switch (Gc(e, x, a), R.value) {
+		switch (Gc(t, x, o), R.value) {
 			case Io:
 			case Lo: break;
 			case Ro:
-				re(i);
+				re(a);
 				break;
 			case zo:
-				B(i, p, "orange"), V(i, p, "magenta", !0);
+				B(a, p, "orange"), V(a, p, "magenta", !0);
 				break;
 			case Bo:
 				{
-					let { points: e, center: n } = ve();
-					if (oe(i, e, n, "red"), t && e.length > 0) {
-						let n = e[ae(t, e)], r = [
+					let { points: t, center: r } = ve(e.trademarkLineScale);
+					if (oe(a, t, r, "red"), n && t.length > 0) {
+						let e = t[ae(n, t)], r = [
 							{
-								x: n.x + 10,
-								y: n.y
+								x: e.x + 10,
+								y: e.y
 							},
 							{
-								x: n.x,
-								y: n.y + 10
+								x: e.x,
+								y: e.y + 10
 							},
 							{
-								x: n.x - 10,
-								y: n.y
+								x: e.x - 10,
+								y: e.y
 							},
 							{
-								x: n.x,
-								y: n.y - 10
+								x: e.x,
+								y: e.y - 10
 							}
 						];
-						V(i, r, "black"), z(i);
+						V(a, r, "black"), z(a);
 					}
 				}
 				break;
 			case Vo:
 				{
-					let { points: e, center: n } = ve();
-					if (oe(i, e, n, "red"), t && e.length > 0) {
-						let n = e[ae(t, e)], r = [
+					let { points: t, center: r } = ve(e.trademarkLineScale);
+					if (oe(a, t, r, "red"), n && t.length > 0) {
+						let e = t[ae(n, t)], r = [
 							{
-								x: n.x + 10,
-								y: n.y
+								x: e.x + 10,
+								y: e.y
 							},
 							{
-								x: n.x,
-								y: n.y + 10
+								x: e.x,
+								y: e.y + 10
 							},
 							{
-								x: n.x - 10,
-								y: n.y
+								x: e.x - 10,
+								y: e.y
 							},
 							{
-								x: n.x,
-								y: n.y - 10
+								x: e.x,
+								y: e.y - 10
 							}
 						];
-						V(i, r, "black"), z(i);
+						V(a, r, "black"), z(a);
 					}
 				}
-				z(i);
+				z(a);
 				break;
 			case Ho:
-				z(i);
+				z(a);
 				break;
 			default: console.log(`unknown state: ${R.value}`);
 		}
-		let { polygon: o } = _e(i);
-		if (e.length === 2 && (R.value === "Image cropped" || R.value === "X-axis started") && U(i, Gc(e, x, a)), e.length === 1 && R.value === "X-axis started" && t) {
-			let n = Wc(t, x, a);
-			U(i, Gc(e, x, a), n);
+		let { polygon: c } = _e(a);
+		if (t.length === 2 && (R.value === "Image cropped" || R.value === "X-axis started") && U(a, Gc(t, x, o)), t.length === 1 && R.value === "X-axis started" && n) {
+			let e = Wc(n, x, o);
+			U(a, Gc(t, x, o), e);
 		}
-		return o;
+		return c;
 	}, [
 		p,
 		re,
@@ -6803,6 +6803,7 @@ function Kc(e) {
 		_e,
 		B,
 		z,
+		e.trademarkLineScale,
 		x,
 		R.value,
 		ve
@@ -6876,8 +6877,8 @@ function Kc(e) {
 	function Te() {
 		if (!Le) throw Error("SL is undefined");
 		if (!Re) throw Error("SH is undefined");
-		let { points: t, center: n, scaledTrademark: r } = ge(Le, Re, O), i = Math.min(...t.map((e) => e.x)), a = Math.max(...t.map((e) => e.x)), o = Math.min(...t.map((e) => e.y)), s = Math.max(...t.map((e) => e.y));
-		if (console.log(`x: [${i}, ${a}] -> ${a - i}, y: [${o}, ${s}] -> ${s - o}`), R.value === "Points defined") e.actor.send({ type: ns });
+		let { points: t, center: n, scaledTrademark: r } = ge(Le, Re, O);
+		if (R.value === "Points defined") e.actor.send({ type: ns });
 		else if (R.value === "Shape defined") e.actor.send({ type: Uo });
 		else if (R.value === "Trademark defined") e.actor.send({ type: Uo });
 		else if (R.value === "Finished") e.onCloseModal(x, p, t, r)(), e.actor.send({ type: Wo });
@@ -6908,8 +6909,8 @@ function Kc(e) {
 	function je(t, n, r) {
 		if (n) k(void 0), e.actor.send({ type: r });
 		else {
-			let { points: n } = ve(), r = n[ae(t, n)];
-			console.log(`Trademark point selected: ${r.x}, ${r.y}`), k(r), e.actor.send({
+			let { points: n } = ve(e.trademarkLineScale), r = n[ae(t, n)];
+			k(r), e.actor.send({
 				type: ts,
 				trademark: r
 			});
@@ -6957,7 +6958,7 @@ function Kc(e) {
 				je(i, a, is);
 				break;
 			case Ho:
-				console.log("handleMouseDown: state is FINISHED"), a && e.actor.send({ type: as });
+				a && e.actor.send({ type: as });
 				break;
 			default: console.log(`handleMouseDown: unhandled state ${n.value}`);
 		}