Added fix for marker naming bug and check for drawing gating gmm

labsyspharm · Jun 29, 2023 · 84d006d · 84d006d
1 parent f9f1423
commit 84d006d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/minerva_analysis/client/src/js/views/channelList.js b/minerva_analysis/client/src/js/views/channelList.js
@@ -131,8 +131,8 @@ class ChannelList {
 
         };
         // Draws rows in the channel list
-        _.each(this.columns, column => {
-            let channelID = column.replace(/[ ,.]/g, '').replace(/\//g, '');
+        _.each(this.columns, (column, index) => {
+            let channelID = `channel_${index}`;
             this.channelIDs[column] = channelID;
             // div for each row in channel list
             let listItemParentDiv = document.createElement("div");

diff --git a/minerva_analysis/client/src/js/views/csvGatingList.js b/minerva_analysis/client/src/js/views/csvGatingList.js
@@ -47,9 +47,11 @@ class CSVGatingList {
         this.selections[fullName] = values;
         this.sliders.get(name).value(values);
         this.eventHandler.trigger(CSVGatingList.events.GATING_BRUSH_MOVE, this.selections);
-        this.getAndDrawGatingGMM(name).then(() => {
-            this.eventHandler.trigger(CSVGatingList.events.GATING_BRUSH_END, this.selections);
-        });
+        if (!(name in this.hasGatingGMM)) {
+            this.getAndDrawGatingGMM(name).then(() => {
+                this.eventHandler.trigger(CSVGatingList.events.GATING_BRUSH_END, this.selections);
+            });
+        }
     }
 
      /**
@@ -93,8 +95,8 @@ class CSVGatingList {
         };
         // Draws rows in the gating list
         this.columns.push('Area'); // Add 'Area' to Gating List
-        _.each(this.columns, column => {
-            let channelID = column.replace(/[ ,.]/g, '').replace(/\//g, '');
+        _.each(this.columns, (column, index) => {
+            let channelID = `channel_${index}`;
             this.gatingIDs[column] = channelID;
             // div for each row in gating list
             let listItemParentDiv = document.createElement("div");