@abi-software/scaffoldvuer 0.1.53 → 0.1.54-beta-4

package/src/components/TreeControls.vue

@@ -14,7 +14,7 @@
       <div class="tree-container">
         <el-tree
           ref="regionTree"
-          default-expand-all
+          :default-expanded-keys="['__r/']"
           node-key="id"
           show-checkbox
           :check-strictly="false"
@@ -123,18 +123,18 @@ export default {
   },
   created: function () {
     this.module.sceneData.geometries.forEach(zincObject => {
-      this.organsAdded(zincObject);
+      this.zincObjectAdded(zincObject);
     });
     this.module.sceneData.lines.forEach(zincObject => {
-      this.organsAdded(zincObject);
+      this.zincObjectAdded(zincObject);
     });
     this.module.sceneData.glyphsets.forEach(zincObject => {
-      this.organsAdded(zincObject);
+      this.zincObjectAdded(zincObject);
     });
     this.module.sceneData.pointsets.forEach(zincObject => {
-      this.organsAdded(zincObject);
+      this.zincObjectAdded(zincObject);
     });
-    this.module.addOrganPartAddedCallback(this.organsAdded);
+    this.module.addOrganPartAddedCallback(this.zincObjectAdded);
     this.__nodeNumbers = 1;
   },
   destroyed: function () {
@@ -194,7 +194,7 @@ export default {
       for (let i = 0; i < this.active.length; i++) {
         let item = this.active[i];
         if (item.group === data.label && 
-          ((item.regionPath === item.regionPath) || 
+          ((item.regionPath === data.regionPath) || 
           item.regionPath === undefined)) {
           return true;
         }
@@ -205,7 +205,7 @@ export default {
       for (let i = 0; i < this.hover.length; i++) {
         let item = this.hover[i];
         if (item.group === data.label && 
-          ((item.regionPath === item.regionPath) || 
+          ((item.regionPath === data.regionPath) || 
           item.regionPath === undefined)) {
           return true;
         }
@@ -213,9 +213,9 @@ export default {
       return false;
     },
     /**
-     * This is called when a new organ is read into the scene.
+     * This is called when a new zinc object is read into the scene.
      */
-    organsAdded: function (zincObject) {
+    zincObjectAdded: function (zincObject) {
       const region = zincObject.region;
       if (region) {
         const paths = region.getFullSeparatedPath();
@@ -239,36 +239,38 @@ export default {
       }
     },
     checkChanged: function (node, data) {
-      const rootRegion = this.module.scene.getRootRegion();
-      rootRegion.hideAllChildren();
-      data.checkedNodes.forEach(localNode => {
-        if (localNode.region) localNode.region.setVisibility(true);
-        if (localNode.primitives) {
-          localNode.primitives.forEach(primitive => {
-            primitive.setVisibility(true);
-          });
-        }
-      });
-      data.halfCheckedNodes.forEach(localNode => {
-        if (localNode.region) localNode.region.setVisibility(true);
-      });
+      const isRegion = node.region;
+      const isPrimitives = node.primitives;
+      const isChecked = data.checkedKeys.includes(node.id);
+      if (isRegion)
+        isChecked ? node.region.showAllPrimitives() : node.region.hideAllPrimitives();
+      if (isPrimitives)
+        node.primitives.forEach(primitive => {
+          primitive.setVisibility(isChecked);
+        });
+    },
+    updateActiveUI: function (primitives) {
+      this.active = [];
+      const list = createListFromPrimitives(primitives);
+      this.active.push(...list);
     },
     changeActiveByPrimitives: function (primitives, propagate) {
       if (primitives && primitives.length > 0) {
-        this.active = [];
-        const list = createListFromPrimitives(primitives);
-        this.active.push(...list);
+        this.updateActiveUI(primitives);
         this.$emit("object-selected", primitives, propagate);
       } else {
         this.removeActive(propagate);
       }
       this.removeHover(propagate);
     },
+    updateHoverUI: function (primitives) {
+      this.hover = [];
+      const list = createListFromPrimitives(primitives);
+      this.hover.push(...list);
+    },
     changeHoverByPrimitives: function (primitives, propagate) {
       if (primitives && primitives.length > 0) {
-        this.hover = [];
-        const list = createListFromPrimitives(primitives);
-        this.hover.push(...list);
+        this.updateHoverUI(primitives);
         this.$emit("object-hovered", primitives, propagate);
       } else {
         this.removeHover(propagate);

package/src/scripts/BaseModule.js

@@ -40,9 +40,9 @@ BaseModule.prototype.importSettings = function(settings) {
 	return false;
 }
 
-BaseModule.prototype.publishChanges = function(annotations, eventType) {
+BaseModule.prototype.publishChanges = function(annotations, eventType, zincObjects) {
   for (let i = 0; i < this.eventNotifiers.length; i++) {
-    this.eventNotifiers[i].publish(this, eventType, annotations);
+    this.eventNotifiers[i].publish(this, eventType, annotations, zincObjects);
   }
 }
 

package/src/scripts/RendererModule.js

@@ -90,6 +90,7 @@ RendererModule.prototype.getAnnotationsFromObjects = function(objects) {
 RendererModule.prototype.setHighlightedByObjects = function(
   objects, coords, propagateChanges) {
   const changed = this.graphicsHighlight.setHighlighted(objects);
+  const zincObjects = this.objectsToZincObjects(objects);
   if (propagateChanges) {
     eventType = require("./eventNotifier").EVENT_TYPE.MOVE;
     if (changed)
@@ -97,7 +98,7 @@ RendererModule.prototype.setHighlightedByObjects = function(
     const annotations = this.getAnnotationsFromObjects(objects);
     if (annotations.length > 0)
       annotations[0].coords = coords;
-    this.publishChanges(annotations, eventType);
+    this.publishChanges(annotations, eventType, zincObjects);
   }
   return changed;
 }
@@ -162,7 +163,7 @@ RendererModule.prototype.setSelectedByObjects = function(
       const annotations = this.getAnnotationsFromObjects(objects);
       if (annotations.length > 0)
         annotations[0].coords = coords;
-      this.publishChanges(annotations, eventType);
+      this.publishChanges(annotations, eventType, zincObjects);
     }
   }
   return changed;

package/src/scripts/eventNotifier.js

@@ -1,8 +1,9 @@
 const EVENT_TYPE = { ALL: 0, SELECTED: 1, HIGHLIGHTED: 2, MOVE: 3 };
 
-const SelectionEvent = function(eventTypeIn, identifiersIn) {
+const SelectionEvent = function(eventTypeIn, identifiersIn, zincObjects) {
   this.eventType = eventTypeIn;
   this.identifiers = identifiersIn;
+  this.zincObjects = zincObjects;
 }
 
 const returnFullID = function(sourceId) {
@@ -23,12 +24,12 @@ const Subscription = function(subscriberIn, callbackIn, eventType) {
     return eventType;
   }
   
-  this.notify = function(source, eventType, ids) {
+  this.notify = function(source, eventType, ids, zincObjects) {
     if (source !== subscriber && (_this.targetEventType ===  EVENT_TYPE.ALL ||
         _this.targetEventType === eventType)) {
       //should support different type of id e.g lyph, name, fmas...
       //need a function that finds all relavant ids
-      const event = new SelectionEvent(eventType, ids);
+      const event = new SelectionEvent(eventType, ids, zincObjects);
       callback(event);
     }
   }
@@ -37,9 +38,9 @@ const Subscription = function(subscriberIn, callbackIn, eventType) {
 exports.EventNotifier = function() {
   const subscriptions = [];
   
-  this.publish = function(source, eventType, id) {
+  this.publish = function(source, eventType, id, zincObjects) {
     for (let i = 0; i < subscriptions.length;i++) {
-      subscriptions[i].notify(source, eventType, id);
+      subscriptions[i].notify(source, eventType, id, zincObjects);
     }
   }
   

package/src/scripts/organsRenderer.js

@@ -474,14 +474,15 @@ const OrgansSceneData = function() {
       _this.sceneData.currentName = name;
 	  }
 
-	  this.loadOrgansFromURL = function(url, speciesName, systemName, partName, viewURL) {
+	  this.loadOrgansFromURL = function(url, speciesName, systemName, partName, viewURL, clearFirst) {
 		  if (_this.zincRenderer) {
 			  if (partName && (_this.sceneData.metaURL !== url)) {
 			      setSceneData(speciesName, systemName, partName, undefined);
 			      const name = _this.sceneData.currentName;
 			      let organScene = _this.zincRenderer.getSceneByName(name);
 			      if (organScene) {
-			    	  organScene.clearAll();
+              if (clearFirst)
+			    	    organScene.clearAll();
 			      } else {
 			    	  organScene = _this.zincRenderer.createScene(name);
 			      }
@@ -507,6 +508,36 @@ const OrgansSceneData = function() {
 			  }
 		  }
 	  }
+
+    this.loadGLTFFromURL = function(url, partName, clearFirst) {
+		  if (_this.zincRenderer) {
+			  if (partName && (_this.sceneData.metaURL !== url)) {
+			      setSceneData(undefined, undefined, partName, undefined);
+			      const name = _this.sceneData.currentName;
+			      let organScene = _this.zincRenderer.getSceneByName(name);
+			      if (organScene) {
+              if (clearFirst)
+			    	    organScene.clearAll();
+			      } else {
+			    	  organScene = _this.zincRenderer.createScene(name);
+			      }
+			      for (let i = 0; i < sceneChangedCallbacks.length;i++) {
+			    	  sceneChangedCallbacks[i](_this.sceneData);
+			      }
+  	    	  _this.sceneData.viewURL = undefined;
+			      _this.sceneData.metaURL = url;
+			      organScene.loadGLTF(url, _addOrganPartCallback(undefined, partName, false),
+              downloadCompletedCallback());
+			      _this.scene = organScene;
+			      _this.zincRenderer.setCurrentScene(organScene);
+			      _this.graphicsHighlight.reset();
+			      const zincCameraControl = organScene.getZincCameraControls();
+			      zincCameraControl.enableRaycaster(organScene, _pickingCallback(), _hoverCallback());
+			      zincCameraControl.setMouseButtonAction("AUXILIARY", "ZOOM");
+			      zincCameraControl.setMouseButtonAction("SECONDARY", "PAN");
+			  }
+		  }
+	  }
 	  	  
 	  this.alignCameraWithSelectedObject = function(transitionTime) {
 	    const objects = _this.graphicsHighlight.getSelected();
@@ -536,7 +567,7 @@ const OrgansSceneData = function() {
 			  _this.setName(settings.name);
 			  if (settings.metaURL !== undefined && settings.metaURL != "") {
 				  _this.loadOrgansFromURL(settings.metaURL, settings.species,
-					settings.system, settings.part, settings.viewURL);
+					  settings.system, settings.part, settings.viewURL, true);
 			  } else {
 				  _this.loadOrgans(settings.species, settings.system, settings.part);
 			  }

package/vue.config.js

@@ -1,3 +1,4 @@
+
 const nodeExternals = require('webpack-node-externals');
 
 module.exports = {
@@ -28,6 +29,8 @@ module.exports = {
       .end()
   },
   css: {
+    sourceMap: process.env.NODE_ENV === 'wc',
+    extract: process.env.NODE_ENV !== 'wc',
     //Import variables into all stylesheets.
     loaderOptions: {
       sass: {