Improve messages.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "physiomeportal",
-  "version": "0.3.14alpha",
+  "version": "0.3.16alpha",
   "description": "Physiome Portal",
   "main": "build/physiomeportal.js",
   "files": [
@@ -12,7 +12,7 @@
     "src/styles/dat-gui-swec.css",
     "src/styles/images/collapse.png",
     "src/styles/images/hamburger.png",
-    "src/styles/open.png",
+    "src/styles/images/open.png",
     "webpack.config.js"
   ],
   "scripts": {
@@ -60,7 +60,7 @@
     "webpack": "^4.6.0",
     "webpack-cli": "^3.3.6",
     "webpack-jquery-ui": "^2.0.1",
-    "zincjs": "^0.29.14"
+    "zincjs": "^0.29.15"
   },
   "dependencies": {}
 }

src/modules/BaseModule.js

@@ -63,8 +63,12 @@ BaseModule.prototype.publishChanges = function(annotations, eventType) {
     this.eventNotifiers[i].publish(this, eventType, annotations);
   }
   if (eventType === require("../utilities/eventNotifier").EVENT_TYPE.SELECTED) {
-	  for (var key in this.broadcastChannels) {
-		  this.broadcastChannels[key].postMessage(annotations);
+	  if (annotations && annotations[0]) {
+		  var annotation = annotations[0];	  
+		  var data = {action: "query-data", resource: annotation.data.id, data: annotation.data, sender: this.instanceName};
+		  for (var key in this.broadcastChannels) {
+			  this.broadcastChannels[key].postMessage(data);
+		  }
 	  }
   }
 }

src/modules/RendererModule.js

@@ -37,20 +37,32 @@ RendererModule.prototype.getIntersectedObject = function(intersects) {
 	return undefined;
 }
 
-RendererModule.prototype.setHighlightedByObjects = function(objects, propagateChanges) {
-  var changed = this.graphicsHighlight.setHighlighted(objects);
-  if (changed && propagateChanges) {
-    var eventType = require("../utilities/eventNotifier").EVENT_TYPE.HIGHLIGHTED;
+RendererModule.prototype.getAnnotationsFromObjects = function(objects) {
     var annotations = [];
     for (var i = 0; i < objects.length; i++) {
-    	if (objects[i].userData && objects[i].userData.userData && objects[i].userData.userData[0] !== undefined)
-    		annotations[i] = objects[i].userData.userData[0];
-    	else if (objects[i].name !== undefined) {
-	        var annotation = new (require('../utilities/annotation').annotation)();
-	        annotation.data = {species:undefined, system:undefined, part:objects[i].name, object:objects[i].userData};
-	        annotations[i] = annotation;
+    	var zincObject = objects[i].userData;
+		var annotation = undefined;
+    	if (zincObject) {
+    		if (zincObject.isGlyph) {
+    			annotation = zincObject.getGlyphset().userData ? zincObject.getGlyphset().userData[0] : undefined;
+    			if (annotation && annotation.data)
+    				annotation.data.id = objects[i].name;
+    		} else {
+    			annotation = zincObject.userData ? zincObject.userData[0] : undefined;
+    			if (annotation && annotation.data)
+    				annotation.data.id = objects[i].name;
+    		}    		
     	}
+    	annotations[i] = annotation;
     }
+	return annotations;
+}
+
+RendererModule.prototype.setHighlightedByObjects = function(objects, propagateChanges) {
+  var changed = this.graphicsHighlight.setHighlighted(objects);
+  if (changed && propagateChanges) {
+    var eventType = require("../utilities/eventNotifier").EVENT_TYPE.HIGHLIGHTED;
+    var annotations = this.getAnnotationsFromObjects(objects);
     this.publishChanges(annotations, eventType);
   }
   return changed;
@@ -60,16 +72,7 @@ RendererModule.prototype.setSelectedByObjects = function(objects, propagateChang
   var changed = this.graphicsHighlight.setSelected(objects);
   if (changed && propagateChanges) {
     var eventType = require("../utilities/eventNotifier").EVENT_TYPE.SELECTED;
-    var annotations = [];
-    for (var i = 0; i < objects.length; i++) {
-    	if (objects[i].userData && objects[i].userData.userData && objects[i].userData.userData[0] !== undefined)
-    		annotations[i] = objects[i].userData.userData[0];
-    	else if (objects[i].name !== undefined) {
-	        var annotation = new (require('../utilities/annotation').annotation)();
-	        annotation.data = {species:undefined, system:undefined, part:objects[i].name, object:objects[i].userData};
-	        annotations[i] = annotation;
-    	}
-    }
+    var annotations = this.getAnnotationsFromObjects(objects);
     this.publishChanges(annotations, eventType);
   }
   return changed;

src/modules/organsRenderer.js

@@ -446,9 +446,9 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	}
 
 	var activateAdditionalNerveMapRenderer = function() {
-    for (var i = 0; i < layoutUpdateRequiredCallbacks.length;i++) {
-      layoutUpdateRequiredCallbacks[i](false, true);
-    }
+	    for (var i = 0; i < layoutUpdateRequiredCallbacks.length;i++) {
+	      layoutUpdateRequiredCallbacks[i](false, true);
+	    }
 		// setupOrgansNerveSVG();
 	}
 
@@ -590,25 +590,14 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 		  }
 		  if (useDefautColour)
 			  modelsLoader.setGeometryColour(geometry, systemName, partName);
-		  if (systemName && partName) {
-			  var organDetails = getOrganDetails(sceneData.currentSpecies, systemName, partName);
-			  /*
-			  if (organDetails === undefined || organDetails.view == undefined)
-			  {
-				  var zincCameraControl = _this.scene.getZincCameraControls();
-				  var viewport = zincCameraControl.getCurrentViewport();
-				  zincCameraControl.setDefaultCameraSettings(viewport);
-			  }
-			  */
-			  //var annotation = new (require('../utilities/annotation').annotation)();
-			  //annotation.data = {species:sceneData.currentSpecies, system:systemName, part:partName, object:geometry};
-			  //geometry.userData = [annotation];
-		  }
 		  if (partName)
 			  _this.displayMessage(partName + " loaded.");
 		  else 
 			  _this.displayMessage("Resource loaded.");
 	  }
+	  var annotation = new (require('../utilities/annotation').annotation)();
+	  annotation.data = {species:sceneData.currentSpecies, system:systemName, part:partName, group:geometry.groupName};
+	  geometry.userData = [annotation];
   }
 
 	  /**

src/ui/OrgansViewerDialog.js

@@ -124,9 +124,11 @@ var OrgansViewerDialog = function(organsViewerIn, parentIn, options) {
 	}
 
 	var updateSpeedSlider = function() {
-		var playRate = _myInstance.module.getPlayRate();
-		organGuiControls.Speed = playRate;
-		speedSlider.updateDisplay();
+		if (speedSlider) {
+			var playRate = _myInstance.module.getPlayRate();
+			organGuiControls.Speed = playRate;
+			speedSlider.updateDisplay();
+		}
 	}
 
 	var texSliderChanged = function() {
@@ -338,8 +340,9 @@ var OrgansViewerDialog = function(organsViewerIn, parentIn, options) {
 		addUICallback();
 		_myInstance.addDatGui();
 		var control = new organsControl();
-		var controller = _myInstance.datGui.addColor(control, 'Background');
+		/* var controller = _myInstance.datGui.addColor(control, 'Background');
 		controller.onChange(organsBackGroundChanged());
+		*/
 		_myInstance.container.find("#organGui")[0]
 				.appendChild(_myInstance.datGui.domElement);
 		var resetViewButton = {
@@ -352,9 +355,11 @@ var OrgansViewerDialog = function(organsViewerIn, parentIn, options) {
 				_myInstance.module.viewAll()
 			}
 		};
+		/*
 		speedSlider = _myInstance.datGui
 				.add(organGuiControls, 'Speed', 0, 5000).step(50).onChange(
 						speedSliderChanged());
+						*/
 		_myInstance.datGui.add(resetViewButton, 'Reset View');
 		_myInstance.datGui.add(viewAllButton, 'View All');
 		organPartsGui = _myInstance.datGui.addFolder('Visibility Control');

src/utilities/annotation.js

@@ -1,4 +1,5 @@
 exports.annotation = function() {
   this.type = "anatomical";
   this.data = undefined;
+  this.isAnnotation = true;
 }