Merge remote-tracking branch 'upstream/gating'

labsyspharm · Dec 4, 2023 · 4df4233 · 4df4233
2 parents e5c83bb + ba12022
commit 4df4233
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/minerva_analysis/client/src/js/views/channelList.js b/minerva_analysis/client/src/js/views/channelList.js
@@ -18,14 +18,14 @@ class ChannelList {
         this.eventHandler = eventHandler;
         this.dataLayer = dataLayer;
         this.selections = [];
+        this.hasChannelGMM = {};
         this.ranges = {};
         this.sliders = new Map();
         this.image_channels = {};
         this.sel = {};
         this.currentChannels = {};
         this.rangeConnector = {};
         this.colorConnector = {};
-        this.hasChannelGMM = [];
         this.channelIDs = {};
         this.createColorPicker();
         this.container = d3.select("#channel_list");
@@ -70,8 +70,6 @@ class ChannelList {
      * @param name - the channel to set and display as selected
      */
     selectChannel(name) {
-        this.getAndDrawChannelGMM(name)
-
         let fullName = this.dataLayer.getFullChannelName(name);
         let channelIdx = imageChannels[fullName];
         let channelID = this.channelIDs[name];
@@ -692,10 +690,11 @@ class ChannelList {
  * on window resize we re-initialize (this should be better handled with an update pattern)
  */
 window.addEventListener("resize", function () {
-  const { channelList } = __minervaAnalysis;
+    const { channelList } = __minervaAnalysis;
     if (typeof channelList != "undefined" && channelList) {
-      channelList.sliders.forEach((slider, name) => {
-            d3.select('div#channel-slider_' + name).select('svg').remove();
+        channelList.sliders.forEach((slider, name) => {
+            let channelID = channelList.channelIDs[name]
+            d3.select('div#channel-slider_' + channelID).select('svg').remove();
             const channelListEl = document.getElementById("channel_list");
             if (channelListEl) {
                 const swidth = channelListEl.getBoundingClientRect().width;
@@ -704,7 +703,7 @@ window.addEventListener("resize", function () {
                     channelList.drawChannelGMM(name);
                 }
             }
-        });
+      });
     }
 });
 

diff --git a/minerva_analysis/client/src/js/views/csvGatingList.js b/minerva_analysis/client/src/js/views/csvGatingList.js
@@ -857,7 +857,8 @@ window.addEventListener("resize", () => {
     const { csv_gatingList } = __minervaAnalysis;
     if (typeof csv_gatingList != "undefined" && csv_gatingList) {
         csv_gatingList.sliders.forEach((slider, name) => {
-            d3.select('div#csv_gating-slider_' + name).select('svg').remove();
+            let gatingID = csv_gatingList.gatingIDs[name]
+            d3.select('div#csv_gating-slider_' + gatingID).select('svg').remove();
             let fullName = csv_gatingList.dataLayer.getFullChannelName(name);
             let sliderRange = [csv_gatingList.databaseDescription[fullName].min, csv_gatingList.databaseDescription[fullName].max];
             const gatingListEl = document.getElementById("csv_gating_list");