Merge pull request #412 from josephhearnshaw/master

Fixed issue #401
Rothamsted · Aug 30, 2019 · 25f0079 · 25f0079
2 parents dabfa63 + e0f5734
commit 25f0079
Show file tree

Hide file tree

Showing 3 changed files with 402 additions and 391 deletions.
diff --git a/common/client-base/src/main/webapp/html/KnetMaps/javascript/knet-container.js b/common/client-base/src/main/webapp/html/KnetMaps/javascript/knet-container.js
@@ -5,6 +5,7 @@ KNETMAPS.Container = function () {
 
     var stats = KNETMAPS.Stats();
     var iteminfo = KNETMAPS.ItemInfo();
+    var conceptLegend = KNETMAPS.ConceptsLegend();
 
     var my = function () {};
 
@@ -230,6 +231,7 @@ KNETMAPS.Container = function () {
                             this.addClass('HideEle');
                             // Refresh network legend.
                             stats.updateKnetStats();
+                            conceptLegend.populateConceptLegend();
                         }
                     }
                 },
@@ -245,6 +247,7 @@ KNETMAPS.Container = function () {
                                     //ele.hide();
                                     ele.removeClass('ShowEle').addClass('HideEle');
                                     $('#infoDialog').html("");
+
                                 }
                                 if (ele.hasClass('FlaggedGene')) {
                                     $('#infoDialog').html('<font color="red">' + "Can't remove  the main Gene Concept node.</font>").show();
@@ -267,6 +270,7 @@ KNETMAPS.Container = function () {
                         }
                         // Refresh network Stats.
                         stats.updateKnetStats();
+                        conceptLegend.populateConceptLegend();
                     }
                 },
 

diff --git a/...e-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java b/...e-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java
@@ -220,6 +220,7 @@ from user gene list (Set<ONDEXConcept> userGenes) */
 				for (ONDEXConcept userGene : userGenes) {
 					if (!genes.contains(userGene)) {
 						genes.add(userGene);
+                                                geneMap.put(userGene, 0.0); // Ensure the gene is placed into the HashMap
 					}
 				}
 				log.info("Using user gene list... genes: " + genes.size());