Changeset 29898 for main/trunk

Timestamp:

2015-05-19T10:31:17+12:00 (9 years ago)

Author:

davidb

Message:

Graphics equalizer tidyup. Tooltips on Game On sections

Location:

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled

Files:

• js/game-on.js (modified) (1 diff)
• js/media-player.js (modified) (1 diff)
• style/media-player.css (modified) (1 diff)
• style/style.css (modified) (1 diff)
• transform/pages/document.xsl (modified) (6 diffs)

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/game-on.js

@@ -267 +267 @@
             var block_y_dim = midi_y_dim_spacing * (block_midi_range);
 
-            var block_rect = goPaper.rect(block_x_org-1,block_y_org-1,block_x_dim+2,block_y_dim+2); // fudge factor!
-            block_rect.attr({"stroke":"none", "stroke-width":0, "fill":"rgba(46, 82, 164, 0.5)"});
-            go_top_level_group.push(block_rect);
+            if (gs.xsltParams.interface_name != "respooled") {
+            var block_rect = goPaper.rect(block_x_org-1,block_y_org-1,block_x_dim+2,block_y_dim+2); // fudge factor!
+            block_rect.attr({"stroke":"none", "stroke-width":0, "fill":"rgba(46, 82, 164, 0.5)"});
+            
+            var block_tip = track_block.name;
+
+            if ("_computedKey" in track_block) {
+
+                var computedKey = track_block._computedKey;
+                var key = computedKey.key;
+                block_tip += " , Key: " + key;
+
+                if ("score" in computedKey) {
+                var perc = 100*computedKey.score;
+                block_tip += " with " + perc.toFixed(1) + "% confidence rating";
+                }
+            }
+
+            block_rect.attr({ "title": block_tip});
+
+            go_top_level_group.push(block_rect);
+            }
 
         }

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/media-player.js

@@ -305 +305 @@
 
 
+function toggleGraphicEQ()
+{
+    $('#grapheqControlL').toggle();
+    $('#grapheqControlR').toggle();
+
+    return false;
+
+}
 
 function saveRecording()

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/style/media-player.css

@@ -127 +127 @@
     background-position: 50%;
 }
+
+#eq-button {
+    background:transparent url('images/eq-control.png') no-repeat 0 0px;
+}

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/style/style.css

@@ -65 +65 @@
 
 
+.ui-dialog {
+    z-index: 10;
+}

main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/transform/pages/document.xsl

@@ -843 +843 @@
             var offset = (35 * numSliders) + 12;
         if (side == "L") {
+            offset += 30; // fudge factor
             $('#grapheqControlL').css("left","-" + offset + "px");
         }
         else if (side == "R") {
-            offset += 5; // fudge factor
+            offset += 35; // fudge factor, used to be 5
             $('#grapheqControlR').css("right","-" + offset + "px");
         }
@@ -941 +942 @@
 
 
-    <div id="grapheqControlL" class="control" style="position: absolute; top: 0px; left: -132px; heightXX: 200px">
+    <div id="grapheqControlL" class="control" style="position: absolute; top: 280px; left: -132px; heightXX: 200px">
 
       <h3 style="float: left;">Graphic Equalizer (left channel)</h3>
@@ -982 +983 @@
 -->
 
-    <div id="grapheqControlR" class="control" style="position: absolute; top: 0px; right: -330px; heightXX: 200px">
+    <div id="grapheqControlR" class="control" style="position: absolute; top: 280px; right: -330px; heightXX: 200px">
       <h3 style="float: left;">Graphic Equalizer (right channel)</h3>
 
@@ -1327 +1328 @@
 <div>
 
+
   <div id='media-player' style="width: 96%">
 
@@ -1420 +1422 @@
         <span id="mediaPlayerTotalTime">0:00.0</span>
       </div>
+      <button id="eq-button" class="button" title="Show/Hide graphics equalilzer" onclick="return toggleGraphicEQ()">EQ</button>
       <button id='volume-dec-button' class='button volume-minus' title='decrease volume' onclick="changeVolume('-');">Decrease volume</button>
       <button id='volume-inc-button' class='button volume-plus' title='increase volume' onclick="changeVolume('+');">Increase volume</button>
@@ -1427 +1430 @@
     </div>
 
+
+    <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div>
+
+    <xsl:call-template name="graphic-equalizers"/>
 
     <div style="clear: both;"><xsl:comment>clear floats</xsl:comment></div>