A littel workaround to get manager to work witout the need of meta file.

ABI-Software · Jul 2, 2019 · 77a1de2 · 77a1de2
1 parent a88b98b
commit 77a1de2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/src/modelsLoader.js b/src/modelsLoader.js
@@ -114,8 +114,10 @@ exports.ModelsLoader = function()  {
 		xmlhttp.send();
 	}
 
-	this.initialiseLoading = function() {
+	this.initialiseLoading = function(url) {
 		if (metaFilesReady == false) {
+			if (url)
+				this.systemMetaURL = url;
 			var xmlhttp = new XMLHttpRequest();
 			xmlhttp.onreadystatechange = function() {
 			    if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {

diff --git a/src/modules/organsRenderer.js b/src/modules/organsRenderer.js
@@ -323,9 +323,13 @@ var OrgansViewer = function(ModelsLoaderIn)  {
 		  geometries[i].setVisibility(value);
 		}
 		var glyphsets = _this.scene.findGlyphsetsWithGroupName(name);
-    for (var i = 0; i < glyphsets.length; i ++ ) {
-      glyphsets[i].setVisibility(value);
-    }
+	    for (var i = 0; i < glyphsets.length; i ++ ) {
+	      glyphsets[i].setVisibility(value);
+	    }
+		var pointsets = _this.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 ++ ) {

diff --git a/src/ui/gridView.js b/src/ui/gridView.js
@@ -64,7 +64,6 @@ exports.GridView = function(containerIn) {
 				var containment = getNewItemContainer();
 				dialog.dockToContainment(containment);
 				dialogs.push(dialog);
-				updateSize();
 			}
 		}
 	}
@@ -88,12 +87,6 @@ exports.GridView = function(containerIn) {
 		removeDialog(dialog);
 	}
 
-	var resize = function() {
-		return function() {
-			updateSize();
-		}
-	}
-
 	var setup = function() {
 		parent = $(template);
 		rowElement = parent.find(".Row")[0];

diff --git a/src/utilities/manager.js b/src/utilities/manager.js
@@ -3,7 +3,7 @@ var MANAGER_ITEM_CHANGE = require("./managerItem").MANAGER_ITEM_CHANGE;
 var _ = require("lodash/lang");
 
 exports.ModuleManager = function() {
-  var ready = false;
+  var metaLoaded= false;
   var moduleCounter = 0;
   var name = "Default Manager";
   var gridView = undefined;
@@ -274,7 +274,7 @@ exports.ModuleManager = function() {
   }
 
   this.createDialog = function(module, parent, options) {
-    if (module && ready) {
+    if (module) {
       if (constructors[module.typeName]) {
         var dialog = constructors[module.typeName].dialog(module, parent, options);
         _this.manageDialog(dialog);
@@ -306,7 +306,7 @@ exports.ModuleManager = function() {
   }
 
   this.createModule = function(moduleName) {
-    if (modelsLoader && ready) {
+    if (modelsLoader) {
       var module = constructors[moduleName].module();
       if (module) {
 	      moduleCounter = moduleCounter + 1;
@@ -340,8 +340,8 @@ exports.ModuleManager = function() {
       eventNotifier.unsubscribe(subscription);
   }
 
-  this.isReady = function() {
-    return ready;
+  this.isMetaReady = function() {
+    return metaLoaded;
   }
 
   this.initialiseGridView = function(container) {
@@ -480,14 +480,17 @@ exports.ModuleManager = function() {
 
   var systemMetaReadyCallback = function() {
     return function() {
-      ready = true;
+    	metaLoaded = true;
     }
   }
+
+  this.initialiseModelsLoader = function(url) {
+	    modelsLoader.addSystemMetaIsReadyCallback(systemMetaReadyCallback());
+	    modelsLoader.initialiseLoading(url);
+  }
 
   var initialise = function() {
-    modelsLoader = new (require("../modelsLoader").ModelsLoader)();
-    modelsLoader.addSystemMetaIsReadyCallback(systemMetaReadyCallback());
-    modelsLoader.initialiseLoading();
+	modelsLoader = new (require("../modelsLoader").ModelsLoader)();
     subscription = eventNotifier.subscribe(_this, eventNotifierCallback(), undefined);
   }