@glodon-aiot/dataset-annotation 3.3.0 → 3.3.1-beta.1

package/dist/es/components/DetectionAnnotation/components/LabelMaker/Drawable.mjs

@@ -1,51 +1,45 @@
-function k(e, p) {
-  I(e);
-  let i = -1, h = -1, u = 0, n = 0;
-  e.on("mouse:down", (s) => {
-    if (e.getActiveObject())
+function I(e, u) {
+  y(e);
+  let h = -1, s = -1, n = 0, p = 0;
+  e.on("mouse:down", (g) => {
+    h = -1, s = -1, n = 0, p = 0;
+    const i = e.getZoom();
+    s = g.e.offsetX / i, h = g.e.offsetY / i;
+  }), e.on("mouse:up", (g) => {
+    if (s === -1 && h === -1)
       return;
-    i = -1, h = -1, u = 0, n = 0;
-    const l = e.getZoom();
-    h = s.e.offsetX / l, i = s.e.offsetY / l;
-  }), e.on("mouse:up", (s) => {
-    if (e.getActiveObject()) {
-      i = -1, h = -1, u = 0, n = 0;
+    const i = e.getZoom(), m = g.e.offsetX > e.getWidth() ? e.getWidth() / i : g.e.offsetX / i, w = g.e.offsetY > e.getHeight() ? e.getHeight() / i : g.e.offsetY / i;
+    if (n = Math.abs(m - s), p = Math.abs(w - h), n === 0 || p === 0)
       return;
-    }
-    if (h === -1 && i === -1)
-      return;
-    const l = e.getZoom(), m = s.e.offsetX > e.getWidth() ? e.getWidth() / l : s.e.offsetX / l, w = s.e.offsetY > e.getHeight() ? e.getHeight() / l : s.e.offsetY / l;
-    if (u = Math.abs(m - h), n = Math.abs(w - i), u === 0 || n === 0)
-      return;
-    const y = e.viewportTransform ? e.viewportTransform[4] / l : 0, T = e.viewportTransform ? e.viewportTransform[5] / l : 0;
-    let f = i > w ? w : i, r = h > m ? m : h, d = u, g = n;
-    f = f - T, r = r - y;
-    const X = () => {
+    const T = e.viewportTransform ? e.viewportTransform[4] / i : 0, X = e.viewportTransform ? e.viewportTransform[5] / i : 0;
+    let f = h > w ? w : h, r = s > m ? m : s, l = n, d = p;
+    f = f - X, r = r - T;
+    const Y = () => {
       var o, b;
       const t = e.backgroundImage;
-      t && typeof t != "string" && ((o = t.aCoords) != null && o.tl.x, (b = t.aCoords) != null && b.tl.y), t && typeof t != "string" && t.top !== void 0 && t.height !== void 0 && t.left !== void 0 && t.width !== void 0 && (f < t.top && (g = g - (t.top - f), f = t.top), f + g > t.top + t.height && (g = t.top + t.height - f + g - g, f = t.height + t.top - g), r < t.left && (d = d - (t.left - r), r = t.left), r + d > t.left + t.width && (d = t.left + t.width - r + d - d, r = t.width + t.left - d));
-    }, Y = (t) => {
+      t && typeof t != "string" && ((o = t.aCoords) != null && o.tl.x, (b = t.aCoords) != null && b.tl.y), t && typeof t != "string" && t.top !== void 0 && t.height !== void 0 && t.left !== void 0 && t.width !== void 0 && (f < t.top && (d = d - (t.top - f), f = t.top), f + d > t.top + t.height && (d = t.top + t.height - f + d - d, f = t.height + t.top - d), r < t.left && (l = l - (t.left - r), r = t.left), r + l > t.left + t.width && (l = t.left + t.width - r + l - l, r = t.width + t.left - l));
+    }, k = (t) => {
       const o = e.backgroundImage;
       return !(o && typeof o != "string" && o.top !== void 0 && o.height !== void 0 && o.left !== void 0 && o.width !== void 0 && (t[0] < o.left || t[1] < o.top || t[0] > o.left + o.width || t[1] > o.top + o.height));
     };
-    X();
-    const c = [[r, f], [r + d, f], [r + d, f + g], [r, f + g]];
-    p && c.every((t) => Y(t)) && p({
+    Y();
+    const c = [[r, f], [r + l, f], [r + l, f + d], [r, f + d]];
+    u && c.every((t) => k(t)) && u({
       id: "",
       color: "#cccccc",
       label: "未知",
       box: c
-    }), e.skipTargetFind = !1;
+    }), e.skipTargetFind = !1, y(e);
   });
 }
-const I = (e) => {
+const y = (e) => {
   e.off("mouse:down"), e.off("mouse:up");
 };
-function x(e, p, i) {
-  if (!i)
-    return k(e, p), e;
+function x(e, u, h) {
+  if (!h)
+    return I(e, u), e;
 }
 export {
   x as drawable,
-  I as stopDraw
+  y as stopDraw
 };

package/dist/es/components/DetectionAnnotation/components/LabelMaker/RectLabel.mjs

@@ -1,5 +1,5 @@
-var p = Object.defineProperty, u = Object.defineProperties;
-var m = Object.getOwnPropertyDescriptors;
+var p = Object.defineProperty, m = Object.defineProperties;
+var u = Object.getOwnPropertyDescriptors;
 var b = Object.getOwnPropertySymbols;
 var w = Object.prototype.hasOwnProperty, C = Object.prototype.propertyIsEnumerable;
 var g = (l, e, s) => e in l ? p(l, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : l[e] = s, n = (l, e) => {
@@ -9,7 +9,7 @@ var g = (l, e, s) => e in l ? p(l, e, { enumerable: !0, configurable: !0, writab
     for (var s of b(e))
       C.call(e, s) && g(l, s, e[s]);
   return l;
-}, v = (l, e) => u(l, m(e));
+}, v = (l, e) => m(l, u(e));
 var f = (l, e, s) => (g(l, typeof e != "symbol" ? e + "" : e, s), s);
 import { fabric as d } from "fabric";
 import y from "./FabricCustomize.mjs";
@@ -209,7 +209,7 @@ class F {
       this.hover = !0;
     }), this._fabricRect.on("mouseout", (o) => {
       this.hover = !1;
-    }), this._fabricRect.on("mouseup", () => {
+    }), this._fabricRect.on("mousedown", () => {
       this._fabricRect && this.canvas.setActiveObject(this._fabricRect);
     });
     const s = (o) => {