@realsee/dnalogel 3.67.3 → 3.67.4

package/libs/shared-utils/three/Magnifier.d.ts

@@ -57,6 +57,10 @@ export declare class Magnifier {
         y: number;
     }): void;
     resetOffset(): void;
+    /** 更新放大镜的缩放比例 */
+    updateScale(newScale: number): void;
+    /** 更新放大镜的尺寸 */
+    updateSize(newWidth: number, newHeight?: number): void;
     render(): void;
     protected getRenderCenter(): THREE.Vector3 | {
         x: number;

package/libs/shared-utils/three/Magnifier.js

@@ -1,48 +1,48 @@
-var b = Object.defineProperty;
-var C = (r, t, e) => t in r ? b(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var n = (r, t, e) => (C(r, typeof t != "symbol" ? t + "" : t, e), e);
+var D = Object.defineProperty;
+var C = (s, t, e) => t in s ? D(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
+var r = (s, t, e) => (C(s, typeof t != "symbol" ? t + "" : t, e), e);
 import { hammerExports as w } from "../../vendor/hammerjs/hammer.js";
-import * as y from "three";
-import { Subscribe as D } from "../Subscribe.js";
-class S {
+import * as p from "three";
+import { Subscribe as R } from "../Subscribe.js";
+class L {
   constructor(t, e) {
-    n(this, "width");
-    n(this, "height");
-    n(this, "containerDom");
-    n(this, "hooks", new D());
-    n(this, "canvas", document.createElement("canvas"));
-    n(this, "config");
-    n(this, "state", { enabled: !1 });
-    n(this, "five");
-    n(this, "scale");
-    n(this, "offset", { x: 0, y: 0 });
-    n(this, "context");
-    n(this, "renderCenter", new y.Vector3());
-    n(this, "hammer");
-    n(this, "offsetRange");
-    n(this, "isPanning", !1);
-    n(this, "imageData", new ImageData(1, 1));
-    n(this, "onPanstart", () => {
+    r(this, "width");
+    r(this, "height");
+    r(this, "containerDom");
+    r(this, "hooks", new R());
+    r(this, "canvas", document.createElement("canvas"));
+    r(this, "config");
+    r(this, "state", { enabled: !1 });
+    r(this, "five");
+    r(this, "scale");
+    r(this, "offset", { x: 0, y: 0 });
+    r(this, "context");
+    r(this, "renderCenter", new p.Vector3());
+    r(this, "hammer");
+    r(this, "offsetRange");
+    r(this, "isPanning", !1);
+    r(this, "imageData", new ImageData(1, 1));
+    r(this, "onPanstart", () => {
       this.isPanning = !0, this.canvas.style.boxShadow = "0 2px 30px 0 rgba(0,0,0,0.20)";
     });
-    n(this, "onPan", (t) => {
+    r(this, "onPan", (t) => {
       if (!this.isPanning || !this.offsetRange || this.hooks.emit("wantsPanGesture", t))
         return;
-      const { translateX: i, translateY: s } = this.getPanOffset(t, this.offsetRange);
-      this.canvas.style.transform = `translate3d(${i}px, ${s}px, 100px)`;
+      const { translateX: i, translateY: h } = this.getPanOffset(t, this.offsetRange);
+      this.canvas.style.transform = `translate3d(${i}px, ${h}px, 100px)`;
     });
-    n(this, "onPanend", (t) => {
+    r(this, "onPanend", (t) => {
       if (this.isPanning = !1, this.canvas.style.boxShadow = "none", !this.offsetRange)
         return;
       const { translateX: e, translateY: i } = this.getPanOffset(t, this.offsetRange);
       this.canvas.style.transform = `translate3d(${e}px, ${i}px, 100px)`, this.offset = { x: e, y: i };
     });
-    var s, h, o, a;
+    var h, n, l, o;
     if (!t.renderer) {
       console.error("Five Render 未初始化");
       return;
     }
-    this.five = t, this.scale = (s = e == null ? void 0 : e.scale) != null ? s : 2, this.width = (h = e == null ? void 0 : e.width) != null ? h : 190, this.height = (a = (o = e == null ? void 0 : e.height) != null ? o : e == null ? void 0 : e.width) != null ? a : 190, this.config = {
+    this.five = t, this.scale = (h = e == null ? void 0 : e.scale) != null ? h : 2, this.width = (n = e == null ? void 0 : e.width) != null ? n : 190, this.height = (o = (l = e == null ? void 0 : e.height) != null ? l : e == null ? void 0 : e.width) != null ? o : 190, this.config = {
       dragEnabled: (e == null ? void 0 : e.dragEnabled) || !1,
       autoFixPCPosition: (e == null ? void 0 : e.autoFixPCPosition) || !1,
       initialPosition: (e == null ? void 0 : e.initialPosition) || { left: "0", top: "0" }
@@ -85,54 +85,107 @@ class S {
   resetOffset() {
     this.offset = { x: 0, y: 0 }, this.canvas.style.transform = "translate3d(0px, 0px, 100px)";
   }
+  /** 更新放大镜的缩放比例 */
+  updateScale(t) {
+    t > 0 && (this.scale = t);
+  }
+  /** 更新放大镜的尺寸 */
+  updateSize(t, e) {
+    if (t > 0) {
+      this.width = t, this.height = e || t;
+      const i = 1;
+      this.canvas.setAttribute("width", (this.width * i).toString()), this.canvas.setAttribute("height", (this.height * i).toString()), this.canvas.style.width = this.width + "px", this.canvas.style.height = this.height + "px";
+      const h = Math.floor(this.width * i), n = Math.floor(this.height * i);
+      this.imageData = new ImageData(h, n), this.clear();
+    }
+  }
   render() {
     if (!this.five.renderer || !this.containerDom)
       return;
-    const { scale: t, context: e, width: i, height: s } = this, h = this.five.renderer.getSize(new y.Vector2()), [o, a] = (() => {
+    const { scale: t, context: e, width: i, height: h } = this, n = this.five.renderer.getSize(new p.Vector2()), [l, o] = (() => {
       if (this.renderCenter.isVector3) {
-        const c = this.renderCenter.clone().project(this.five.camera);
-        return [(c.x + 1) / 2 * h.x, (c.y + 1) / 2 * h.y];
+        const a = this.renderCenter.clone().project(this.five.camera);
+        return [(a.x + 1) / 2 * n.x, (a.y + 1) / 2 * n.y];
       } else
-        return [this.renderCenter.x, h.y - this.renderCenter.y];
-    })(), f = 1, l = i / t, x = s / t, P = f * t, v = /* @__PURE__ */ new Map();
-    this.five.scene.traverse((c) => {
-      c.disableGetPixel === !0 && (v.set(c, c.visible), c.visible = !1);
+        return [this.renderCenter.x, n.y - this.renderCenter.y];
+    })(), c = 1, m = i / t, d = h / t, x = c * t, v = /* @__PURE__ */ new Map();
+    this.five.scene.traverse((a) => {
+      a.disableGetPixel === !0 && (v.set(a, a.visible), a.visible = !1);
     });
-    const u = this.five.getPixels(o - l / 2, a - l / 2, l, x, P);
-    v.forEach((c, p) => {
-      p.visible = c;
-    });
-    const g = Math.floor(i * f), m = Math.floor(s * f);
-    R(u, g, m), (this.imageData.width !== g || this.imageData.height !== m) && (this.imageData = new ImageData(g, m)), this.imageData.data.set(u), e.putImageData(this.imageData, 0, 0), this.canvas.style.visibility = "visible";
+    try {
+      const a = this.five.getPixels(
+        l - m / 2,
+        o - m / 2,
+        m,
+        d,
+        x
+      );
+      v.forEach((y, b) => {
+        b.visible = y;
+      });
+      const f = Math.floor(i * c), g = Math.floor(h * c), P = f * g * 4;
+      if (!a || a.length !== P) {
+        console.warn("Magnifier: Invalid pixel data", {
+          pixelsLength: a == null ? void 0 : a.length,
+          expectedLength: P,
+          imageWidth: f,
+          imageHeight: g
+        });
+        return;
+      }
+      E(a, f, g), (this.imageData.width !== f || this.imageData.height !== g) && (this.imageData = new ImageData(f, g)), this.imageData.data.length !== a.length && (console.warn("Magnifier: ImageData size mismatch", {
+        imageDataLength: this.imageData.data.length,
+        pixelsLength: a.length,
+        imageWidth: f,
+        imageHeight: g
+      }), this.imageData = new ImageData(f, g));
+      try {
+        this.imageData.data.set(a);
+      } catch (y) {
+        console.error("Magnifier: Failed to set pixel data", {
+          error: y,
+          imageDataLength: this.imageData.data.length,
+          pixelsLength: a.length,
+          imageWidth: f,
+          imageHeight: g
+        });
+        return;
+      }
+      e.putImageData(this.imageData, 0, 0), this.canvas.style.visibility = "visible";
+    } catch (a) {
+      console.error("Magnifier render error:", a), v.forEach((f, g) => {
+        g.visible = f;
+      });
+    }
   }
   getRenderCenter() {
     return this.renderCenter;
   }
   _appendTo(t) {
     if (this.resetOffset(), t.appendChild(this.canvas), !this.offsetRange) {
-      const e = this.canvas.getBoundingClientRect(), i = t.getBoundingClientRect(), s = i.right - e.right, h = i.bottom - e.bottom, o = i.left - e.left, a = i.top - e.top;
+      const e = this.canvas.getBoundingClientRect(), i = t.getBoundingClientRect(), h = i.right - e.right, n = i.bottom - e.bottom, l = i.left - e.left, o = i.top - e.top;
       this.offsetRange = {
-        min: { x: o, y: a },
-        max: { x: s, y: h }
+        min: { x: l, y: o },
+        max: { x: h, y: n }
       };
     }
   }
   autoFixPCPosition() {
     if (!this.containerDom)
       return;
-    const { width: t, height: e } = this, { clientWidth: i, clientHeight: s } = this.containerDom, [h, o, a] = (() => {
+    const { width: t, height: e } = this, { clientWidth: i, clientHeight: h } = this.containerDom, [n, l, o] = (() => {
       if (this.renderCenter.isVector3) {
-        const f = this.renderCenter.clone().project(this.five.camera);
+        const c = this.renderCenter.clone().project(this.five.camera);
         return [
           //
-          (f.x + 1) / 2 * i,
-          -(f.x - 1) / 2 * i,
-          -(f.y - 1) / 2 * s
+          (c.x + 1) / 2 * i,
+          -(c.x - 1) / 2 * i,
+          -(c.y - 1) / 2 * h
         ];
       } else
         return [this.renderCenter.x, i - this.renderCenter.x, this.renderCenter.y];
     })();
-    h < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = "90px") : a < 183 ? (this.canvas.style.top = "90px", this.canvas.style.left = -t / 2 + "px") : o < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = -t - 90 + "px") : (this.canvas.style.left = -t / 2 + "px", this.canvas.style.top = -e - 90 + "px"), this.canvas.style.transform = `translate3d(${h}px, ${a}px, 10px)`, this.offset = { x: h, y: a };
+    n < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = "90px") : o < 183 ? (this.canvas.style.top = "90px", this.canvas.style.left = -t / 2 + "px") : l < 183 ? (this.canvas.style.top = -e / 2 + "px", this.canvas.style.left = -t - 90 + "px") : (this.canvas.style.left = -t / 2 + "px", this.canvas.style.top = -e - 90 + "px"), this.canvas.style.transform = `translate3d(${n}px, ${o}px, 10px)`, this.offset = { x: n, y: o };
   }
   initStyle() {
     const t = this.canvas;
@@ -142,26 +195,48 @@ class S {
   }
   getPanOffset(t, e) {
     const {
-      min: { x: i, y: s },
-      max: { x: h, y: o }
-    } = e, a = this.offset.x + t.deltaX, f = this.offset.y + t.deltaY, l = Math.min(Math.max(a, i), h), x = Math.min(Math.max(f, s), o);
-    return { translateX: l, translateY: x };
+      min: { x: i, y: h },
+      max: { x: n, y: l }
+    } = e, o = this.offset.x + t.deltaX, c = this.offset.y + t.deltaY, m = Math.min(Math.max(o, i), n), d = Math.min(Math.max(c, h), l);
+    return { translateX: m, translateY: d };
   }
 }
-function d(r, t, e) {
-  const i = r[t], s = r[e];
-  i === void 0 || s === void 0 || (r[t] = s, r[e] = i);
+function u(s, t, e) {
+  if (!s || t < 0 || e < 0 || t >= s.length || e >= s.length) {
+    console.warn("exchange: Index out of bounds", {
+      arrayLength: s == null ? void 0 : s.length,
+      index1: t,
+      index2: e
+    });
+    return;
+  }
+  const i = s[t], h = s[e];
+  s[t] = h, s[e] = i;
 }
-function R(r, t, e) {
-  const i = e / 2;
-  for (let s = 1; s <= i; s++) {
-    const h = e - (s - 1);
+function E(s, t, e) {
+  if (!s || t <= 0 || e <= 0) {
+    console.warn("flipPixelsY: Invalid parameters", { pixelsLength: s == null ? void 0 : s.length, width: t, height: e });
+    return;
+  }
+  const i = t * e * 4;
+  if (s.length < i) {
+    console.warn("flipPixelsY: Pixel array too small", {
+      actualLength: s.length,
+      expectedLength: i,
+      width: t,
+      height: e
+    });
+    return;
+  }
+  const h = e / 2;
+  for (let n = 1; n <= h; n++) {
+    const l = e - (n - 1);
     for (let o = 1; o <= t; o++) {
-      const a = (s - 1) * t + o - 1, f = (h - 1) * t + o - 1;
-      d(r, a * 4 + 0, f * 4 + 0), d(r, a * 4 + 1, f * 4 + 1), d(r, a * 4 + 2, f * 4 + 2), d(r, a * 4 + 3, f * 4 + 3);
+      const c = (n - 1) * t + o - 1, m = (l - 1) * t + o - 1, d = c * 4, x = m * 4;
+      d + 3 < s.length && x + 3 < s.length && (u(s, d + 0, x + 0), u(s, d + 1, x + 1), u(s, d + 2, x + 2), u(s, d + 3, x + 3));
     }
   }
 }
 export {
-  S as Magnifier
+  L as Magnifier
 };

package/libs/shared-utils/three/PointSelector/utils/PointSelectorHelper.js

@@ -1,12 +1,12 @@
 var d = Object.defineProperty;
-var m = (a, i, e) => i in a ? d(a, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[i] = e;
-var t = (a, i, e) => (m(a, typeof i != "symbol" ? i + "" : i, e), e);
+var m = (l, i, e) => i in l ? d(l, i, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[i] = e;
+var t = (l, i, e) => (m(l, typeof i != "symbol" ? i + "" : i, e), e);
 import * as p from "three";
 import { Magnifier as u } from "../../Magnifier.js";
 import "../index.js";
-import { PointHelper as o } from "./PointHelper.js";
-import { Subscribe as b } from "../../../Subscribe.js";
-import { PointHelper2 as g } from "./PointHelper2.js";
+import { PointHelper as b } from "./PointHelper.js";
+import { Subscribe as g } from "../../../Subscribe.js";
+import { PointHelper2 as o } from "./PointHelper2.js";
 import "../../core/Sphere.js";
 import "../../../../vendor/animejs/lib/anime.es.js";
 import "../../../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
@@ -18,7 +18,7 @@ import "../../../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 class T {
   constructor(i, e) {
     t(this, "five");
-    t(this, "hooks", new b());
+    t(this, "hooks", new g());
     t(this, "position", null);
     t(this, "magnifier", null);
     t(this, "pointHelper", null);
@@ -33,10 +33,10 @@ class T {
       this.state.visible && (this.state.visible = !1, (i = this.pointHelper) == null || i.hide(), (e = this.magnifier) == null || e.disable(), this.five.needsRender = !0);
     });
     t(this, "updateWithIntersect", (i, e = { emitEvent: !0 }) => {
-      var s;
+      var a;
       if (!i)
         return;
-      this.abortUpdateMagnifier(), this.position = i, e.emitEvent && this.hooks.emit("intersectionUpdate", i), (s = this.pointHelper) == null || s.updateWithIntersect(i);
+      this.abortUpdateMagnifier(), this.position = i, e.emitEvent && this.hooks.emit("intersectionUpdate", i), (a = this.pointHelper) == null || a.updateWithIntersect(i);
       const r = () => {
         var n;
         return (n = this.magnifier) == null ? void 0 : n.renderWithPoint(i.point);
@@ -45,10 +45,10 @@ class T {
     });
     t(this, "abortUpdateMagnifier", () => {
     });
-    var s, n, l, h, f;
-    this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new u(i, (s = e == null ? void 0 : e.magnifierParams) != null ? s : { dragEnabled: !0 });
-    let r;
-    (e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? r = new o(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? r = new g(i) : r = e.pointHelper, this.pointHelper = r, this.group.name = "five-point-selector", this.five.scene.add(this.group), (f = this.magnifier) == null || f.appendTo((h = (l = e.container) != null ? l : (n = i.getElement()) == null ? void 0 : n.parentElement) != null ? h : document.body);
+    var a, n, s, h, f;
+    this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new u(i, (a = e == null ? void 0 : e.magnifierParams) != null ? a : { dragEnabled: !0 });
+    let r = null;
+    (e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? r = new b(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? r = new o(i) : (e == null ? void 0 : e.pointHelper) === null ? r = null : r = e.pointHelper, this.pointHelper = r, this.group.name = "five-point-selector", this.five.scene.add(this.group), (f = this.magnifier) == null || f.appendTo((h = (s = e.container) != null ? s : (n = i.getElement()) == null ? void 0 : n.parentElement) != null ? h : document.body);
   }
   enable() {
     var i;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.67.3",
+  "version": "3.67.4",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",
@@ -95,4 +95,4 @@
     "vite": "4.3.2",
     "vite-plugin-dts": "^2.3.0"
   }
-}
+}