GCF with MIBiG are now shown in the overview screen's heatmap

bigscape.py

@@ -3223,6 +3223,7 @@ if __name__=="__main__":
     run_data["input"]["classes"] = [{ "label": cl } for cl in classes ] # todo : colors
     run_data["input"]["bgc"] = [{ "id": clusterNames[idx], "acc": clusterNamesToGenomes[clusterNames[idx]], "class": clusterNamesToClasses[clusterNames[idx]] } for idx in inputClustersIdx]
 
+
     # update family data (convert global bgc indexes into input-only indexes)
     for network in run_data["networks"]:
         for family in network["families"]:
@@ -3232,12 +3233,13 @@ if __name__=="__main__":
                 if bgcIdx in inputClustersIdx:                    
                     new_members.append(inputClustersIdx.index(bgcIdx))
                 else: # is a mibig bgc
-                    clusterName = clusterNames[idx]
+                    clusterName = clusterNames[bgcIdx]
                     if clusterName in mibig_set:
                         mibig.append(clusterName)
             family["mibig"] = mibig
             family["members"] = new_members
 
+
     # generate overview data
     end_time = time.localtime()
     duration = int(time.mktime(end_time)) - int(time.mktime(start_time))

html_template/output/html_content/js/inchlib-1.2.0.1-satria.js

@@ -3619,7 +3619,6 @@ var InCHlib;
     var self = this;
       var i, line;
       var attrs = evt.target.attrs;
-      var row_label = self.data.nodes[evt.target.parent.attrs.id].objects[0];
       var points = attrs.points;
       var x = self._hack_round((points[0] + points[2])/2);
       var y = points[1]-0.5*self.pixels_for_leaf;
@@ -3647,8 +3646,11 @@ var InCHlib;
         self.heatmap_overlay.add(self.column_overlay);
       }
 
-      if(header !== undefined){
-          value = [row_label, header, value].join("\n");
+      if (header !== undefined){
+        value = header + "\n" + value;
+      }
+      if (self.data.nodes.hasOwnProperty(evt.target.parent.attrs.id)) {
+        value = self.data.nodes[evt.target.parent.attrs.id].objects[0] + "\n" + value;
       }
 
       var tooltip = self.objects_ref.tooltip_label.clone({x: x, y:y, id: "col_label",});

html_template/overview_html

@@ -280,10 +280,11 @@
           draw_row_ids: true,
           dendrogram: true,
           column_dendrogram: true,
+          column_metadata: true,
+          column_metadata_colors: "Greys",
           heatmap_part_width: 0.9,
           max_column_width: 15,
           fixed_row_id_size: 5,
-          alternative_data: false,
           navigation_toggle: {
             color_scale: false,
             export_button: true,
@@ -336,12 +337,12 @@
           "nodes": {},
           "feature_names": []
         },
-        "alternative_data": {
-          "feature_names": [],
-          "nodes": {}
-        },
         "column_dendrogram": {
           "nodes": {}
+        },
+        "column_metadata": {
+          "features": [[]],
+          "feature_names": ["MIBiG"]
         }
       }
       // apply GCF filtering
@@ -384,6 +385,7 @@
           var accId = run_data["input"]["accession"][run_data["input"]["bgc"][bgcId]["acc"]]["id"];
           acc_features[accId][i] += 1;
         }
+        result["column_metadata"]["features"][0].push(fam_data["mibig"].length + (fam_data["mibig"].length > 1? " hits":" hit"));
       }
       // apply Genomes filtering (only shows genomes with filtered GCFs, unless using custom newick)
       var included_accessions = [];