@abi-software/scaffoldvuer 0.1.56 → 0.1.57

package/src/components/TreeControls.vue

@@ -21,7 +21,7 @@
           :data="treeData"
           :default-checked-keys="['__r/']"
           :expand-on-click-node="false"
-          :renderAfterExpand="false"
+          :render-after-expand="false"
           @check="checkChanged"
         >
           <span
@@ -35,7 +35,7 @@
             @mouseover="changeHoverByNode(data, true)"
           >
             <el-color-picker
-              v-if="data.primitives"
+              v-if="data.isPrimitives"
               :class="{ 'show-picker': showColourPicker }"
               :value="getColour(data)"
               size="small"
@@ -92,13 +92,6 @@ const nameSorting = (a, b) => {
 export default {
   name: "TreeControls",
   props: {
-    /**
-     * @ignore
-     */
-    module: {
-      type: Object,
-      default: undefined,
-    },
     /**
      * Enable/disable colour picker
      */
@@ -122,22 +115,6 @@ export default {
       },
     },
   },
-  created: function () {
-    this.module.sceneData.geometries.forEach(zincObject => {
-      this.zincObjectAdded(zincObject);
-    });
-    this.module.sceneData.lines.forEach(zincObject => {
-      this.zincObjectAdded(zincObject);
-    });
-    this.module.sceneData.glyphsets.forEach(zincObject => {
-      this.zincObjectAdded(zincObject);
-    });
-    this.module.sceneData.pointsets.forEach(zincObject => {
-      this.zincObjectAdded(zincObject);
-    });
-    this.module.addOrganPartAddedCallback(this.zincObjectAdded);
-    this.__nodeNumbers = 1;
-  },
   destroyed: function () {
     this.sortedPrimitiveGroups = undefined;
   },
@@ -146,8 +123,7 @@ export default {
       //The following block prevent duplicate graphics with the same name
       for (let i = 0; i < parentContainer.length; i++) {
         if (parentContainer[i].id === item.id) {
-          if (item.primitives && parentContainer[i].primitives) {
-            parentContainer[i].primitives.push(...item.primitives);
+          if (item.isPrimitives && parentContainer[i].isPrimitives) {
             return;
           }
         }
@@ -165,10 +141,10 @@ export default {
     // '__r/'
     findOrCreateRegion: function (data, paths, prefix) {
       //check if root region has been set
-      if (!this.treeData[0].region && this.module && this.module.scene) {
-        this.treeData[0].region = this.module.scene.getRootRegion();
+      if ((this.treeData[0].regionPath === undefined) && this.$module && this.$module.scene) {
+        this.treeData[0].regionPath = "";
+        this.treeData[0].isRegion = true;
       }
-
       if (paths.length > 0) {
         const _paths = [...paths];
         let childRegion = data.children.find(
@@ -177,12 +153,12 @@ export default {
         const path = prefix + "/" + paths[0];
         const id = "__r" + path;
         if (!childRegion) {
-          const region = this.treeData[0].region.findChildFromPath(path);
           childRegion = {
             label: _paths[0],
             id: id,
             children: [],
-            region: region,
+            regionPath: path,
+            isRegion: true,
           };
           this.addTreeItem(data.children, childRegion);
         }
@@ -232,7 +208,7 @@ export default {
             const child = {
               label: zincObject.groupName,
               id: id,
-              primitives: [zincObject],
+              isPrimitives: true,
               regionPath: zincObject.region.getFullPath(),
             };
             this.addTreeItem(regionData.children, child);
@@ -241,15 +217,19 @@ export default {
       }
     },
     checkChanged: function (node, data) {
-      const isRegion = node.region;
-      const isPrimitives = node.primitives;
+      const isRegion = node.isRegion;
+      const isPrimitives = node.isPrimitives;
       const isChecked = data.checkedKeys.includes(node.id);
-      if (isRegion)
-        isChecked ? node.region.showAllPrimitives() : node.region.hideAllPrimitives();
-      if (isPrimitives)
-        node.primitives.forEach(primitive => {
+      const region = this.$module.scene.getRootRegion().findChildFromPath(node.regionPath);
+      if (isRegion) {
+        isChecked ? region.showAllPrimitives() : region.hideAllPrimitives();
+      }
+      if (isPrimitives) {
+        const primitives = region.findObjectsWithGroupName(node.label);
+        primitives.forEach(primitive => {
           primitive.setVisibility(isChecked);
         });
+      }
     },
     updateActiveUI: function (primitives) {
       this.active.length = 0;
@@ -280,27 +260,31 @@ export default {
      * Select a region by its name.
      */
     changeActiveByNames: function (names, regionPath, propagate) {
-      const rootRegion = this.module.scene.getRootRegion();
+      const rootRegion = this.$module.scene.getRootRegion();
       const targetObjects = findObjectsWithNames(rootRegion, names,
-        regionPath);
+        regionPath, true);
       this.changeActiveByPrimitives(targetObjects, propagate);
     },
     /**
      * Hover a region by its name.
      */
     changeHoverByNames: function (names, regionPath, propagate) {
-      const rootRegion = this.module.scene.getRootRegion();
+      const rootRegion = this.$module.scene.getRootRegion();
       const targetObjects = findObjectsWithNames(rootRegion, names,
-        regionPath);
+        regionPath, true);
       this.changeHoverByPrimitives(targetObjects, propagate);
     },
     changeActiveByNode: function (node, propagate) {
-      if (node.primitives)
-        this.changeActiveByPrimitives(node.primitives, propagate);
+      if (node.isPrimitives) {
+        const targetObjects = this.getZincObjectsFromNode(node, false);
+        this.changeActiveByPrimitives(targetObjects, propagate);
+      }
     },
     changeHoverByNode: function (node, propagate) {
-      if (node.primitives)
-        this.changeHoverByPrimitives(node.primitives, propagate);
+      if (node.isPrimitives) {
+        const targetObjects = this.getZincObjectsFromNode(node, false);
+        this.changeHoverByPrimitives(targetObjects, propagate);
+      }
     },
     /**
      * Unselect the current selected region.
@@ -328,8 +312,10 @@ export default {
       this.$emit("object-selected", undefined);
     },
     getColour: function (nodeData) {
+      //Do not need to check for primitives as this is checked on the template
       if (nodeData) {
-        let graphic = nodeData.primitives[0];
+        const targetObjects = this.getZincObjectsFromNode(nodeData, false);
+        let graphic = targetObjects[0];
         if (graphic) {
           let hex = graphic.getColourHex();
           if (hex) return "#" + hex;
@@ -337,19 +323,43 @@ export default {
       }
       return "#FFFFFF";
     },
+    getZincObjectsFromNode: function(node, transverse) {
+      const rootRegion = this.$module.scene.getRootRegion();
+      return findObjectsWithNames(rootRegion, node.label,
+        node.regionPath, transverse);
+    },
+    //Set this right at the beginning.
+    setModule: function (moduleIn) {
+      this.$module = moduleIn;
+      this.$module.primitiveData.geometries.forEach(zincObject => {
+        this.zincObjectAdded(zincObject);
+      });
+      this.$module.primitiveData.lines.forEach(zincObject => {
+        this.zincObjectAdded(zincObject);
+      });
+      this.$module.primitiveData.glyphsets.forEach(zincObject => {
+        this.zincObjectAdded(zincObject);
+      });
+      this.$module.primitiveData.pointsets.forEach(zincObject => {
+        this.zincObjectAdded(zincObject);
+      });
+      this.$module.addOrganPartAddedCallback(this.zincObjectAdded);
+      this.__nodeNumbers = 1;
+    },
     setColour: function (nodeData, value) {
-      if (nodeData && nodeData.primitives) {
-        nodeData.primitives.forEach(primitive => {
+      if (nodeData && nodeData.isPrimitives) {
+        const targetObjects = this.getZincObjectsFromNode(nodeData, false);
+        targetObjects.forEach(primitive => {
           let hexString = value.replace("#", "0x");
           primitive.setColourHex(hexString);
         });
       }
     },
     viewAll: function () {
-      this.module.viewAll();
+      this.$module.viewAll();
     },
     visibilityToggle: function (item, event) {
-      this.module.changeOrganPartsVisibility(item, event);
+      this.$module.changeOrganPartsVisibility(item, event);
       if (event == false) {
         if (this.activeRegion === item) {
           this.removeActive(true);
@@ -366,9 +376,15 @@ export default {
     setTreeVisibility: function(node, list) {
       let flag = false;
       if (list.includes(node.id)) flag = true;
-      if (node.region) node.region.setVisibility(flag);
-      if (node.primitives) node.primitives.forEach(primitive => primitive.setVisibility(flag))
-      if (node.children) node.children.forEach(child => this.setTreeVisibility(child, list));
+      const region = this.$module.scene.getRootRegion().findChildFromPath(node.regionPath);
+      if (node.isRegion)
+        region.setVisibility(flag);
+      if (node.isPrimitives) {
+        const primitives = region.findObjectsWithGroupName(node.label);
+        primitives.forEach(primitive => primitive.setVisibility(flag))
+      }
+      if (node.children)
+        node.children.forEach(child => this.setTreeVisibility(child, list));
     },
     checkAllKeys: function () {
       const keysList = [];

package/src/scripts/graphicsHighlight.js

@@ -60,7 +60,7 @@ exports.GraphicsHighlight = function() {
   }
   
   this.setHighlighted = function(objects) {
-    const previousHighlightedObjects = currentHighlightedObjects;
+    const previousHighlightedObjects = [...currentHighlightedObjects];
     _this.resetHighlighted();
     // Selected object cannot be highlighted
     const array = getUnmatchingObjects(objects, currentSelectedObjects);
@@ -75,9 +75,9 @@ exports.GraphicsHighlight = function() {
 
   this.setSelected = function(objects) {
     // first find highlighted object that are not selected
-    const previousHSelectedObjects = currentSelectedObjects;
+    const previousHSelectedObjects = [...currentSelectedObjects];
     const array = getUnmatchingObjects(currentHighlightedObjects, objects);
-    currentHighlightedObjects = array;
+    _this.resetHighlighted();
     _this.resetSelected();
     const fullList = getFullListOfObjects(objects);
     for (let i = 0; i < fullList.length; i++) {

package/src/scripts/organsRenderer.js

@@ -9,12 +9,15 @@ const OrgansSceneData = function() {
   this.currentSpecies  = "";
   this.metaURL = "";
   this.viewURL = "";
+  this.currentTime = 0.0;
+  this.timeVarying = false;
+}
+
+const PrimitiveData = function () {
   this.geometries = [];
   this.lines = [];
   this.glyphsets = [];
   this.pointsets = [];
-  this.currentTime = 0.0;
-  this.timeVarying = false;
 }
 
 /**
@@ -36,6 +39,7 @@ const OrgansSceneData = function() {
   const _this = this;
 	let pickerScene = undefined;
 	this.sceneData = new OrgansSceneData();
+  this.primitiveData = new PrimitiveData();
 	const timeChangedCallbacks = new Array();
 	const sceneChangedCallbacks = new Array();
   const organPartAddedCallbacks = new Array();
@@ -350,15 +354,15 @@ const OrgansSceneData = function() {
 		}
 	}
 
-	const addOrganPartToSceneData = function(zincObject) {
+	const addOrganPartToPrimitiveData = function(zincObject) {
     if (zincObject.isGeometry) {
-      _this.sceneData.geometries.push(zincObject);
+      _this.primitiveData.geometries.push(zincObject);
     } else if (zincObject.isGlyphset) {
-      _this.sceneData.glyphsets.push(zincObject);
+      _this.primitiveData.glyphsets.push(zincObject);
     } else if (zincObject.isLines) {
-      _this.sceneData.lines.push(zincObject);
+      _this.primitiveData.lines.push(zincObject);
     } else if (zincObject.isPointset) {
-      _this.sceneData.pointsets.push(zincObject);
+      _this.primitiveData.pointsets.push(zincObject);
     }
 	}
 
@@ -368,7 +372,7 @@ const OrgansSceneData = function() {
     }
     if (useDefautColour)
       modelsLoader.setGeometryColour(zincObject, systemName, partName);
-    addOrganPartToSceneData(zincObject);
+    addOrganPartToPrimitiveData(zincObject);
 		const annotation = new (require('./annotation').annotation)();
     const region = zincObject.region.getFullPath();
 		annotation.data = {species:_this.sceneData.currentSpecies, system:systemName,
@@ -458,10 +462,10 @@ const OrgansSceneData = function() {
       _this.sceneData.currentSystem = systemName;
 			_this.sceneData.currentPart = partName;
 			_this.sceneData.currentTime = 0.0;
-			_this.sceneData.geometries.splice(0);
-			_this.sceneData.lines.splice(0);
-			_this.sceneData.glyphsets.splice(0);
-			_this.sceneData.pointsets.splice(0);
+			_this.primitiveData.geometries.splice(0);
+			_this.primitiveData.lines.splice(0);
+			_this.primitiveData.glyphsets.splice(0);
+			_this.primitiveData.pointsets.splice(0);
 			_this.sceneData.timeVarying = false;
       // This is used as title
       let name = "";

package/src/scripts/utilities.js

@@ -18,14 +18,18 @@ export const extractAllIds = (item, list) => {
     item.children.forEach(child => extractAllIds(child, list));
 }
 
-export const findObjectsWithNames = (rootRegion, names, regionPath) => {
+export const findObjectsWithNames = (rootRegion, names, regionPath, transverse) => {
   let targetRegion = rootRegion;
   const targetObjects = [];
   if (regionPath)
     targetRegion = rootRegion.findChildFromPath(regionPath);
   if (targetRegion) {
-    names.forEach(name => {
-      const temp = targetRegion.findObjectsWithGroupName(name, true);
+    const isArray = Array.isArray(names);
+    let array = names;
+    if (!isArray)
+      array = [array];
+      array.forEach(name => {
+      const temp = targetRegion.findObjectsWithGroupName(name, transverse);
       targetObjects.push(...temp);
     });
   }