cellbrowser 1.2.10__tar.gz → 1.2.12__tar.gz

{cellbrowser-1.2.10/src/cbPyLib/cellbrowser.egg-info → cellbrowser-1.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cellbrowser
-Version: 1.2.10
+Version: 1.2.12
 Summary: UCSC Cellbrowser, an interactive browser for single cell data. Includes converters and basic pipelines for text files, Seurat, Scanpy and Cellranger.
 Home-page: https://github.com/maximilianh/cellBrowser
 Author: Maximilian Haeussler

{cellbrowser-1.2.10 → cellbrowser-1.2.12}/src/cbPyLib/cellbrowser/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-01-28T10:22:44-0800",
- "dirty": true,
+ "date": "2025-02-14T09:13:15-0800",
+ "dirty": false,
  "error": null,
- "full-revisionid": "9c7c13d28b253ed763bd7086efb71fc484704080",
- "version": "1.2.10"
+ "full-revisionid": "5cefb922e5dbfbcb3bc1764cf085d0c834d28e6f",
+ "version": "1.2.12"
 }
 '''  # END VERSION_JSON
 

{cellbrowser-1.2.10 → cellbrowser-1.2.12}/src/cbPyLib/cellbrowser/cbWeb/js/cellBrowser.js

@@ -106,6 +106,7 @@ var cellbrowser = function() {
 
     // maximum number of distinct values that one can color on
     const MAXCOLORCOUNT = 1500;
+    const MAXLABELCOUNT = 500;
 
     // histograms show only the top X values and summarize the rest into "other"
     var HISTOCOUNT = 12;
@@ -3225,11 +3226,24 @@ var cellbrowser = function() {
         return [sel, unsel];
     }
 
+    function log2All(arr) {
+	/* take log2(x+1 of all subarrays */
+	return arr.map(subArr => 
+	    subArr.map(num => Math.log2(num + 1))
+	);
+    }
+
     function buildViolinFromValues(labelList, dataList) {
         /* make a violin plot given the labels and the values for them */
         if ("violinChart" in window)
             window.violinChart.destroy();
 
+        let log2Done = false;
+        if (db.conf.matrixArrType.includes("int")) {
+	    dataList = log2All(dataList);
+            log2Done = true;
+        }
+
         var labelLines = [];
         labelLines[0] = labelList[0].split("\n");
         labelLines[0].push(dataList[0].length);
@@ -3261,11 +3275,15 @@ var cellbrowser = function() {
         };
 
         var yLabel = null;
-        if (db.conf.unit===undefined && db.conf.matrixArrType==="Uint32")
+        if (db.conf.unit===undefined && db.conf.matrixArrType==="Uint32") {
             yLabel = "read/UMI count";
+        }
         if (db.conf.unit!==undefined)
             yLabel = db.conf.unit;
 
+        if (log2Done)
+            yLabel = "log2("+yLabel+" + 1)";
+
         if (yLabel!==null)
             optDict.scales = {
                 yAxes: [{
@@ -3313,7 +3331,7 @@ var cellbrowser = function() {
     //}
 
     function buildViolinPlot() {
-        /* create the violin plot, depending on the current selection and the violinField config */
+        /* create the violin plot at the bottom right, depending on the current selection and the violinField config */
         var exprVec = gLegend.exprVec;
         if (exprVec===undefined)
             return;
@@ -3524,9 +3542,6 @@ var cellbrowser = function() {
         // label text can be overriden by the user cart
         var labelField = db.conf.labelField;
 
-        if (! db.gLabelCoordCache )
-            db.gLabelCoordCache = {};
-
         if (clusterInfo) {
             var origLabels = [];
             var clusterMids = clusterInfo.labels;
@@ -3535,7 +3550,6 @@ var cellbrowser = function() {
                 clusterMids = clusterInfo;
             }
 
-            db.gLabelCoordCache[labelField] = clusterMids;
             for (var i = 0; i < clusterMids.length; i++) {
                 origLabels.push(clusterMids[i][2]);
             }
@@ -3555,30 +3569,27 @@ var cellbrowser = function() {
     function computeAndSetLabels(values, metaInfo) {
         /* recompute the label positions and redraw everything. Uses a cache for the label positions */
         var labelCoords;
-        if (db.gLabelCoordCache[metaInfo.label] !== undefined) {
-            labelCoords = db.gLabelCoordCache[metaInfo.label];
-        } else {
-            var coords = renderer.coords.orig;
-            var names = null;
-            if (metaInfo.type !== "float" && metaInfo.type !== "int") {
-                var names = metaInfo.ui.shortLabels;
-            }
 
-            // console.log(metaInfo);
+        var coords = renderer.coords.orig;
+        var names = null;
+        if (metaInfo.type !== "float" && metaInfo.type !== "int") {
+            var names = metaInfo.ui.shortLabels;
+        }
+
+        // console.log(metaInfo);
 
-            console.time("cluster centers");
-            var calc = renderer.calcMedian(coords, values, names, metaInfo.origVals);
+        console.time("cluster centers");
+        var calc = renderer.calcMedian(coords, values, names, metaInfo.origVals);
 
-            labelCoords = [];
-            for (var label in calc) {
-                var labelInfo = calc[label];
-                var midX = selectMedian(labelInfo[0]);
-                var midY = selectMedian(labelInfo[1]);
-                labelCoords.push([midX, midY, label]);
-            }
-            console.timeEnd("cluster centers");
-            db.gLabelCoordCache[metaInfo.label] = labelCoords;
+        labelCoords = [];
+        for (var label in calc) {
+            var labelInfo = calc[label];
+            var midX = selectMedian(labelInfo[0]);
+            var midY = selectMedian(labelInfo[1]);
+            labelCoords.push([midX, midY, label]);
         }
+        console.timeEnd("cluster centers");
+
         renderer.setLabelCoords(labelCoords);
         setLabelDropdown(metaInfo.name);
     }
@@ -3590,8 +3601,16 @@ var cellbrowser = function() {
             renderer.setShowLabels(false);
         }
         else {
-            renderer.setShowLabels(true);
             var metaInfo = db.findMetaInfo(labelField);
+            if (metaInfo.valCounts.length > MAXLABELCOUNT) {
+                let valCount = metaInfo.valCounts.length;
+                alert("Error: This field contains "+valCount+" different values. "+
+                    "The limit is "+MAXLABELCOUNT+". Too many labels overload the screen.");
+                db.conf.activeLabelField = null;
+                renderer.setShowLabels(false);
+                return;
+            }
+            renderer.setShowLabels(true);
             db.conf.activeLabelField = metaInfo.name;
 
             if (metaInfo.arr) // preloaded
@@ -6009,8 +6028,8 @@ var cellbrowser = function() {
         /* gene expression viewer: called when user changes the meta field combo box */
         var fieldId = parseInt(choice.selected.split("_")[1]);
         var metaName = db.getMetaFields()[fieldId].name;
-        debug("changed meta on gene expr view", ev);
-        buildGeneExprPlotsAddGenes([], metaName);
+        debug("changed meta on gene expr view to "+metaName, ev);
+        buildGeneExprPlotsAddGenes(null, metaName);
     }
 
     function onGeneExprGeneComboChange(ev) {
@@ -6021,7 +6040,7 @@ var cellbrowser = function() {
         buildGeneExprPlotsAddGenes([geneId], null);
     }
 
-    function promiseGene(locusStr, onProgress, metaArr, metaCount) {
+    function promiseGeneSplitByMeta(locusStr, onProgress, metaArr, metaCount) {
         /* A promise for loading the gene data and calculation average expression per meta data value.
            Resolves with a geneData object with gene-related attributes, exprMin, exprMax and dotRows.  */
         /* dotRows is an array of [cellCount, zeroPerc, avg] */
@@ -6687,7 +6706,7 @@ var cellbrowser = function() {
         for (let geneId of geneIds) {
             geneId = geneId.split("|")[0]; // internal genes sometimes can be in format ENSG-ID|geneSymbol
             if (exprData.geneIds.indexOf(geneId)===-1)
-                promises.push( promiseGene(geneId, geneExprOnProgress, exprData.metaData.arr, exprData.metaData.valCounts.length ));
+                promises.push( promiseGeneSplitByMeta(geneId, geneExprOnProgress, exprData.metaData.arr, exprData.metaData.valCounts.length ));
             else
                 alert("This gene is already on the plot");
         }
@@ -6738,7 +6757,7 @@ var cellbrowser = function() {
     function buildGeneExprPlotsAddGenes(geneIds, metaName, plotType) {
         /* build the plots for the gene expression viewer */
         // get meta field from function call or dropdown
-        if (metaName==null) {
+        if (metaName===null) {
             let metaIdx = document.getElementById("tpGeneExprMetaCombo").value.split("_")[1]; // e.g. tpMetaVal_1
             metaName = db.conf.metaFields[metaIdx].name;
         } else {
@@ -6746,18 +6765,14 @@ var cellbrowser = function() {
             chosenSetValue("tpGeneExprMetaCombo", "tpMetaVal_"+metaIdx);
         }
 
-        //if (geneIds===null) {
-            //geneIds = getById("tpGeneExprGeneCombo").value;
-        //} //else {
-           // geneIds = geneIds[0].split("+");
-        //}
-
-        //let geneIdStr = geneIds.join("|");
+        if (geneIds===null) {
+            geneIds = exprData.geneIds;
+            exprData = null;
+        }
 
         if (geneIds.length>0)
             selectizeSetValue("tpGeneExprGeneCombo", geneIds[0].split("|")[0]);
 
-
         function buildProgressBar(domId) {
             var progressDiv = $( "#"+domId );
             var progressLabel = progressDiv.children().first();
@@ -6805,7 +6820,7 @@ var cellbrowser = function() {
 
         });
 
-        //Promise.all([promiseGene(geneId, geneExprOnProgress), promiseMeta(metaName, geneExprOnProgress)]).then( function(resArr) {
+        //Promise.all([promiseGeneSplitByMeta(geneId, geneExprOnProgress), promiseMeta(metaName, geneExprOnProgress)]).then( function(resArr) {
         //    //console.log("promises are all loaded", resArr);
         //    $( '#progressBarMeta').progressbar( "value", 100); // make sure that the progress bars show "complete"
         //    $( '#progressBarExpr').progressbar( "value", 100);
@@ -7897,6 +7912,15 @@ var cellbrowser = function() {
         renderer.setLabels(newRendLabels);
     }
 
+    function onLegendHover(ev) {
+        /* mouse hovers over legend */
+        var legendId = parseInt(ev.target.id.split("_")[1]);
+        var colorIndex = gLegend.rows[legendId].intKey;
+        var legendLabel = ev.target.innerText;
+        //$("#tpLegendCheckbox_" + colorIndex).click();
+        onClusterNameHover(legendLabel, legendId, ev);
+    }
+
     function onLegendLabelClick(ev) {
     /* called when user clicks on legend entry. */
 
@@ -8297,6 +8321,7 @@ var cellbrowser = function() {
         $("#tpLegendNotNull").click( function() { legendSetCheckboxes("notNull"); } );
 
         $('.tpLegendLabel').click( onLegendLabelClick ); // clicking the legend should have the same effect as clicking the checkbox
+        $('.tpLegendLabel').on("mouseover", onLegendHover ); // hovering over the legend should have the same effect hovering over the label
         //$('.tpLegendLabel').attr( "title", "Click to select samples with this value. Shift click to select multiple values.");
         activateTooltip(".tpLegendLabel");
         activateTooltip(".tpLegendCount");
@@ -8738,7 +8763,7 @@ function onClusterNameHover(clusterName, nameIdx, ev) {
         showTooltip(ev.clientX+15, ev.clientY, labelLines.join("<br>"));
 
         // XX currently, switch off fattening if there is a difference between label/color fields
-        if (db.conf.activeLabelField==db.conf.activeColorField) {
+        if (db.conf.activeLabelField==db.conf.activeColorField && gLegend.type!=="expr") {
             var valIdx = findMetaValIndex(metaInfo, clusterName);
             drawAndFattenCluster(clusterName, valIdx);
         }

{cellbrowser-1.2.10 → cellbrowser-1.2.12}/src/cbPyLib/cellbrowser/cbWeb/js/maxPlot.js

@@ -1270,7 +1270,7 @@ function MaxPlot(div, top, left, width, height, args) {
        //return count;
     //}
 
-    function blitAll(ctx, off, pxCoords, coordColors, tileWidth, tileHeight, radius, selCells, greyIdx, fatIdx) {
+    function blitAll(ctx, off, pxCoords, coordColors, tileWidth, tileHeight, radius, selCells, greyIdx, fatIdx, colors) {
    /* blit the circles onto the main canvas, using all colors */
        var count = 0;
        var hasSelection = false;
@@ -1299,6 +1299,11 @@ function MaxPlot(div, top, left, width, height, args) {
        }
 
        if (fatIdx!==null) {
+           // do not fatten
+           //radius = radius * 2;
+           //let templates = makeCircleTemplates(radius, tileWidth, tileHeight, colors, fatIdx);
+           //let off = templates.off;
+
            for (let i = 0; i < pxCoords.length/2; i++) {
                col = coordColors[i];
                if (fatIdx!==col)
@@ -1355,7 +1360,7 @@ function MaxPlot(div, top, left, width, height, args) {
            coordColors = copyColorsOnly(origCoordColors, fatIdx, templates.nonFatImgIdx);
        }
        
-       count = blitAll(ctx, off, pxCoords, coordColors, tileWidth, tileHeight, radius, selCells, templates.greyImgIdx, fatIdx);
+       count = blitAll(ctx, off, pxCoords, coordColors, tileWidth, tileHeight, radius, selCells, templates.greyImgIdx, fatIdx, colors);
        if (origCoordColors)
             coordColors = origCoordColors;
 
@@ -1501,17 +1506,22 @@ function MaxPlot(div, top, left, width, height, args) {
            var valIdx = coordColors[i];
 
            if (fatIdx!==null) {
-               // fattening mode: fat cluster is black, all the rest is grey
+               // fattening mode: fat cluster is black, all the rest is blue
                let grey;
-               if (valIdx!==fatIdx)
+               if (valIdx!==fatIdx) {
                    grey = 0xDD;
-               else
-                   grey = 0;
-
-               cData[p] = grey;
-               cData[p+1] = grey;
-               cData[p+2] = grey;
+                   cData[p] = grey;
+                   cData[p+1] = grey;
+                   cData[p+2] = grey;
+               }
+               else {
+                   // stop all transparency, just overdraw fat blue here
+                   cData[p] = 0;
+                   cData[p+1] = 0;
+                   cData[p+2] = 255;
+               }
                cData[p+3] = 255; // no transparency... ever?
+
            } else {
                // normal colors
                var oldR = cData[p];

{cellbrowser-1.2.10 → cellbrowser-1.2.12}/src/cbPyLib/cellbrowser/cellbrowser.py

@@ -5895,7 +5895,7 @@ def cbBuildCli():
                 filtConf.append(cf)
             confFnames = filtConf
 
-            logging.debug("recursive config filenames without anything that contains old/tmp/temp/not-used/marker-recalc: %s" % confFnames)
+            logging.debug("recursive config filenames without anything that contains old/tmp/temp/not-used/orig/ignore/skip/marker-recalc: %s" % confFnames)
             for cf in confFnames:
                 logging.info("Recursive mode: processing %s" % cf)
                 build(cf, outDir, redo=options.redo)

{cellbrowser-1.2.10 → cellbrowser-1.2.12/src/cbPyLib/cellbrowser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cellbrowser
-Version: 1.2.10
+Version: 1.2.12
 Summary: UCSC Cellbrowser, an interactive browser for single cell data. Includes converters and basic pipelines for text files, Seurat, Scanpy and Cellranger.
 Home-page: https://github.com/maximilianh/cellBrowser
 Author: Maximilian Haeussler