@abi-software/scaffoldvuer 1.15.1 → 1.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.15.1",
+  "version": "1.15.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -53,7 +53,7 @@
     "unplugin-vue-components": "^0.26.0",
     "vue": "^3.4.21",
     "vue-router": "^4.2.5",
-    "zincjs": "1.18.5"
+    "zincjs": "1.18.7"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.28.0",

package/src/scripts/OrgansRenderer.js

@@ -238,7 +238,7 @@ const OrgansSceneData = function() {
           id = intersectedObject.name;
         } else {
           const annotations = _this.getAnnotationsFromObjects(
-            [intersectedObject]);
+            [intersectedObject], undefined);
           if (annotations && annotations[0]) {
             id = annotations[0].data.group;
           }
@@ -267,6 +267,7 @@ const OrgansSceneData = function() {
 				],
 				intersected: intersected,
 				intersects: intersects,
+        instanceId: intersected?.instanceId ? intersected.instanceId : -1,
 			};
       const coords = { x: window_x, y: window_y };
       if (idObject.id) {
@@ -305,6 +306,7 @@ const OrgansSceneData = function() {
 					intersected ? intersected.point.y : 0,
 					intersected ? intersected.point.z : 0,
 				],
+        instanceId: intersected?.instanceId ? intersected.instanceId : -1,
 			}
       const coords = { x: window_x, y: window_y };
       if (idObject.id) {

package/src/scripts/RendererModule.js

@@ -50,7 +50,7 @@ RendererModule.prototype.getIntersectedObject = function(intersects) {
         intersect.object.userData) {
         if (intersect.object.userData.isMarker) {
           return 1;
-        } else if (intersect.object.name && 
+        } else if (intersect.object.name &&
           intersect.object.userData.isZincObject) {
           if (intersect.object.name === "_Unnamed") {
             return 3;
@@ -75,7 +75,7 @@ RendererModule.prototype.getIntersectedObject = function(intersects) {
 }
 
 
-RendererModule.prototype.getAnnotationsFromObjects = function(objects) {
+RendererModule.prototype.getAnnotationsFromObjects = function(objects, extraData) {
   const annotations = [];
   for (var i = 0; i < objects.length; i++) {
     const zincObject = objects[i].userData;
@@ -88,10 +88,13 @@ RendererModule.prototype.getAnnotationsFromObjects = function(objects) {
         }
         annotation = glyphset.userData ? glyphset.userData.annotation : undefined;
         if (annotation && annotation.data) {
-          if (objects[i].name && objects[i].name != "")
+          if (extraData && 'instanceId' in extraData) {
+            annotation.data.id = glyphset.getLabel(extraData.instanceId);
+          } else if (objects[i].name && objects[i].name != "") {
             annotation.data.id = objects[i].name;
-          else
+          } else {
             annotation.data.id = glyphset.groupName;
+          }
         }
       } else {
         annotation = zincObject.userData ? zincObject.userData.annotation : undefined;
@@ -119,7 +122,7 @@ RendererModule.prototype.setHighlightedByObjects = function(
     let eventType = EVENT_TYPE.MOVE;
     if (changed)
       eventType = EVENT_TYPE.HIGHLIGHTED;
-    const annotations = this.getAnnotationsFromObjects(objects);
+    const annotations = this.getAnnotationsFromObjects(objects, extraData);
     if (annotations.length > 0) {
       annotations[0].coords = coords;
       annotations[0].extraData = extraData;
@@ -179,7 +182,7 @@ RendererModule.prototype.setSelectedByObjects = function(
     }
     if (propagateChanges) {
       const eventType = EVENT_TYPE.SELECTED;
-      const annotations = this.getAnnotationsFromObjects(objects);
+      const annotations = this.getAnnotationsFromObjects(objects, extraData);
       if (annotations.length > 0) {
         annotations[0].coords = coords;
         annotations[0].extraData = extraData;
@@ -239,7 +242,7 @@ RendererModule.prototype.resetView = function() {
   if (this.zincRenderer)
     this.zincRenderer.resetView();
 }
-  
+
 RendererModule.prototype.viewAll = function() {
   if (this.zincRenderer)
     this.zincRenderer.viewAll();
@@ -271,10 +274,10 @@ RendererModule.prototype.getPlayRate = function(value) {
   else
     return 0.0;
 }
-  
+
   /** Initialise everything in the renderer, including the 3D renderer,
  *  and picker for the 3D renderer.
- * 
+ *
  */
 RendererModule.prototype.initialiseRenderer = function(displayAreaIn) {
   if (this.zincRenderer === undefined || this.rendererContainer === undefined) {