Remove many of the default behaviour when an object is selected on th…

…e organs viewer.
ABI-Software · Jul 4, 2019 · ed8ddb2 · ed8ddb2
1 parent 618bae3
commit ed8ddb2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/src/modules/RendererModule.js b/src/modules/RendererModule.js
@@ -47,7 +47,7 @@ RendererModule.prototype.setHighlightedByObjects = function(objects, propagateCh
     		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};
+	        annotation.data = {species:undefined, system:undefined, part:objects[i].name, object:objects[i].userData};
 	        annotations[i] = annotation;
     	}
     }
@@ -66,7 +66,7 @@ RendererModule.prototype.setSelectedByObjects = function(objects, propagateChang
     		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};
+	        annotation.data = {species:undefined, system:undefined, part:objects[i].name, object:objects[i].userData};
 	        annotations[i] = annotation;
     	}
     }

diff --git a/src/modules/organsRenderer.js b/src/modules/organsRenderer.js
@@ -95,7 +95,7 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	humanOrgansFileMap["Cardiovascular"]["Heart"] = {
 			view: "cardiovascular/heart/heart_view.json",
 			meta: "cardiovascular/heart/animated_nerve_1.json",
-			picker: "cardiovascular/heart/picking_node_1.json",
+			//picker: "cardiovascular/heart/picking_node_1.json",
 			associateData: undefined,
 			externalLink: "https://models.cellml.org/e/bd/deforming_heart.rdf/view"};
 	humanOrgansFileMap["Cardiovascular"]["Arterial Flow"] = {
@@ -247,16 +247,7 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 		return function(intersects, window_x, window_y) {
 			var intersected = _this.getIntersectedObject(intersects);
 			if (intersected !== undefined) {
-				if (_this.scene.sceneName == "human/Cardiovascular/Heart") {
-					var id = Math.round(intersected.object.material.color.b * 255) ;
-					intersected.object.name = id.toString();
-					if (_this.toolTip !== undefined) {
-						_this.toolTip.setText("Node " + id);
-						_this.toolTip.show(window_x, window_y);
-					}
-					_this.displayMessage(intersected.object.name + " selected.");
-					_this.setSelectedByObjects([intersected.object], true);
-				} else if (intersected.object.name) {
+				if (intersected.object.name) {
 					if (_this.toolTip !== undefined) {
 						_this.toolTip.setText(intersected.object.name);
 						_this.toolTip.show(window_x, window_y);
@@ -283,19 +274,7 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 		return function(intersects, window_x, window_y) {
 			var intersected = _this.getIntersectedObject(intersects);
 			if (intersected !== undefined) {
-				if (_this.scene.sceneName == "human/Cardiovascular/Heart") {
-					var id = Math.round(intersected.object.material.color.b * 255) ;
-					// a temporary hack to put id into object name, this will be
-					// done differently
-					intersected.object.name = id.toString();
-					_this.displayArea.style.cursor = "pointer";
-					if (_this.toolTip !== undefined) {
-						_this.toolTip.setText("Node " + id);
-						_this.toolTip.show(window_x, window_y);
-					}
-					_this.setHighlightedByObjects([intersected.object], true);
-					return;
-				} else if (intersected.object.name) {
+				if (intersected.object.name) {
 				  _this.displayArea.style.cursor = "pointer";
 				  if (_this.toolTip !== undefined) {
   					_this.toolTip.setText(intersected.object.name);
@@ -619,9 +598,9 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 				  var viewport = zincCameraControl.getCurrentViewport();
 				  zincCameraControl.setDefaultCameraSettings(viewport);
 			  }
-			  var annotation = new (require('../utilities/annotation').annotation)();
-			  annotation.data = {species:sceneData.currentSpecies, system:systemName, part:partName};
-			  geometry.userData = [annotation];
+			  //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 

diff --git a/src/utilities/manager.js b/src/utilities/manager.js
@@ -8,6 +8,7 @@ exports.ModuleManager = function() {
   var name = "Default Manager";
   var gridView = undefined;
   var currentSettings = undefined;
+  this.defaultEvent = false;
   var fragmentParser = new (require("./fragmentParser").FragmentParser)();
   var constructors = new function() {
     this["Body Viewer"] = [];
@@ -234,7 +235,8 @@ exports.ModuleManager = function() {
       var managerItem = new ManagerItem();
       managerItem.setModule(moduleIn);
       moduleIn.addChangedCallback(moduleChangedCallback());
-      moduleIn.addNotifier(eventNotifier);
+      if (_this.defaultEvent)
+    	  moduleIn.addNotifier(eventNotifier);
       managerItems.push(managerItem);
       for (var i = 0; i < itemChangedCallbacks.length; i++)
         itemChangedCallbacks[i](managerItem, MANAGER_ITEM_CHANGE.ADDED);