Changeset 34812

Timestamp:

2021-02-07T13:26:13+13:00 (3 years ago)

Author:

davidb

Message:

Development of player+renderer so it can be configured to show either wave-peaks or freq-spec

File:

• main/trunk/model-sites-dev/mars/collect/amc-essentia/etc/collectionConfig.xml (modified) (4 diffs)

main/trunk/model-sites-dev/mars/collect/amc-essentia/etc/collectionConfig.xml

@@ -80 +80 @@
       
       <plugin name="EssentiaPlugin">
+    <option name="-block_exp" value=".*\.csv$"/>
     <!--
             <option name="-compute_mir_features" value="true"/>
@@ -139 +140 @@
                 </td>
                 <td valign="top">
-                    <gsf:link type="document">
-                        <gsf:choose-metadata>
-                            <gsf:metadata name="dc.Title"/>
-                            <gsf:metadata name="amc.title"/>
-                            <gsf:metadata name="exp.Title"/>
-                            <gsf:metadata name="Title"/>
-                            <gsf:default>Untitled</gsf:default>
-                        </gsf:choose-metadata>
-                    </gsf:link>
+                        <gsf:choose-metadata>
+                      <gsf:metadata name="dc.Title"/>
+                      <gsf:metadata name="amc.title"/>
+                      <gsf:metadata name="exp.Title"/>
+                      <gsf:metadata name="Title"/>
+                      <gsf:default>Untitled</gsf:default>
+                    </gsf:choose-metadata>
+                    <gsf:space />
+                    
+                    <gsf:link type="document">[Experimental Spectral Frequency]</gsf:link>
+
+                    <gsf:space />
+                    <span id="renderWave">
+                      <gsf:link type="document">[Traditional Wave Display]</gsf:link>
+                    </span>
+
+                    <gsf:script>
+                      var $alink = $('#renderWave a');
+                      var alink_href = $alink.attr('href');
+                      if (!alink_href.includes('renderWave')) {
+                        alink_href += '?renderWave=1';
+                        $alink.attr('href',alink_href);
+                      }
+                    </gsf:script>
+
                 </td>
             </gsf:template>
@@ -337 +354 @@
                   <td>Essentia MFCC Features:</td><td><a href="{$httpCollection}/index/assoc/{$assocFilePath}/pessentia.json">Download</a></td>
                 </tr>
+
+                <tr style="background-color:#fff">
+                  <td>Weka Predicted Arousal-Valence Features:</td><td><a href="{$httpCollection}/index/assoc/{$assocFilePath}/av.json">Download</a></td>
+                </tr>
+
                   </tbody>
                 </table>
@@ -354 +376 @@
         <div id="wave-harmonic-pitch-class-profile"><xsl:text> </xsl:text></div>
 
+        <div id = "av-display" style="margin: auto; width: 200px;padding-top: 18px; display: none;">
+
+          <div id="arousal-display" style="display: inline-block; width: 95px;">
+        Arousal:
+        <span id="arousal-val">
+          0
+        </span>
+          </div>
+
+          <div id="valence-display" style="display: inline-block; width: 95px;">
+        Valence
+        <span id="valence-val">
+          0
+        </span>
+          </div>
+        </div>
+        
         <div>
-              <div class="controls">
+        
+          <div class="controls">
         <button class="btn btn-primary" data-action="play">
                   <i class="glyphicon glyphicon-play"></i>