@sjcrh/proteinpaint-server 2.92.1-0 → 2.94.0

package/dataset/termdb.test.js

@@ -45,7 +45,7 @@ var termdb_test_default = {
         // term.id is specific to this dataset, should not use literally in client/server code but always through a variable
         term: {
           id: "subcohort",
-          type: "categorical"
+          type: "multivalue"
         },
         prompt: "Select a cohort and test the plots.",
         values: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjcrh/proteinpaint-server",
-  "version": "2.92.1-0",
+  "version": "2.94.0",
   "type": "module",
   "description": "a genomics visualization tool for exploring a cohort's genotype and phenotype data",
   "main": "src/app.js",
@@ -61,7 +61,7 @@
     "@sjcrh/augen": "2.87.0",
     "@sjcrh/proteinpaint-rust": "2.84.0",
     "@sjcrh/proteinpaint-shared": "2.88.2",
-    "@sjcrh/proteinpaint-types": "2.92.1-0",
+    "@sjcrh/proteinpaint-types": "2.94.0",
     "better-sqlite3": "^9.4.1",
     "body-parser": "^1.15.2",
     "canvas": "~2.11.2",

package/routes/brainImaging.js

@@ -4,6 +4,7 @@ import { brainImagingPayload } from "#types/checkers";
 import { spawn } from "child_process";
 import { getData } from "../src/termdb.matrix.js";
 import { isNumericTerm } from "@sjcrh/proteinpaint-shared/terms.js";
+import { getColors } from "#shared/common.js";
 const api = {
   endpoint: "brainImaging",
   methods: {
@@ -63,6 +64,7 @@ async function getBrainImage(query, genomes, plane, index) {
     const selectedSampleNames = query.selectedSampleFileNames.map((s) => s.split(".nii")[0]);
     const data = await getData({ terms }, ds, q.genome);
     const divideByCat = {};
+    const uniqueOverlayTwCats = /* @__PURE__ */ new Set();
     for (const sampleName of selectedSampleNames) {
       const sampleId = ds.sampleName2Id.get(sampleName);
       const sampleData = data.samples[sampleId];
@@ -76,14 +78,16 @@ async function getBrainImage(query, genomes, plane, index) {
       }
       if (overlayTW) {
         const value = sampleData[overlayTW.$id];
-        if (value)
+        if (value) {
           overlayCategory = overlayTW.term.values?.[value.key]?.label || value.key;
+          uniqueOverlayTwCats.add(overlayCategory);
+        }
       }
       if (!divideByCat[divideCategory])
         divideByCat[divideCategory] = {};
       if (!query.legendFilter?.includes(overlayCategory)) {
         if (!divideByCat[divideCategory][overlayCategory]) {
-          let color = overlayTW?.term?.values?.[overlayCategory]?.color || "red";
+          let color = overlayTW?.term?.values?.[overlayCategory]?.color;
           if (overlayTW && isNumericTerm(overlayTW.term)) {
             const bins = data.refs.byTermId[overlayTW.$id].bins;
             color = bins.find((b) => b.label == overlayCategory).color;
@@ -96,12 +100,17 @@ async function getBrainImage(query, genomes, plane, index) {
         divideByCat[divideCategory][overlayCategory].samples.push(samplePath);
       }
     }
+    const k2c = getColors(uniqueOverlayTwCats.size);
     const lengths = [];
-    for (const dcategory in divideByCat)
+    for (const dcategory in divideByCat) {
       for (const category in divideByCat[dcategory]) {
-        const samples = divideByCat[dcategory][category].samples;
+        const overlayCat = divideByCat[dcategory][category];
+        const samples = overlayCat.samples;
         lengths.push(samples.length);
+        if (!overlayCat.color)
+          overlayCat.color = category == "default" ? "red" : k2c(category);
       }
+    }
     const maxLength = Math.max(...lengths);
     const brainImageDict = {};
     const legend = {};