Merge 273753a into 70f6590

ABI-Software · Nov 5, 2019 · f8b05c0 · f8b05c0
2 parents 70f6590 + 273753a
commit f8b05c0
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 56 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "physiomeportal",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Physiome Portal",
   "main": "build/physiomeportal.js",
   "files": [
@@ -9,6 +9,8 @@
     "README.md",
     "build/physiomeportal.js",
     "build/physiomeportal.js.map",
+    "build/physiomeportal.frontend.js",
+    "build/physiomeportal.frontend.js.map",
     "src/styles/dat-gui-swec.css",
     "src/styles/images/collapse.png",
     "src/styles/images/hamburger.png",
@@ -64,6 +66,6 @@
     "polyfill-array-includes": "^2.0.0",
     "query-string": "^5.1.1",
     "webpack-jquery-ui": "^2.0.1",
-    "zincjs": "^0.32.0"
+    "zincjs": "^0.33.1"
   }
 }
diff --git a/src/modules/RendererModule.js b/src/modules/RendererModule.js
@@ -41,19 +41,19 @@ RendererModule.prototype.getAnnotationsFromObjects = function(objects) {
     var annotations = [];
     for (var i = 0; i < objects.length; i++) {
     	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;
+      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;
 }

diff --git a/src/modules/organsRenderer.js b/src/modules/organsRenderer.js
@@ -292,33 +292,33 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 			}
 		}
 	};
-
-	/**
-	 * Change visibility for parts of the current scene.
-	 */
-	var changeOrganPartsVisibility = function(name, value) {
-		var geometries = _this.scene.findGeometriesWithGroupName(name);
+
+	var changeOrganPartsVisibilityForScene = function(scene, name, value) {
+		var geometries = scene.findGeometriesWithGroupName(name);
 		for (var i = 0; i < geometries.length; i ++ ) {
 		  geometries[i].setVisibility(value);
 		}
-		var glyphsets = _this.scene.findGlyphsetsWithGroupName(name);
+		var glyphsets = scene.findGlyphsetsWithGroupName(name);
 	    for (var i = 0; i < glyphsets.length; i ++ ) {
 	      glyphsets[i].setVisibility(value);
 	    }
-		var pointsets = _this.scene.findPointsetsWithGroupName(name);
+		var pointsets = scene.findPointsetsWithGroupName(name);
 	    for (var i = 0; i < pointsets.length; i ++ ) {
 	    	pointsets[i].setVisibility(value);
-	    }
-		if (pickerScene) {
-	    geometries = pickerScene.findGeometriesWithGroupName(name);
-	    for (var i = 0; i < geometries.length; i ++ ) {
-	      geometries[i].setVisibility(value);
-	    }
-	    glyphsets = pickerScene.findGlyphsetsWithGroupName(name);
-	    for (var i = 0; i < glyphsets.length; i ++ ) {
-	      glyphsets[i].setVisibility(value);
-	    }
 		}
+		var lines = scene.findLinesWithGroupName(name);
+	    for (var i = 0; i < lines.length; i ++ ) {
+	    	lines[i].setVisibility(value);
+	    }
+	}
+
+	/**
+	 * Change visibility for parts of the current scene.
+	 */
+	var changeOrganPartsVisibility = function(name, value) {
+		changeOrganPartsVisibilityForScene(_this.scene, name, value);
+		if (pickerScene)
+			changeOrganPartsVisibilityForScene(pickerScene, name, value);
 	}
 
 	this.updateDataGeometryVisibility = function(value) {
@@ -583,28 +583,28 @@ var OrgansViewer = function(ModelsLoaderIn)  {
     return undefined;
   }
 
-  var addOrganPart = function(systemName, partName, useDefautColour, geometry) {
-	  if (geometry.groupName) {
+  var addOrganPart = function(systemName, partName, useDefautColour, zincObject) {
+	  if (zincObject.groupName) {
 		  for (var i = 0; i < organPartAddedCallbacks.length;i++) {
-			  organPartAddedCallbacks[i](geometry.groupName, _this.scene.isTimeVarying());
+			  organPartAddedCallbacks[i](zincObject.groupName, _this.scene.isTimeVarying());
 		  }
 		  if (useDefautColour)
-			  modelsLoader.setGeometryColour(geometry, systemName, partName);
-		  _this.displayMessage(geometry.groupName + " loaded.");
+			  modelsLoader.setGeometryColour(zincObject, systemName, partName);
+		  _this.displayMessage(zincObject.groupName + " loaded.");
 	  }
 	  _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];
+	  annotation.data = {species:sceneData.currentSpecies, system:systemName, part:partName, group:zincObject.groupName};
+	  zincObject.userData = [annotation];
   }
 
 	  /**
 		 * New organs geometry has been added to the scene, add UIs and make
 		 * sure the viewport is correct.
 		 */
 	  var _addOrganPartCallback = function(systemName, partName, useDefautColour) {
-	    return function(geometry) {
-	    	addOrganPart(systemName, partName, useDefautColour, geometry);
+	    return function(zincObject) {
+	    	addOrganPart(systemName, partName, useDefautColour, zincObject);
 	    }
 	  }
 
@@ -851,7 +851,9 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	          var pickerSceneName = name + "_picker_scene";
 	          pickerScene = _this.zincRenderer.getSceneByName(pickerSceneName);
 	          _this.scene.forEachGeometry(_addOrganPartCallback());
-	          _this.scene.forEachGlyphset(_addOrganPartCallback());
+			  _this.scene.forEachGlyphset(_addOrganPartCallback());
+			  _this.scene.forEachPointset(_addOrganPartCallback());
+	          _this.scene.forEachLine(_addOrganPartCallback());
 		      _this.settingsChanged();
 	        }
 	        preRenderTimeUpdate();

diff --git a/src/utilities/csg.js b/src/utilities/csg.js
@@ -93,8 +93,7 @@ exports.csg = function(sceneIn, zincRendererIn) {
       if (currentGeometry === undefined) {
         currentGeometry = zincGeometry.geometry.clone();
       } else {
-        currentGeometry.mergeMesh(zincGeometry.morph);
-        currentGeometry.mergeVertices();
+        currentGeometry.merge(zincGeometry.geometry);
       }
       getCentroid();
     } else {