Changeset 36963

Timestamp:

2022-11-30T17:19:14+13:00 (12 months ago)

Author:

davidb

Message:

AV values now returned for each recommendation as data attributes; function added on calculate min-max range of AV vals

Location:

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia

Files:

• etc/collectionConfig.xml (modified) (4 diffs)
• js/av_document.js (modified) (5 diffs)

gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/etc/collectionConfig.xml

@@ -132 +132 @@
           <td>
           
-          <a>
+          <a class="AVRecommendation">
         <xsl:choose>
           <xsl:when test="/page/pageResponse/collection/@name">
@@ -141 +141 @@
           </xsl:when>
         </xsl:choose>
+        <xsl:attribute name="data-arousalval"><xsl:value-of select="@arousalVal"/></xsl:attribute>
+        <xsl:attribute name="data-valenceval"><xsl:value-of select="@valenceVal"/></xsl:attribute>
+        <xsl:attribute name="data-frameoffset"><xsl:value-of select="@frameOffset"/></xsl:attribute>
+        
         <gsf:metadata name="amc.title"/>
         by <gsf:metadata name="amc.artist"/>
@@ -758 +762 @@
               </form>
               <div>
-                <div id="av-chart-div" style="height: 265px; width: 250px; float: right; display: none;">
-                  <img id="av-chart-img" width="250"
+                <div id="av-chart-div" style="height: 325px; width: 300px; float: right; display: none;">
+                  <img id="av-chart-img" width="300"
                    style="cursor: crosshair; background-colorXX: #fefefe;"
                    src="{$library_name}/sites/{$site_name}/collect/{$collName}/images/av-diagram-bw.svg" />
@@ -767 +771 @@
 
                 </div>
-                <div id="resultsAreaDiv" style="padding-top: 1rem; min-height: 265px; display: none;">
+                <div id="resultsAreaDiv" style="padding-top: 1rem; min-height: 325px; display: none;">
                   <xsl:text> </xsl:text>
                 </div>

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

@@ -88 +88 @@
 
     return submitAVRecommendation(form, arousal_val,valence_val, current_time);
+}
+
+function AVPlotRecommendations()
+{
+    var $av_recommendations = $('.AVRecommendation');
+
+    var min_arousal_val = +1.0;
+    var max_arousal_val = -1.0;
+
+    var min_valence_val = +1.0;
+    var max_valence_val = -1.0;
+
+    $av_recommendations.each(function(index_unused) {
+    var arousal_val = $(this).data("arousalval");
+    var valence_val = $(this).data("valenceval");
+
+    if (arousal_val < min_arousal_val) {
+        min_arousal_val = arousal_val;
+    }
+    if (arousal_val > max_arousal_val) {
+        max_arousal_val = arousal_val;
+    }
+
+    
+    if (valence_val < min_valence_val) {
+        min_valence_val = valence_val;
+    }
+    if (valence_val > max_valence_val) {
+        max_valence_val = valence_val;
+    }
+
+    });
+
+    console.log(`AVRecommendations Arousal limits: ${min_arousal_val} <-> ${max_arousal_val}`);
+    console.log(`AVRecommendations Valence limits: ${min_valence_val} <-> ${max_valence_val}`);
+    
 }
 
@@ -135 +171 @@
         $('#av-chart-div').show();
 
+        AVPlotRecommendations();
+        
         if (current_time) {
         const updated_url = new URL(window.location);
@@ -249 +287 @@
 var av_chart_orig_y_dim = 825;
 
-var av_chart_disp_x_dim = 250;
+var av_chart_disp_x_dim = 300; // ****
 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 display_to_av_coord(disp_x,disp_y)
+{
+    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);
+
+    return { "x": capped_av_x, "y": capped_av_y };
+}
 
 function av_chart_click(elem,e)
@@ -264 +319 @@
     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;
@@ -275 +331 @@
     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);
-    
-
+    */  
+
+    av_coord = display_to_av_coord(disp_x,disp_y);
+    var capped_av_x = av_coord.x;
+    var capped_av_y = av_coord.y;
+    
     console.log(`av x,y: (${capped_av_x},${capped_av_y})`);