@realsee/dnalogel 2.21.0-dev.7 → 2.21.0-dev.8

package/libs/PanoMeasurePlugin/Components/Controller1.js

@@ -1,9 +1,9 @@
-import { SvelteComponent as U, init as V, safe_not_equal as W, append_styles as X, element as _, create_component as q, space as E, attr as k, toggle_class as $, insert as B, mount_component as z, append as b, transition_in as c, transition_out as h, check_outros as K, detach as D, destroy_component as L, onMount as Y, onDestroy as Z, add_render_callback as R, create_bidirectional_transition as S, listen as J, group_outros as j } from "../../vendor/svelte/internal/index.js";
-import x from "./Common/Switcher1.js";
-import ee from "./Common/CircleButton.js";
+import { SvelteComponent as Q, init as U, safe_not_equal as V, append_styles as W, element as _, create_component as q, space as P, attr as k, toggle_class as E, insert as B, mount_component as z, append as b, transition_in as c, transition_out as g, check_outros as K, detach as D, destroy_component as L, onMount as X, onDestroy as Y, add_render_callback as R, create_bidirectional_transition as y, listen as J, group_outros as j } from "../../vendor/svelte/internal/index.js";
+import Z from "./Common/Switcher1.js";
+import x from "./Common/CircleButton.js";
 import F from "../Controller/EditController.js";
-import te from "./Common/Exit.js";
-import { fade as A } from "../../vendor/svelte/transition/index.js";
+import ee from "./Common/Exit.js";
+import { fade as T } from "../../vendor/svelte/transition/index.js";
 import "../Modules/UIController/mobileHTML.js";
 import "../Model/line.js";
 import "../../shared-utils/uuid.js";
@@ -62,13 +62,19 @@ import "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/isTouchDevice.js";
 import "../../shared-utils/getIntersectionFromEvent.js";
 import "../../shared-utils/getPointFromHammerEvent.js";
+import "../Modules/DeleteDom/index.js";
+import "../Modules/DeleteDom/_Assets/delete.svg.js";
+import "../Modules/DeleteDom/_Assets/delete_bg.png.js";
+import "../Modules/DeleteDom/_Assets/delete_hover_bg.png.js";
+import "../utils/findAssociatedLines.js";
+import "../utils/math.js";
 import "../../vendor/svelte/easing/index.js";
 function oe(r) {
-  X(r, "svelte-oflaon", "*.forbid.svelte-oflaon.svelte-oflaon{pointer-events:none;opacity:0.5}.Measure-Controller.svelte-oflaon.svelte-oflaon{pointer-events:none;color:white}.Measure-Controller.svelte-oflaon .mode-switcher.svelte-oflaon{margin-top:2.25rem}.Measure-Controller.svelte-oflaon .bottom.svelte-oflaon{position:absolute;width:100%;bottom:2.5rem}.Measure-Controller.svelte-oflaon .bottom .center.svelte-oflaon{display:flex;flex-direction:column;align-items:center}.Measure-Controller.svelte-oflaon .controller.svelte-oflaon{pointer-events:all;display:flex;align-items:center}.Measure-Controller.svelte-oflaon .controller .button.svelte-oflaon{cursor:pointer;display:flex;align-items:center;justify-content:center;height:2.5rem;padding-left:1rem;padding-right:1rem;border-radius:624.9375rem;font-size:0.875rem;background-color:rgba(0, 0, 0, 0.2)}.Measure-Controller.svelte-oflaon .controller .main-button.svelte-oflaon{margin-left:1.75rem;margin-right:1.75rem}");
+  W(r, "svelte-oflaon", "*.forbid.svelte-oflaon.svelte-oflaon{pointer-events:none;opacity:0.5}.Measure-Controller.svelte-oflaon.svelte-oflaon{pointer-events:none;color:white}.Measure-Controller.svelte-oflaon .mode-switcher.svelte-oflaon{margin-top:2.25rem}.Measure-Controller.svelte-oflaon .bottom.svelte-oflaon{position:absolute;width:100%;bottom:2.5rem}.Measure-Controller.svelte-oflaon .bottom .center.svelte-oflaon{display:flex;flex-direction:column;align-items:center}.Measure-Controller.svelte-oflaon .controller.svelte-oflaon{pointer-events:all;display:flex;align-items:center}.Measure-Controller.svelte-oflaon .controller .button.svelte-oflaon{cursor:pointer;display:flex;align-items:center;justify-content:center;height:2.5rem;padding-left:1rem;padding-right:1rem;border-radius:624.9375rem;font-size:0.875rem;background-color:rgba(0, 0, 0, 0.2)}.Measure-Controller.svelte-oflaon .controller .main-button.svelte-oflaon{margin-left:1.75rem;margin-right:1.75rem}");
 }
 function G(r) {
-  let o, t, e, m;
-  return t = new x({
+  let t, o, e, m;
+  return o = new Z({
     props: {
       options: [{ key: "line", value: "测距离" }, { key: "area", value: "测面积" }],
       defaultKey: (
@@ -82,10 +88,10 @@ function G(r) {
     }
   }), {
     c() {
-      o = _("div"), q(t.$$.fragment), k(o, "class", "mode-switcher svelte-oflaon");
+      t = _("div"), q(o.$$.fragment), k(t, "class", "mode-switcher svelte-oflaon");
     },
     m(l, i) {
-      B(l, o, i), z(t, o, null), m = !0;
+      B(l, t, i), z(o, t, null), m = !0;
     },
     p(l, i) {
       r = l;
@@ -94,71 +100,71 @@ function G(r) {
       1 && (a.defaultKey = /*measureController*/
       r[0].currentMeasureType), i & /*measureController*/
       1 && (a.onChange = /*measureController*/
-      r[0].changeMeasureType), t.$set(a);
+      r[0].changeMeasureType), o.$set(a);
     },
     i(l) {
-      m || (c(t.$$.fragment, l), l && R(() => {
-        m && (e || (e = S(o, A, { duration: P }, !0)), e.run(1));
+      m || (c(o.$$.fragment, l), l && R(() => {
+        m && (e || (e = y(t, T, { duration: S }, !0)), e.run(1));
       }), m = !0);
     },
     o(l) {
-      h(t.$$.fragment, l), l && (e || (e = S(o, A, { duration: P }, !1)), e.run(0)), m = !1;
+      g(o.$$.fragment, l), l && (e || (e = y(t, T, { duration: S }, !1)), e.run(0)), m = !1;
     },
     d(l) {
-      l && D(o), L(t), l && e && e.end();
+      l && D(t), L(o), l && e && e.end();
     }
   };
 }
 function H(r) {
-  let o, t, e, m, l;
+  let t, o, e, m, l;
   return {
     c() {
-      o = _("div"), o.textContent = "撤销", k(o, "class", "button svelte-oflaon"), $(
-        o,
+      t = _("div"), t.textContent = "撤销", k(t, "class", "button svelte-oflaon"), E(
+        t,
         "forbid",
         /*buttonState*/
-        r[4] === "start"
+        r[1] === "start"
       );
     },
     m(i, a) {
-      B(i, o, a), e = !0, m || (l = J(
-        o,
+      B(i, t, a), e = !0, m || (l = J(
+        t,
         "click",
         /*click_handler*/
-        r[13]
+        r[12]
       ), m = !0);
     },
     p(i, a) {
       r = i, (!e || a & /*buttonState*/
-      16) && $(
-        o,
+      2) && E(
+        t,
         "forbid",
         /*buttonState*/
-        r[4] === "start"
+        r[1] === "start"
       );
     },
     i(i) {
       e || (i && R(() => {
-        e && (t || (t = S(o, A, { duration: P }, !0)), t.run(1));
+        e && (o || (o = y(t, T, { duration: S }, !0)), o.run(1));
       }), e = !0);
     },
     o(i) {
-      i && (t || (t = S(o, A, { duration: P }, !1)), t.run(0)), e = !1;
+      i && (o || (o = y(t, T, { duration: S }, !1)), o.run(0)), e = !1;
     },
     d(i) {
-      i && D(o), i && t && t.end(), m = !1, l();
+      i && D(t), i && o && o.end(), m = !1, l();
     }
   };
 }
 function I(r) {
-  let o, t, e, m, l;
+  let t, o, e, m, l;
   return {
     c() {
-      o = _("div"), o.textContent = "结束", k(o, "class", "button svelte-oflaon");
+      t = _("div"), t.textContent = "结束", k(t, "class", "button svelte-oflaon");
     },
     m(i, a) {
-      B(i, o, a), e = !0, m || (l = J(
-        o,
+      B(i, t, a), e = !0, m || (l = J(
+        t,
         "click",
         /*complete*/
         r[10]
@@ -169,20 +175,20 @@ function I(r) {
     },
     i(i) {
       e || (i && R(() => {
-        e && (t || (t = S(o, A, { duration: P }, !0)), t.run(1));
+        e && (o || (o = y(t, T, { duration: S }, !0)), o.run(1));
       }), e = !0);
     },
     o(i) {
-      i && (t || (t = S(o, A, { duration: P }, !1)), t.run(0)), e = !1;
+      i && (o || (o = y(t, T, { duration: S }, !1)), o.run(0)), e = !1;
     },
     d(i) {
-      i && D(o), i && t && t.end(), m = !1, l();
+      i && D(t), i && o && o.end(), m = !1, l();
     }
   };
 }
-function re(r) {
-  let o, t, e, m, l, i, a, y, v, d, T, g;
-  t = new te({
+function te(r) {
+  let t, o, e, m, l, i, a, M, d, v, $, h;
+  o = new ee({
     props: {
       onClick: (
         /*measureController*/
@@ -190,33 +196,33 @@ function re(r) {
       )
     }
   });
-  let s = (
+  let p = (
     /*measureController*/
     r[0].allowMeasureType.length >= 2 && /*buttonState*/
-    r[4] === "start" && G(r)
-  ), p = (
+    r[1] === "start" && G(r)
+  ), s = (
     /*showButton*/
-    r[2] && H(r)
+    r[3] && H(r)
   );
-  d = new ee({
+  v = new x({
     props: {
       onClick: (
         /*func*/
-        r[14]
+        r[13]
       ),
       text: (
         /*currentMeasureType*/
-        r[1] === "area" ? (
+        r[2] === "area" ? (
           /*buttonAreaTextMap*/
           r[5][
             /*buttonState*/
-            r[4]
+            r[1]
           ]
         ) : (
           /*buttonLineTextMap*/
           r[6][
             /*buttonState*/
-            r[4]
+            r[1]
           ]
         )
       ),
@@ -224,142 +230,141 @@ function re(r) {
         /*buttonColorMap*/
         r[7][
           /*buttonState*/
-          r[4]
+          r[1]
         ]
       )
     }
   });
   let f = (
     /*showButton*/
-    r[2] && I(r)
+    r[3] && I(r)
   );
   return {
     c() {
-      o = _("div"), q(t.$$.fragment), e = E(), m = _("div"), l = _("div"), s && s.c(), i = E(), a = _("div"), p && p.c(), y = E(), v = _("div"), q(d.$$.fragment), T = E(), f && f.c(), k(v, "class", "main-button svelte-oflaon"), $(v, "forbid", !/*allowAddPoint*/
-      r[3]), k(a, "class", "controller svelte-oflaon"), k(l, "class", "center svelte-oflaon"), k(m, "class", "bottom svelte-oflaon"), k(o, "class", "Measure-Controller svelte-oflaon");
+      t = _("div"), q(o.$$.fragment), e = P(), m = _("div"), l = _("div"), p && p.c(), i = P(), a = _("div"), s && s.c(), M = P(), d = _("div"), q(v.$$.fragment), $ = P(), f && f.c(), k(d, "class", "main-button svelte-oflaon"), E(d, "forbid", !/*allowAddPoint*/
+      r[4]), k(a, "class", "controller svelte-oflaon"), k(l, "class", "center svelte-oflaon"), k(m, "class", "bottom svelte-oflaon"), k(t, "class", "Measure-Controller svelte-oflaon");
     },
     m(n, u) {
-      B(n, o, u), z(t, o, null), b(o, e), b(o, m), b(m, l), s && s.m(l, null), b(l, i), b(l, a), p && p.m(a, null), b(a, y), b(a, v), z(d, v, null), b(a, T), f && f.m(a, null), g = !0;
+      B(n, t, u), z(o, t, null), b(t, e), b(t, m), b(m, l), p && p.m(l, null), b(l, i), b(l, a), s && s.m(a, null), b(a, M), b(a, d), z(v, d, null), b(a, $), f && f.m(a, null), h = !0;
     },
     p(n, [u]) {
-      const M = {};
+      const A = {};
       u & /*measureController*/
-      1 && (M.onClick = /*measureController*/
-      n[0].disable), t.$set(M), /*measureController*/
+      1 && (A.onClick = /*measureController*/
+      n[0].disable), o.$set(A), /*measureController*/
       n[0].allowMeasureType.length >= 2 && /*buttonState*/
-      n[4] === "start" ? s ? (s.p(n, u), u & /*measureController, buttonState*/
-      17 && c(s, 1)) : (s = G(n), s.c(), c(s, 1), s.m(l, i)) : s && (j(), h(s, 1, 1, () => {
-        s = null;
-      }), K()), /*showButton*/
-      n[2] ? p ? (p.p(n, u), u & /*showButton*/
-      4 && c(p, 1)) : (p = H(n), p.c(), c(p, 1), p.m(a, y)) : p && (j(), h(p, 1, 1, () => {
+      n[1] === "start" ? p ? (p.p(n, u), u & /*measureController, buttonState*/
+      3 && c(p, 1)) : (p = G(n), p.c(), c(p, 1), p.m(l, i)) : p && (j(), g(p, 1, 1, () => {
         p = null;
+      }), K()), /*showButton*/
+      n[3] ? s ? (s.p(n, u), u & /*showButton*/
+      8 && c(s, 1)) : (s = H(n), s.c(), c(s, 1), s.m(a, M)) : s && (j(), g(s, 1, 1, () => {
+        s = null;
       }), K());
       const w = {};
       u & /*buttonState*/
-      16 && (w.onClick = /*func*/
-      n[14]), u & /*currentMeasureType, buttonState*/
-      18 && (w.text = /*currentMeasureType*/
-      n[1] === "area" ? (
+      2 && (w.onClick = /*func*/
+      n[13]), u & /*currentMeasureType, buttonState*/
+      6 && (w.text = /*currentMeasureType*/
+      n[2] === "area" ? (
         /*buttonAreaTextMap*/
         n[5][
           /*buttonState*/
-          n[4]
+          n[1]
         ]
       ) : (
         /*buttonLineTextMap*/
         n[6][
           /*buttonState*/
-          n[4]
+          n[1]
         ]
       )), u & /*buttonState*/
-      16 && (w.color = /*buttonColorMap*/
+      2 && (w.color = /*buttonColorMap*/
       n[7][
         /*buttonState*/
-        n[4]
-      ]), d.$set(w), (!g || u & /*allowAddPoint*/
-      8) && $(v, "forbid", !/*allowAddPoint*/
-      n[3]), /*showButton*/
-      n[2] ? f ? (f.p(n, u), u & /*showButton*/
-      4 && c(f, 1)) : (f = I(n), f.c(), c(f, 1), f.m(a, null)) : f && (j(), h(f, 1, 1, () => {
+        n[1]
+      ]), v.$set(w), (!h || u & /*allowAddPoint*/
+      16) && E(d, "forbid", !/*allowAddPoint*/
+      n[4]), /*showButton*/
+      n[3] ? f ? (f.p(n, u), u & /*showButton*/
+      8 && c(f, 1)) : (f = I(n), f.c(), c(f, 1), f.m(a, null)) : f && (j(), g(f, 1, 1, () => {
         f = null;
       }), K());
     },
     i(n) {
-      g || (c(t.$$.fragment, n), c(s), c(p), c(d.$$.fragment, n), c(f), g = !0);
+      h || (c(o.$$.fragment, n), c(p), c(s), c(v.$$.fragment, n), c(f), h = !0);
     },
     o(n) {
-      h(t.$$.fragment, n), h(s), h(p), h(d.$$.fragment, n), h(f), g = !1;
+      g(o.$$.fragment, n), g(p), g(s), g(v.$$.fragment, n), g(f), h = !1;
     },
     d(n) {
-      n && D(o), L(t), s && s.d(), p && p.d(), L(d), f && f.d();
+      n && D(t), L(o), p && p.d(), s && s.d(), L(v), f && f.d();
     }
   };
 }
-const P = 100;
-function ne(r, o, t) {
-  let { measureController: e } = o;
+const S = 100;
+function re(r, t, o) {
+  let { measureController: e } = t;
   const m = { start: "开始", add: "添加", end: "结束" }, l = { start: "开始", add: "添加", end: "完成" }, i = {
     start: "white",
     add: "white",
     end: "blue"
   };
-  let a = !1, y = !1, v = !0, d = "start", T = e.currentMeasureType;
-  const g = () => {
-    t(12, a = !0), e.getCurrentMode() !== "Edit" ? e.changeMode("Edit") : (t(4, d = "add"), s());
-  }, s = () => {
+  let a = !1, M = !0, d = "start", v = e.currentMeasureType;
+  const $ = () => {
+    e.getCurrentMode() !== "Edit" ? e.changeMode("Edit") : (o(1, d = "add"), h());
+  }, h = () => {
     e.controller instanceof F && e.controller.selectPoint();
   }, p = () => {
     e.controller instanceof F && e.controller.complete();
+  }, s = () => {
+    h(), u("allow");
   }, f = () => {
-    s(), M("allow");
+    o(1, d = "end");
   }, n = () => {
-    t(4, d = "end");
-  }, u = () => {
-    t(4, d = "start"), M("allow");
-  }, M = (C) => {
-    t(3, v = C === "allow");
+    o(1, d = "start"), u("allow");
+  }, u = (C) => {
+    o(4, M = C === "allow");
+  }, A = (C) => {
+    o(2, v = C);
   }, w = (C) => {
-    t(1, T = C);
-  }, N = (C) => {
-    C.isEmpty && t(4, d = "start");
+    C.isEmpty && o(1, d = "start");
   };
-  Y(() => {
-    e.hook.on("revoke", N), e.hook.on("measureTypeChange", w), e.hook.on("modeChange", u), e.hook.on("allowAddPointStateChange", M), e.hook.on("readyComplete", n), e.hook.on("complete", u);
-  }), Z(() => {
-    e.hook.off("measureTypeChange", w), e.hook.off("modeChange", u), e.hook.off("allowAddPointStateChange", M), e.hook.off("readyComplete", n), e.hook.off("complete", u);
+  X(() => {
+    e.hook.on("revoke", w), e.hook.on("measureTypeChange", A), e.hook.on("modeChange", n), e.hook.on("allowAddPointStateChange", u), e.hook.on("readyComplete", f), e.hook.on("complete", n);
+  }), Y(() => {
+    e.hook.off("measureTypeChange", A), e.hook.off("modeChange", n), e.hook.off("allowAddPointStateChange", u), e.hook.off("readyComplete", f), e.hook.off("complete", n);
   });
-  const O = () => e.revoke(), Q = () => {
-    d === "start" ? g() : d === "add" ? s() : d === "end" && f();
+  const N = () => e.revoke(), O = () => {
+    d === "start" ? $() : d === "add" ? h() : d === "end" && s();
   };
   return r.$$set = (C) => {
-    "measureController" in C && t(0, e = C.measureController);
+    "measureController" in C && o(0, e = C.measureController);
   }, r.$$.update = () => {
-    r.$$.dirty & /*currentMeasureType, isStarted*/
-    4098 && t(2, y = T === "area" && a);
+    r.$$.dirty & /*currentMeasureType, buttonState*/
+    6 && o(3, a = v === "area" && d !== "start");
   }, [
     e,
-    T,
-    y,
-    v,
     d,
+    v,
+    a,
+    M,
     m,
     l,
     i,
-    g,
-    s,
+    $,
+    h,
     p,
-    f,
-    a,
-    O,
-    Q
+    s,
+    N,
+    O
   ];
 }
-class ht extends U {
-  constructor(o) {
-    super(), V(this, o, ne, re, W, { measureController: 0 }, oe);
+class Mo extends Q {
+  constructor(t) {
+    super(), U(this, t, re, te, V, { measureController: 0 }, oe);
   }
 }
 export {
-  ht as default
+  Mo as default
 };

package/libs/PanoMeasurePlugin/Controller/EditController.d.ts

@@ -12,6 +12,7 @@ export default class EditController extends BaseController {
     /** 上一个端点位置 */
     private lastPoint;
     private pointSelector;
+    private deleteDom;
     /** 根据 intersection 更新放大镜和吸附点 */
     private onIntersectionUpdate;
     constructor(params: ControllerParams);
@@ -42,4 +43,14 @@ export default class EditController extends BaseController {
     private onCameraUpdate;
     /** 更新虚线 */
     private updateDashed;
+    private wantsTapGesture;
+    private chooseLine;
+    private chooseArea;
+    private highlightArea;
+    private unHighlightArea;
+    private highlightLines;
+    private unHighlightLines;
+    private highlightLine;
+    private deleteArea;
+    private deleteLine;
 }