@abi-software/scaffoldvuer 1.11.0-demo.2 → 1.11.0-demo.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.11.0-demo.2",
+  "version": "1.11.0-demo.3",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -54,7 +54,7 @@
     "vue": "^3.4.21",
     "vue-router": "^4.2.5",
     "vue3-component-svg-sprite": "^0.0.1",
-    "zincjs": "^1.14.2"
+    "zincjs": "^1.14.3"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.6.2",

package/src/App.vue

@@ -397,7 +397,7 @@ export default {
   },
   data: function () {
     return {
-      consoleOn: true,
+      consoleOn: false,
       createLinesWithNormal: false,
       url: undefined,
       input: undefined,

package/src/components/ScaffoldVuer.vue

@@ -290,7 +290,7 @@
         ref="backgroundPopover"
         :virtual-ref="backgroundIconRef"
         placement="top-start"
-        width="128"
+        width="320"
         :teleported="false"
         trigger="click"
         popper-class="background-popper non-selectable h-auto"
@@ -864,6 +864,7 @@ export default {
       viewingMode: "Exploration",
       viewingModes: {
         "Exploration": "View and explore detailed visualization of 3D scaffolds",
+        "Neuron Connection": "Discover nerve connections by selecting a nerve and viewing its associated connections",
         "Annotation": ['View feature annotations', 'Add, comment on and view feature annotations'],
       },
       openMapRef: undefined,
@@ -1041,6 +1042,11 @@ export default {
     setCheckedRegions: function (data) {
       this.checkedRegions = data;
     },
+    /**
+     * 
+     * @param nerves array of nerve names, show all nerves if empty
+     * @param processed boolean, whether unselect all checkboxes
+     */
     zoomToNerves: function (nerves, processed = false) {
       if (this.$module.scene) {
         const idsList = [];
@@ -1050,30 +1056,35 @@ export default {
           if (processed) {
             region.hideAllPrimitives();
             if (regionName === 'Nerves') {
-              const ids = nerves.reduce((acc, nerve) => {
-                const primitive = this.findObjectsWithGroupName(nerve)
-                const ids = primitive.map((object) => {
-                  object.setVisibility(true);
-                  return `${object.region.uuid}/${object.uuid}`;
-                });
-                acc.push(...ids);
-                return acc;
-              }, []);
-              idsList.push(...ids)
+              if (nerves.length) {
+                const ids = nerves.reduce((acc, nerve) => {
+                  const primitive = this.findObjectsWithGroupName(nerve)
+                  const ids = primitive.map((object) => {
+                    object.setVisibility(true);
+                    return `${object.region.uuid}/${object.uuid}`;
+                  });
+                  acc.push(...ids);
+                  return acc;
+                }, []);
+                idsList.push(...ids)
+              } else {
+                region.showAllPrimitives();
+                idsList.push(region.uuid)
+              }
             }
           } else {
             // if the checkboxes are checked previously, restore them
             const isChecked = this.checkedRegions.find(item => item.label === regionName);
             if (isChecked) {
               region.showAllPrimitives();
-              const zincObjects = region.getAllObjects();
-              const ids = zincObjects.map(object => object.region.uuid);
-              idsList.push(...ids);
+              idsList.push(region.uuid);
             }
           }
         });
-        this.fitWindow();
-        this.$refs.scaffoldTreeControls.setCheckedKeys([...new Set(idsList)], processed);
+        if (nerves.length) {
+          this.fitWindow();
+        }
+        this.$refs.scaffoldTreeControls.setCheckedKeys(idsList, processed);
       }
     },
     enableAxisDisplay: function (enable, miniaxes) {
@@ -1120,7 +1131,7 @@ export default {
             if (groupName in nervesMap) {
               foundNerves++;
               zincObject.setAnatomicalId(nervesMap[groupName]);
-              console.log(groupName, zincObject.anatomicalId, zincObject.uuid)
+              // console.log(groupName, zincObject.anatomicalId, zincObject.uuid)
             }
           } else {
             zincObject.userData.isNerves = false;
@@ -2181,6 +2192,7 @@ export default {
       if (this.$module) {
         if (modeName) {
           this.viewingMode = modeName;
+          this.setIsPickable(true);
         }
         this.clearAnnotationFeature();
         if (this.viewingMode === "Annotation") {
@@ -2197,12 +2209,12 @@ export default {
             this.addAnnotationFeature();
             this.loading = false;
           });
-        } else {
-          if (this.viewingMode === "Exploration") {
-            this.activeDrawTool = undefined;
-            this.activeDrawMode = undefined;
-            this.createData.shape = "";
-          }
+        } else if (this.viewingMode === "Exploration") {
+          this.activeDrawTool = undefined;
+          this.activeDrawMode = undefined;
+          this.createData.shape = "";
+        } else if (this.viewingMode === "Neuron Connection") {
+          this.setIsPickable(false);
         }
         if ((this.viewingMode === "Exploration") ||
           (this.viewingMode === "Annotation") &&
@@ -2236,6 +2248,16 @@ export default {
       this.tData.visible = false;
       this.tData.region = undefined;
     },
+    /**
+     * Currently will only apply to non-nerve object
+     * @param flag boolean to control whether objects pickable
+     */
+    setIsPickable: function (flag) {
+      const objects = this.$module.scene.getRootRegion().getAllObjects(true);
+      objects.forEach((zincObject) => {
+        if (!zincObject.userData.isNerves) zincObject.setIsPickable(flag);
+      });
+    },
     /**
      * 
      * @param flag boolean
@@ -2501,7 +2523,7 @@ export default {
         //this.$module.scene.createAxisDisplay(false);
         //this.$module.scene.enableAxisDisplay(true, true);
         this.isReady = true;
-        console.log(`Total ${totalNerves}, found ${foundNerves}`);
+        // console.log(`Total ${totalNerves}, found ${foundNerves}`);
         this.$nextTick(() => {
           this.restoreSettings(options);
           this.$emit("on-ready");