Merge 7e66e23 into b7a3e72

package.json

@@ -1,6 +1,6 @@
 {
   "name": "physiomeportal",
-  "version": "0.4.23",
+  "version": "0.4.24",
   "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.36.0"
+    "zincjs": "^0.36.1"
   }
 }

src/modules/organsRenderer.js

@@ -40,10 +40,10 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 	var pickerScene = undefined;
 	var nerveMapScene = undefined;
 	this.sceneData = new OrgansSceneData();
-	/** new* */
 	var timeChangedCallbacks = new Array();
 	var sceneChangedCallbacks = new Array();
-	var organPartAddedCallbacks = new Array();
+  var organPartAddedCallbacks = new Array();
+  var finishDownloadCallback = undefined;
 	var layoutUpdateRequiredCallbacks = new Array();
 	var modelsLoader = ModelsLoaderIn;
 	var _this = this;
@@ -145,6 +145,15 @@ var OrgansViewer = function(ModelsLoaderIn)  {
       organPartAddedCallbacks.push(callback);
   }
 
+  this.setFinishDownloadCallback = function(callback) {
+    if (typeof(callback === "function"))
+      finishDownloadCallback = callback;
+  }
+
+  this.unsetFinishDownloadCallback = function() {
+    finishDownloadCallback = undefined;
+  }
+
   this.getNamedObjectsToScreenCoordinates = function(name, camera) {
     var vector = new THREE.Vector3();
     vector.setFromMatrixPosition( obj.matrixWorld );
@@ -456,7 +465,9 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 			  _this.settingsChanged();
 			  _this.scene.viewAll();
 			  _this.sceneData.timeVarying = _this.scene.isTimeVarying();
-			  _this.displayMessage("All resources loaded.");
+        _this.displayMessage("All resources loaded.");
+        if (finishDownloadCallback)
+          finishDownloadCallback();
 		  }
 	  }