Changeset 36865 for gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/js

Timestamp:

2022-10-24T08:34:28+13:00 (19 months ago)

Author:

davidb

Message:

Changes after work on macrocarpa in the DL lab, testing with Safari

File:

• gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/js/av_document.js (modified) (9 diffs)

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/js/av_document.js

@@ +1 @@
+var AMC_SONG_DURATION = 30;
+
+var currentPosIsZero = true;
+var currentPosRunup  = 0;
+
+
+function AVEnsurePaused()
+{
+    if (!wavesurfer.backend.isPaused()) {   
+    $('#ws-pause-icon').hide();
+    $('#ws-play-icon' ).show();
+    $('#ws-playpause-label').html("Play");
+    }
+    
+    wavesurfer.pause();
+}
+
+function AVPlay()
+{
+    $('#ws-play-icon' ).hide();
+    $('#ws-pause-icon').show();
+    $('#ws-playpause-label').html("Pause");
+
+    if (currentPosRunup>0) {
+    var skip_amount = -1 * currentPosRunup;
+    wavesurfer.skip(skip_amount);
+    currentPosRunup = 0;    
+    }
+    
+    wavesurfer.play();
+    
+}
+
 function AVPlayPause()
 {
-    return wavesurfer.backend.isPaused() ? wavesurfer.play() : wavesurfer.pause();
+    if (wavesurfer.backend.isPaused()) {
+    AVPlay();
+    }
+    else {
+    AVEnsurePaused();
+    }
+    
+    //return wavesurfer.backend.isPaused() ? wavesurfer.play() : wavesurfer.pause();
 }
 
@@ -36 +76 @@
     // clamp to ensure >= 6.0 secs 
     var current_time = Math.max(6.0,wavesurfer.getCurrentTime());
-    
-    wavesurfer.pause();
+    var current_time_1dp = current_time.toFixed(1);
+    AVEnsurePaused();
     
     weka_segment = Math.round(current_time/3) * 3;
@@ -47 +87 @@
     form.elements["s1.arousal"].value = arousal_val;
     form.elements["s1.valence"].value = valence_val;
+
+    $('#makeRecommendationFrom-AV').html(`(@${current_time_1dp} secs: arousal=${arousal_val}, valence=${valence_val})`);
     
 
@@ -83 +125 @@
     };
 
-
+/*
     var argsFixed = {
     "a": "q",
@@ -101 +143 @@
     "excerptid" : "resultsArea"
     };
+*/
     
     var url = "https://mars.so-we-must-think.space/greenstone3/library";
+
+    $('#recommendationArea').css("cursor","wait");
+    $('#resultsAreaDiv').html("Retrieving recommendation ...");
     
     $.ajax({
@@ -109 +155 @@
     data: args
     })
-    .done(function( msg ) {
-        $('#resultsAreaDiv').html(msg);
-    //alert( "Data Saved: " + msg );
-    });
-
+    .always(function() {
+        $('#recommendationArea').css("cursor","revert");
+    })
+    .fail(function(jqXHR,textStatus) {
+        console.error( "Request failed: " + textStatus);
+    })
+    .done(function(html_result) {
+        $('#resultsAreaDiv').html(html_result);
+
+        const updated_url = new URL(window.location);
+        updated_url.searchParams.set('p.frameOffset', current_time);
+        //window.history.pushState({}, '', url + "?p.frameOffset=" + current_time);
+        //window.history.pushState({}, '', updated_url);
+        window.history.replaceState({}, '', updated_url);
+
+        
+    });
+    
     // stop submit
     return false;
 
+    // force GET method request to go ahead
     //return true;
 }
 
 
-var currentPosIsZero = true;
 
 function recommendFromStart()
@@ -140 +199 @@
 function postInitWavesurfer(wavesurfer)
 {
+    console.log("postInitWavesurfer called with wavesufer = " + wavesurfer);
+    
     wavesurfer.load(gs.variables.mp3url);
     
@@ -157 +218 @@
 
     wavesurfer.on('ready', function () {
+
+    console.log("**** wavesurfer ready()");
     
     if ('p_frameOffset' in gs.cgiParams) {
@@ -162 +225 @@
         //console.log("**** starting play @ " + frameOffset);
         //wavesurfer.play(frameOffset);
-        wavesurfer.seekTo(frameOffset/30.0);
+        //console.log("**** setting play seek @ " + frameOffset);
+        wavesurfer.seekTo(frameOffset/AMC_SONG_DURATION);
+
+        if (frameOffset>1.0) {
+        currentPosRunup = 1.0; // 1 second
+        }
     }
     });
 
 }
+
+$(document).ready(function() {
+
+    const doc_url = new URL(window.location);
+    var renderWave = doc_url.searchParams.get('renderWave');
+
+    if (renderWave && (renderWave == 1)) {
+    // showing the waveform => offer link to spectrogram
+    const sts_url = new URL(window.location);
+    sts_url.searchParams.set('renderWave', 0);
+    $('#switch-to-spectrogram').attr("href",sts_url);
+    $('#switch-to-waveform').hide();
+    }
+    else {
+    // show the spectrogram => offer link to waveform
+    
+    const stw_url = new URL(window.location);
+    stw_url.searchParams.set('renderWave', 1);
+    $('#switch-to-waveform').attr("href",stw_url);
+    $('#switch-to-spectrogram').hide();
+    }
+    
+});
+