Merge pull request #65 from boeddeker/main

viz: select different segments with multiple clicks on self overlap regions
fgnt · Feb 15, 2024 · 9435bc2 · 9435bc2
2 parents 9f86c13 + 157f87d
commit 9435bc2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/meeteval/viz/file_server.py b/meeteval/viz/file_server.py
@@ -87,7 +87,7 @@ async def handle(self, request: web.Request):
             name, start, stop = _parse_audio_slice(name, start, stop)
             name = Path(name)
 
-            if name.suffix in ['.wav']:
+            if name.suffix in ['.wav', '.flac']:
                 data, sample_rate = soundfile.read(str(name), start=start, stop=stop)
                 data = data * 0.95 / np.amax(np.abs(data))
                 bytes = io.BytesIO()

diff --git a/meeteval/viz/visualize.js b/meeteval/viz/visualize.js
@@ -980,6 +980,7 @@ class CanvasPlot {
             this.plot.element.append("div").classed("plot-label", true).style("margin-left", this.plot.y_axis_padding + "px").text("Detailed matching");
 
             const self = this;
+            this.last_utterance_candidates_index = -1
             this.plot.element.on("click", (event) => {
                 const screenX = event.layerX;
                 const screenY = event.layerY;
@@ -996,7 +997,10 @@ class CanvasPlot {
                     const utterance_candidates = this.filtered_utterances.filter(
                         u => u.start_time < y && u.end_time > y && u.speaker === speaker && u.source === source
                     )
-                    if (utterance_candidates.length > 0) this.selectUtterance(utterance_candidates[0]);
+                    if (utterance_candidates.length > 0) {
+                        self.last_utterance_candidates_index = (self.last_utterance_candidates_index+1) % utterance_candidates.length
+                        this.selectUtterance(utterance_candidates[self.last_utterance_candidates_index]);
+                    }
                     else this.selectUtterance(null);
                 } else this.selectUtterance(null);
             })
@@ -1381,7 +1385,7 @@ class CanvasPlot {
         }
 
         formatValue(element, key, value) {
-            if (/^([a-zA-Z0-9_/.-]+\.wav)$/.test(value)) {
+            if (/^([a-zA-Z0-9_/.-]+\.(wav|flac))$/.test(value)) {
                 // Audio path: Display audio player
                 let audio = element.append("audio")
                 audio.classed("info-value", true)