Merge cce1864 into cd9d896

package.json

@@ -1,6 +1,6 @@
 {
   "name": "physiomeportal",
-  "version": "0.4.22",
+  "version": "0.4.23",
   "description": "Physiome Portal",
   "main": "build/physiomeportal.js",
   "files": [
@@ -63,6 +63,6 @@
     "polyfill-array-includes": "^2.0.0",
     "query-string": "^5.1.1",
     "webpack-jquery-ui": "^2.0.1",
-    "zincjs": "^0.35.0"
+    "zincjs": "^0.36.0"
   }
 }

src/modules/RendererModule.js

@@ -49,7 +49,6 @@ RendererModule.prototype.getIntersectedObject = function(intersects) {
             intersects[i].object.userData && 
             intersects[i].object.userData.isZincObject && 
             (intersects[i].object.name || 
-            intersects[i].object.userData.isGlyph ||
             intersects[i].object.userData.isMarker))
 					return intersects[i];
 			}

src/modules/organsRenderer.js

@@ -57,13 +57,17 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	 * Used to update internal timer in scene when time slider has changed.
 	 */
 	this.updateTime = function(value) {
+    let duration = 3000;
+    if (_this.scene)
+      duration = _this.scene.getDuration();
+    var actualTime = value / 100.0 * duration;
 		if (!_this.sceneData.nerveMapIsActive) {
 			if (pickerScene)
-				pickerScene.setMorphsTime(value * 30);
+				pickerScene.setMorphsTime(actualTime);
 			if (_this.scene)
-				_this.scene.setMorphsTime(value * 30);
+				_this.scene.setMorphsTime(actualTime);
 		} else if (nerveMapScene) {
-				nerveMapScene.setMorphsTime(value * 30);
+				nerveMapScene.setMorphsTime(actualTime);
 				if (_this.sceneData.nerveMap && _this.sceneData.nerveMap.additionalReader)
 					_this.sceneData.nerveMap.additionalReader.setTime(value / 100.0);
 		}
@@ -74,15 +78,19 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	 * Update the time slider and other renderers/scenes when time has changed.
 	 */
 	var preRenderTimeUpdate = function() {
+    let duration = 3000;
+    if (_this.scene)
+      duration = _this.scene.getDuration();
 		var currentTime = _this.zincRenderer.getCurrentTime();
 		for (var i = 0; i < timeChangedCallbacks.length;i++) {
 			timeChangedCallbacks[i](currentTime);
 		}
 		if (!_this.sceneData.nerveMapIsActive && pickerScene)
 			pickerScene.setMorphsTime(currentTime);
 		if (_this.sceneData.nerveMap && _this.sceneData.nerveMap.additionalReader)
-			_this.sceneData.nerveMap.additionalReader.setTime(currentTime / 3000.0);
-		_this.sceneData.currentTime = currentTime / 30.0;
+      _this.sceneData.nerveMap.additionalReader.setTime(currentTime / 
+        duration);
+		_this.sceneData.currentTime = currentTime / duration * 100.0;
   }
 
   var postRenderSelectedCoordinatesUpdate = function() {
@@ -507,28 +515,28 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	  }
 
 	  var setSceneData = function(speciesName, systemName, partName, organsDetails) {
-	        _this.sceneData.nerveMapIsActive = false;
-	        _this.sceneData.nerveMap = undefined;
-	        _this.sceneData.metaURL = "";
-	        _this.sceneData.viewURL = "";
-	        _this.sceneData.currentSpecies = speciesName;
-	        _this.sceneData.currentSystem = systemName;
+      _this.sceneData.nerveMapIsActive = false;
+      _this.sceneData.nerveMap = undefined;
+      _this.sceneData.metaURL = "";
+      _this.sceneData.viewURL = "";
+      _this.sceneData.currentSpecies = speciesName;
+      _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.sceneData.timeVarying = false;
-	        // This is used as title
-	        var name = "";
-	        if (speciesName)
-	        	name = speciesName + "/";
-	        if (systemName)
-	        	name = systemName + "/";
-	        if (partName)
-	        	name = partName;
-	        _this.sceneData.currentName = name;
+      // This is used as title
+      var name = "";
+      if (speciesName)
+        name = speciesName + "/";
+      if (systemName)
+        name = systemName + "/";
+      if (partName)
+        name = partName;
+      _this.sceneData.currentName = name;
 	  }
 
 	  this.loadOrgansFromURL = function(url, speciesName, systemName, partName, viewURL) {

src/utilities/graphicsHighlight.js

@@ -90,17 +90,8 @@ exports.GraphicsHighlight = function() {
   var getFullListOfObjects = function(objects) {
     let fullList = [];
     for (var i = 0; i < objects.length; i++) {
-      if (objects[i].userData.isGlyphset) {
-        var children = objects[i].children;
-        for (var j = 0; j < children.length; j++) {
-          for (var k = 0; k < children[j].children.length; k++) {
-            var graphicsObject = children[j].children[k];
-            if (graphicsObject.type == "Mesh" && graphicsObject.material)
-              fullList.push(graphicsObject);
-            }
-          }
-        } else if (objects[i].material)
-          fullList.push(objects[i]);
+      if (objects[i].material)
+        fullList.push(objects[i]);
     }
     return fullList;
   }