Fix: reformat long seqs

wurmlab · Oct 26, 2024 · 103b934 · 103b934
1 parent 57004bc
commit 103b934
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/public/css/app.min.css b/public/css/app.min.css
diff --git a/public/js/length_distribution.js b/public/js/length_distribution.js
@@ -96,19 +96,20 @@ class Graph {
     }
 
     tick_formatter(seq_type) {
-        var ticks = this._scale_x.ticks();
-        var prefix = d3.format('~s');
-        var suffixes = {amino_acid: 'aa', nucleic_acid: 'bp'};
-        return function (d) {
-            if (d === 0) { return ; }
-            if (_.indexOf(ticks,d) >= 0) {
-                if (suffixes[seq_type] == 'aa') {
-                    return `${d} ${suffixes[seq_type]}`;
-                } else {
-                    return `${prefix(d)}${suffixes[seq_type]}`.replace(/([a-zA-Z]+)/, ' $1');
-                }
+        const ticks = this._scale_x.ticks();
+        const prefix = d3.format('~s');
+        const suffixes = { amino_acid: 'aa', nucleic_acid: 'bp' };
+
+        return (d) => {
+            if (d === 0 || !ticks.includes(d)) return;
+
+            if (suffixes[seq_type] === 'aa') {
+                return `${d} ${suffixes[seq_type]}`;
             } else {
-                return ;
+                const formatted = prefix(d);
+                const numericPart = Math.floor(parseFloat(formatted));
+                const suffix = formatted.replace(/[0-9.]/g, '');
+                return `${numericPart} ${suffix}${suffixes[seq_type]}`;
             }
         };
     }

diff --git a/public/js/visualisation_helpers.js b/public/js/visualisation_helpers.js
@@ -38,12 +38,15 @@ export function getPrefix(str) {
  * Borrowed from Kablammo. Modified by Priyam based on https://github.com/mbostock/d3/issues/1722.
  */
 export function tick_formatter(scale, seq_type) {
-    var prefix = d3.format('~s')
-    var suffixes = {amino_acid: 'aa', nucleic_acid: 'bp'};
+    const prefix = d3.format('~s')
+    const suffixes = {amino_acid: 'aa', nucleic_acid: 'bp'};
 
     return function (d) {
-        return `${prefix(d)}${suffixes[seq_type]}`
-            .replace(/([a-zA-Z]+)/, ' $1')
+        const formatted = prefix(d);
+        const numericPart = Math.floor(parseFloat(formatted));
+        const suffix = formatted.replace(/[0-9.]/g, '');
+
+        return `${numericPart} ${suffix}${suffixes[seq_type]}`;
     };
 }
 

diff --git a/public/sequenceserver-report.min.js b/public/sequenceserver-report.min.js
diff --git a/public/sequenceserver-report.min.js.map b/public/sequenceserver-report.min.js.map
diff --git a/public/sequenceserver-search.min.js b/public/sequenceserver-search.min.js
diff --git a/public/sequenceserver-search.min.js.map b/public/sequenceserver-search.min.js.map