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

Timestamp:

2022-11-29T22:55:42+13:00 (17 months ago)

Author:

davidb

Message:

Document view now shows an AV diagram; this commit is just prior to some code tidy up

File:

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

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

@@ -148 +148 @@
 
     $('#recommendationArea').css("cursor","wait");
+    $('#resultsAreaDiv').slideDown();
     $('#resultsAreaDiv').html("Retrieving recommendation ...");
     
@@ -162 +163 @@
     })
     .done(function(html_result) {
-        $('#resultsAreaDiv').html(html_result);
-
+        $('#resultsAreaDiv').html("<div>Recommendations:</div>"+html_result);
+        $('#av-chart-div').show();
+        
         const updated_url = new URL(window.location);
         updated_url.searchParams.set('p.frameOffset', current_time);
@@ -228 +230 @@
         wavesurfer.seekTo(frameOffset/AMC_SONG_DURATION);
 
-        if (frameOffset>1.0) {
+        console.log("av_document.js keeping 'currentPosRunup' at 0");
+        /*if (frameOffset>1.0) {
         currentPosRunup = 1.0; // 1 second
-        }
+        }*/
     }
     });
 
+}
+
+/*
+
+y-top: 146
+
+Centre: 412,443
+
+y-bot:735
+
+x-left: 120
+
+x-right 710
+
+
+Full image:
+  911 x 825 pxs
+
+
+
+  AV centre: 412,443
+  
+delta x/y: from centre: 292 <-> 298
+-1 <-> 0 <-> +1
+   295   295
+
+
+SVG:
+
+  241 x 248 
+    scaled 
+    0.26458
+
+*/
+
+var av_chart_orig_r = 295;
+
+var av_chart_orig_x_org = 412;
+var av_chart_orig_y_org = 443;
+
+var av_chart_orig_x_dim = 911;
+var av_chart_orig_y_dim = 825;
+
+var av_chart_disp_x_dim = 250;
+var av_chart_disp_x_mid = av_chart_disp_x_dim/2.0;
+
+var av_chart_scale = av_chart_orig_x_dim / av_chart_disp_x_dim;
+
+function av_chart_click(elem,e)
+{
+    var offset = $(elem).offset();
+
+    var elem_x_org = offset.left;
+    var elem_y_org = offset.top;
+
+    var disp_x = e.pageX - elem_x_org;
+    var disp_y = e.pageY - elem_y_org;
+
+    var scaled_disp_x = disp_x * av_chart_scale;
+    var scaled_disp_y = disp_y * av_chart_scale;
+
+    var orig_av_x = scaled_disp_x - av_chart_orig_x_org; 
+    var orig_av_y = -1 * (scaled_disp_y - av_chart_orig_y_org); // flip y axis
+
+    var av_x = orig_av_x / av_chart_orig_r;
+    var av_y = orig_av_y / av_chart_orig_r;
+    
+    var capped_av_x = Math.max(Math.min(av_x,1.0),-1.0);
+    var capped_av_y = Math.max(Math.min(av_y,1.0),-1.0);
+    
+
+    console.log(`av x,y: (${capped_av_x},${capped_av_y})`);
+    
 }
 
@@ -247 +323 @@
     $('#switch-to-spectrogram').attr("href",sts_url);
     $('#switch-to-waveform').hide();
+
+    $('#av-timelinebar-help').hide();
     }
     else {
@@ -255 +333 @@
     $('#switch-to-waveform').attr("href",stw_url);
     $('#switch-to-spectrogram').hide();
-    }
-    
+
+    $('#av-timelinebar-help').show();   
+    }
+
+    $('#av-chart-img').on("click",function(e) { av_chart_click(this,e) } );
 });