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

Timestamp:

2022-12-15T11:22:13+13:00 (17 months ago)

Author:

davidb

Message:

Some debugging work around treatment of AV values; Some initial work in moving the AV-chart to a main central area, rather than being part of the AV-Recommendation area

File:

• gs3-installations/mars/trunk/sites/mars/collect/amc-essentia/etc/collectionConfig.xml (modified) (9 diffs)

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

@@ -157 +157 @@
         <xsl:otherwise>
           <td valign="top">
-        <gsf:link type="document">
+        <gsf:link type="document" extraLinkArgs="renderWave=0">
           <gsf:icon type="document"/>
         </gsf:link>
@@ -163 +163 @@
           <td>
           
-        <gsf:link type="document">
+        <gsf:link type="document" extraLinkArgs="renderWave=0">
               <gsf:metadata name="amc.title"/>
           by <gsf:metadata name="amc.artist"/>
@@ -326 +326 @@
             <gsf:template match="documentNode">
                 <td valign="top">
-                    <gsf:link type="document">
+                    <gsf:link type="document" extraLinkArgs="renderWave=0">
                         <gsf:icon type="document"/>
                     </gsf:link>
@@ -339 +339 @@
                 </td>
                 <td valign="top">
-                  <gsf:link type="document">
+                  <gsf:link type="document" extraLinkArgs="renderWave=0">
                         <gsf:choose-metadata>
                       <gsf:metadata name="dc.Title"/>
@@ -550 +550 @@
               <gsf:script src="{$httpCollection}/js/av_document.js"/>
 
-              <div id="metadata-documenttext" class="documenttext" style="padding-bottom: 20px; width:100%;">
+              <div id="metadata-documenttext" class="documenttext" style="padding-bottom: 35px; width:100%;">
                 <style>
                   .doc-metadata td { padding: 7px; }
@@ -588 +588 @@
                 <div id="ajax-loaded-assocfilepath" style="display: none;"><gsf:metadata name="assocfilepath" pos="first"/></div>
 
+                <style>
+                  #hide-av-chart {
+                  display: none;
+                  }
+                  
+                  span.display-view-modes, a.display-view-modes {
+                    padding: 5px;
+                  }
+                
+                  .display-view-modes:hover {
+                    background-color: #b0b0b0;
+                  }               
+                </style>
                 
-                <div style="position: absolute; right: 24px; top: -18px; z-index: 1000; font-size: 90%; font-style:italic">
-                  <a id="switch-to-waveform"    stylexx="display: none;" href="">Switch to Waveform</a>
-                  <a id="switch-to-spectrogram" stylexx="display: none;" href="">Switch to Spectrogram</a>
+                <div style="position: absolute; right: 24px; top: -23px; z-index: 1000; font-size: 90%; font-styleXX:italic">
+                  <span style="display: inline-block">
+                <a id="switch-to-waveform"    class="display-view-modes" stylexx="display: none;" href="">Switch to Waveform</a>
+                <a id="switch-to-spectrogram" class="display-view-modes" stylexx="display: none;" href="">Switch to Spectrogram</a>
+                  </span>
+                  <span style="display: inline-block; width: 140px;">
+                | <span id="show-av-chart" class="display-view-modes" onclick="return showAVChart();">Display AV Chart</span>
+                  <span id="hide-av-chart" class="display-view-modes" onclick="return hideAVChart();">Hide AV Chart</span>
+                  </span>
+                  <span style="display: inline-block">
+                | <span class="display-view-modes" onclick="alert('To be implemented')">&#x23fa; Record <i>your</i> AV experience</span>
+                  </span>
                 </div>
 
@@ -669 +691 @@
         
         </div>
+
+
+    <div id="av-chart-outerdiv" style="display: none;">
+      <hr/>
+      <div style="width: 500px; margin: auto;">
+        <div id="av-chart-div" style="position: relative; height: 325px; width: 300px; margin: auto">
+          <div style="position: absolute; top: 0; left: 0; width: 300px; height: 300px; pointer-events: none;">
+        <canvas id="av-chart-canvas" style="XXwidth: 100%; height: 300px;">
+          Your browser does not support the canvas element
+        </canvas>
+          </div>
+          <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" />
+          <div>
+        <i>Click inside the Arousal-Valence visualisation above to initiate an AV-based recommendation.</i>
+          </div>
+          
+        </div>
+      </div>
+    </div>
     
     <gsf:variable name="mp3url"><xsl:value-of select="$httpCollection"/>/index/assoc/<xsl:value-of select="$assocFilePath"/>/audio.mp3</gsf:variable>
@@ -762 +805 @@
               </form>
               <div>
+                <!--
                 <div id="av-chart-div" style="position: relative; height: 325px; width: 300px; float: right; display: none;">
                   <div style="position: absolute; top: 0; left: 0; width: 300px; height: 300px; pointer-events: none;">
@@ -776 +820 @@
 
                 </div>
+                -->
                 <div id="resultsAreaDiv" style="padding-top: 1rem; min-height: 325px; display: none;">
                   <xsl:text> </xsl:text>