@abi-software/scaffoldvuer 1.15.1 → 1.15.4

package/dist/scaffoldvuer.js

@@ -32283,7 +32283,7 @@ const a5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
         /* 2 */
         /***/
         (o) => {
-          o.exports = /* @__PURE__ */ JSON.parse('{"name":"zincjs","version":"1.18.5","description":"ZincJS (Web-based-Zinc-Visualisation)","main":"build/zinc.js","directories":{"doc":"docs"},"files":["package.json","LICENSE","README.md","src/*","build/zinc.js","build/zinc.frontend.js","build/zinc.js.map","webpack.config.js"],"scripts":{"build-bundle":"webpack --config webpack.frontend.js; webpack --config webpack.backend.js","build-backend":"webpack --config webpack.backend.js","test":"npm --prefix ./test install && npm --prefix ./test run test-ci","changelog":"auto-changelog -p --output CHANGELOG.md --template keepachangelog","jsdoc":"jsdoc -c jsdoc_conf.json","version":"npm run build-bundle;npm run jsdoc;npm run changelog; git add CHANGELOG.md docs","release:beta":"npm version prerelease --preid=beta; npm publish --tag beta","release:minor":"npm version minor; npm publish","release:patch":"npm version patch;  npm publish"},"repository":{"type":"git","url":"git+https://github.com/alan-wu/ZincJS.git"},"keywords":["library","webgl","3d","zincjs"],"author":"Alan Wu <alan.wu@auckland.ac.nz>","license":"MIT","bugs":{"url":"https://github.com/alan-wu/ZincJS/issues"},"homepage":"http://alan-wu.github.io/ZincJS/","devDependencies":{"@babel/core":"^7.23.9","@babel/preset-env":"^7.23.9","auto-changelog":"^2.4.0","babel-loader":"^9.1.3","babel-preset-minify":"^0.5.1","file-loader":"^6.2.0","jsdoc":"^4.0.2","raw-loader":"^4.0.2","webpack":"^5.90.3","webpack-cli":"^5.1.4","webpack-node-externals":"^3.0.0"},"dependencies":{"css-element-queries":"^1.2.2","lodash":"^4.17.19","promise-polyfill":"^8.1.3","three":"^0.130.1","three-spritetext":"1.6.2","url-loader":"^4.1.1","url-polyfill":"^1.1.7","webworkify-webpack":"^2.1.5"}}');
+          o.exports = /* @__PURE__ */ JSON.parse('{"name":"zincjs","version":"1.18.8","description":"ZincJS (Web-based-Zinc-Visualisation)","main":"build/zinc.js","directories":{"doc":"docs"},"files":["package.json","LICENSE","README.md","src/*","build/zinc.js","build/zinc.frontend.js","build/zinc.js.map","webpack.config.js"],"scripts":{"build-bundle":"webpack --config webpack.frontend.js; webpack --config webpack.backend.js","build-backend":"webpack --config webpack.backend.js","test":"npm --prefix ./test install && npm --prefix ./test run test-ci","changelog":"auto-changelog -p --output CHANGELOG.md --template keepachangelog","jsdoc":"jsdoc -c jsdoc_conf.json","version":"npm run build-bundle;npm run jsdoc;npm run changelog; git add CHANGELOG.md docs","release:beta":"npm version prerelease --preid=beta; npm publish --tag beta","release:minor":"npm version minor; npm publish","release:patch":"npm version patch;  npm publish"},"repository":{"type":"git","url":"git+https://github.com/alan-wu/ZincJS.git"},"keywords":["library","webgl","3d","zincjs"],"author":"Alan Wu <alan.wu@auckland.ac.nz>","license":"MIT","bugs":{"url":"https://github.com/alan-wu/ZincJS/issues"},"homepage":"http://alan-wu.github.io/ZincJS/","devDependencies":{"@babel/core":"^7.23.9","@babel/preset-env":"^7.23.9","auto-changelog":"^2.4.0","babel-loader":"^9.1.3","babel-preset-minify":"^0.5.1","file-loader":"^6.2.0","jsdoc":"^4.0.2","raw-loader":"^4.0.2","webpack":"^5.90.3","webpack-cli":"^5.1.4","webpack-node-externals":"^3.0.0"},"dependencies":{"css-element-queries":"^1.2.2","lodash":"^4.17.19","promise-polyfill":"^8.1.3","three":"^0.130.1","three-spritetext":"1.6.2","url-loader":"^4.1.1","url-polyfill":"^1.1.7","webworkify-webpack":"^2.1.5"}}');
         },
         /* 3 */
         /***/
@@ -33565,7 +33565,11 @@ const a5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
             }, this.setLabel = (M) => {
               M && (typeof M == "string" || M instanceof String) && (v = M, this.morph && (this.morph.name = M));
             }, this.showLabel = (M) => {
-              y && (g = y.getPosition(), this.group.remove(y.getSprite()), y.dispose(), y = void 0), v && (typeof v == "string" || v instanceof String) && (y = new (c(17)).Label(v, M), y.setPosition(g[0], g[1], g[2]), this.group.add(y.getSprite()));
+              if (y && (g = y.getPosition(), this.group.remove(y.getSprite()), y.dispose(), y = void 0), v && (typeof v == "string" || v instanceof String)) {
+                y = new (c(17)).Label(v, M), y.setPosition(g[0], g[1], g[2]);
+                var w = y.getSprite();
+                w.material.alphaTest = 0.5, w.material.transparent = !0, w.material.depthWrite = !1, this.group.add(y.getSprite());
+              }
             }, this.hideLabel = () => {
               y && (g = y.getPosition(), this.group.remove(y.getSprite()), y.dispose(), y = void 0);
             }, this.getLabel = () => v, this.getMesh = () => this.morph, this.setTransformation = (M, w, S, x) => {
@@ -33696,7 +33700,7 @@ const a5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
                 $(H);
               }
             };
-            this.showLabel = () => {
+            this.getLabel = (k) => M && M.length > k ? M[k] : void 0, this.showLabel = () => {
               for (var k = 0; k < f.length; k++) f[k].showLabel(this.morph.material ? this.morph.material.color : void 0);
             }, this.hideLabel = () => {
               for (var k = 0; k < f.length; k++) f[k].hideLabel();
@@ -40875,29 +40879,29 @@ Kt.prototype.getIntersectedObject = function(n) {
     return t > -1 || (t = e.indexOf(2), t = t > -1 ? t : e.indexOf(3)), n[t];
   }
 };
-Kt.prototype.getAnnotationsFromObjects = function(n) {
-  const e = [];
-  for (var t = 0; t < n.length; t++) {
-    const i = n[t].userData;
-    let r;
-    if (i) {
-      if (i.isGlyph || i.isGlyphset) {
-        let s = i;
-        i.isGlyph && (s = i.getGlyphset()), r = s.userData ? s.userData.annotation : void 0, r && r.data && (n[t].name && n[t].name != "" ? r.data.id = n[t].name : r.data.id = s.groupName);
+Kt.prototype.getAnnotationsFromObjects = function(n, e) {
+  const t = [];
+  for (var i = 0; i < n.length; i++) {
+    const r = n[i].userData;
+    let s;
+    if (r) {
+      if (r.isGlyph || r.isGlyphset) {
+        let o = r;
+        r.isGlyph && (o = r.getGlyphset()), s = o.userData ? o.userData.annotation : void 0, s && s.data && (e && "instanceId" in e ? s.data.id = o.getLabel(e.instanceId) : n[i].name && n[i].name != "" ? s.data.id = n[i].name : s.data.id = o.groupName);
       } else
-        r = i.userData ? i.userData.annotation : void 0, r && r.data && (r.data.id = n[t].name);
-      r && (r.data.anatomicalId = i.anatomicalId, r.data.isNerves = i.userData.isNerves, r.data.zincObject = i);
+        s = r.userData ? r.userData.annotation : void 0, s && s.data && (s.data.id = n[i].name);
+      s && (s.data.anatomicalId = r.anatomicalId, s.data.isNerves = r.userData.isNerves, s.data.zincObject = r);
     }
-    r && e.push(r);
+    s && t.push(s);
   }
-  return e;
+  return t;
 };
 Kt.prototype.setHighlightedByObjects = function(n, e, t, i) {
   const r = xp(n), s = this.graphicsHighlight.setHighlighted(n);
   if (i) {
     let o = sl.MOVE;
     s && (o = sl.HIGHLIGHTED);
-    const a = this.getAnnotationsFromObjects(n);
+    const a = this.getAnnotationsFromObjects(n, t);
     a.length > 0 && (a[0].coords = e, a[0].extraData = t), this.publishChanges(a, o, r);
   }
   return s;
@@ -40921,7 +40925,7 @@ Kt.prototype.setSelectedByObjects = function(n, e, t, i) {
   if (this.selectObjectOnPick ? r = this.graphicsHighlight.setSelected(n) : r = !0, r || this.ignorePreviousSelected) {
     const s = xp(n);
     if (this.selectObjectOnPick && this.setupLiveCoordinates(s), i) {
-      const o = sl.SELECTED, a = this.getAnnotationsFromObjects(n);
+      const o = sl.SELECTED, a = this.getAnnotationsFromObjects(n, t);
       a.length > 0 && (a[0].coords = e, a[0].extraData = t), this.publishChanges(a, o, s);
     }
   }
@@ -41076,7 +41080,8 @@ const W5 = function() {
           _ = T.name;
         else {
           const R = e.getAnnotationsFromObjects(
-            [T]
+            [T],
+            void 0
           );
           R && R[0] && (_ = R[0].data.group);
         }
@@ -41092,7 +41097,8 @@ const W5 = function() {
           C ? C.point.z : 0
         ],
         intersected: C,
-        intersects: A
+        intersects: A,
+        instanceId: C != null && C.instanceId ? C.instanceId : -1
       }, I = { x: _, y: T };
       if (R.id) {
         b.threeID = (D = R.object) == null ? void 0 : D.id, R.object.userData.isGlyph ? R.object.name ? e.setSelectedByObjects(
@@ -41120,7 +41126,8 @@ const W5 = function() {
           C ? C.point.x : 0,
           C ? C.point.y : 0,
           C ? C.point.z : 0
-        ]
+        ],
+        instanceId: C != null && C.instanceId ? C.instanceId : -1
       }, I = { x: _, y: T };
       if (R.id) {
         b.threeID = (D = R.object) == null ? void 0 : D.id, e.displayArea.style.cursor = "pointer", e.setHighlightedByObjects([R.object], I, b, !0);