Changeset 29895 for main/trunk/model-sites-dev/respooled
- Timestamp:
- 2015-05-18T23:08:07+12:00 (9 years ago)
- Location:
- main/trunk/model-sites-dev/respooled/collect/popup-video-respooled
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/etc/collectionConfig.xml
r29893 r29895 295 295 <gsf:link src="{$httpCollection}/style/jtab-helper.css"/> 296 296 <gsf:script src="{$httpCollection}/js/raphael.js"/> 297 <gsf:script src="{$httpCollection}/js/raphael.group.js"/> 297 298 <gsf:script src="{$httpCollection}/js/jtab.js"/> 298 299 <!-- -
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/js/game-on.js
r29893 r29895 4 4 5 5 var goPaper = null; 6 var go_top_level_group = null;; 6 7 7 8 var go_paper_x_dim = 920; … … 13 14 var num_midi_pitches = 128; 14 15 16 var group_x_scale; 17 var group_y_scale; 18 var group_rotate; 19 var group_x_trans; 20 var group_y_trans; 15 21 16 22 function updateGameOnCurrentTimeline() 17 23 { 18 24 gameOnCurrentTimeXPos = (mediaPlayer.currentTime / mediaPlayer.duration) * go_paper_x_dim; 25 26 var gameOnCurrentTimeYPos = (mediaPlayer.currentTime / mediaPlayer.duration) * go_paper_y_dim; 19 27 //console.log("*** x pos = " + gameOnCurrentTimeXPos); 20 28 21 29 gameOnCurrentTimelineRect.attr({x: gameOnCurrentTimeXPos}); 30 31 if (gs.xsltParams.interface_name == "respooled") { 32 go_top_level_group.translate(group_x_scale*go_paper_y_dim, go_paper_y_dim+(gameOnCurrentTimeYPos * group_x_scale * Math.abs(group_y_scale))); 33 } 34 22 35 } 23 36 … … 149 162 150 163 goPaper.clear(); 164 165 // Clear takes out any previous group element, so need to be regenerated 166 go_top_level_group = new goPaper.group("gameOnPaper",[]); 151 167 152 168 if (hasLocalStorage) { … … 174 190 175 191 var midi_stats = computeMidiStats(track); 192 console.log("*** midi stats = " + JSON.stringify(midi_stats)); 176 193 177 194 if (midi_stats.min_midi_pitch < min_midi_pitch) { … … 206 223 //console.log("*** max pitch = " + max_midi_pitch + ", min pitch = " + min_midi_pitch); 207 224 208 var raw_midi_range = max_midi_pitch - min_midi_pitch ;225 var raw_midi_range = max_midi_pitch - min_midi_pitch + 1; 209 226 var midi_range = Math.max(4,raw_midi_range); 210 227 228 console.log("*** midi_range = " + midi_range); 229 211 230 var midi_y_dim_spacing = go_paper_y_dim / midi_range; 231 212 232 213 233 for (var i=0; i<atl.length; i++) { … … 230 250 var startPercTime = (base_ctime + note_event.startCurrentTime)/total_duration; 231 251 var rx_org = startPercTime * go_paper_x_dim; 232 var ry_org = go_paper_y_dim - ((note_event.midiPitch - min_midi_pitch) * midi_y_dim_spacing) ;252 var ry_org = go_paper_y_dim - ((note_event.midiPitch - min_midi_pitch) * midi_y_dim_spacing) - midi_y_dim_spacing; 233 253 234 254 var rx_dim = (note_event.duration/1000)/total_duration * go_paper_x_dim; 235 255 var ry_dim = midi_y_dim_spacing; 236 256 237 var rect = goPaper.rect(rx_org,ry_org,rx_dim,ry_dim); 238 rect.attr({stroke:"black",fill:"#2E52A4"}); 257 var rect = goPaper.rect(rx_org,ry_org,rx_dim,ry_dim-0.2); 258 //rect.attr({stroke:"none", strokeWidth:0.2, fill:"#2E52A4"}); 259 //rect.attr({stroke:"black",fill:"#2E52A4"}); 260 rect.attr({"stroke":"black","stroke-width":0.25, "fill":"#2E52A4"}); 261 go_top_level_group.push(rect); 239 262 } 240 263 } … … 245 268 gameOnCurrentTimelineRect = goPaper.rect(-2,0,1,go_paper_y_dim); 246 269 gameOnCurrentTimelineRect.attr({fill: "red", stroke: "red"}); 270 go_top_level_group.push(gameOnCurrentTimelineRect); 271 272 go_top_level_group.scale(group_x_scale,group_y_scale); 273 go_top_level_group.rotate(group_rotate,0,0); 274 //go_top_level_group.translate(group_x_scale*go_paper_y_dim,go_paper_y_dim); 275 go_top_level_group.translate(group_x_trans,group_y_trans); 247 276 } 248 277 … … 250 279 { 251 280 console.log("initGameOn()"); 281 282 if (gs.xsltParams.interface_name == "respooled") { 283 group_x_scale = 2.0; 284 group_y_scale = -5.0; 285 group_rotate = 90.0; 286 287 group_x_trans = group_x_scale * go_paper_y_dim; 288 group_y_trans = go_paper_y_dim; 289 } 290 else { 291 group_x_scale = 1.0; 292 group_y_scale = 1.0; 293 group_rotate = 0.0; 294 295 group_x_trans = 0.0; 296 group_y_trans = 0.0; 297 } 252 298 253 299 goDocStorage = getDocStorage(gs.cgiParams.d); … … 263 309 goPaper = Raphael("gameOnPaper",go_paper_x_dim,go_paper_y_dim); 264 310 goPaper.canvas.style.backgroundColor = '#FFFFFF'; 311 265 312 266 313 console.log("Browser supports LocalStorage: " + hasLocalStorage); -
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/style/media-player.css
r29890 r29895 82 82 border: 0; 83 83 */ 84 /* 84 85 border: 2px solid black; 86 */ 85 87 padding: 2px; 86 88 padding-left: 4px; 87 89 padding-right: 4px; 90 88 91 89 92 } -
main/trunk/model-sites-dev/respooled/collect/popup-video-respooled/transform/pages/document.xsl
r29893 r29895 219 219 <td><gsf:metadata name="dc.Creator"/></td> 220 220 </tr> 221 222 <tr> 223 <td>Released</td> 224 <td><gsf:metadata name="dc.Coverage"/></td> 225 </tr> 221 226 227 <!-- 222 228 <tr valign="top"> 223 229 <td>Artist Summary</td> … … 235 241 </td> 236 242 </tr> 243 --> 244 237 245 238 246 <!-- … … 308 316 </td> 309 317 <td> 310 <a href="http ://dbtune.org/musicbrainz/page/artist/{$musicbrainzartistid}" target="#musicbrainz" class="external">318 <a href="https://musicbrainz.org/artist/{$musicbrainzartistid}" target="#musicbrainz" class="external"> 311 319 <xsl:copy-of select="$musicbrainzartistid"/> 312 320 </a> 313 321 </td> 314 322 </tr> 323 <!-- 315 324 <tr> 316 325 <td> … … 326 335 </td> 327 336 </tr> 337 --> 338 328 339 <tr> 329 340 <td colspan="2"> … … 1318 1329 <div id='media-player' style="width: 96%"> 1319 1330 1331 <xsl:if test="$interface_name='dlfm'"> 1332 <style> 1333 .openclose a:visited { 1334 color: #ffffff; 1335 } 1336 .openclose a:link { 1337 color: #ffffff; 1338 } 1339 .openclose a:hover { 1340 color: #000000; 1341 } 1342 1343 </style> 1344 </xsl:if> 1345 1320 1346 <div class="about-bar"> 1321 1347 <div id="about-titlebar" style="background-image: none; background-color: #2E52A4; width: 97%; float: left; margin-bottom: 10px; z-index: 4; position: relative;"> 1322 About: <xsl:call-template name="choose-title"/> 1348 1349 <xsl:choose> 1350 <xsl:when test="$interface_name='dlfm'"> 1351 Linked Data: <xsl:call-template name="choose-title"/> 1352 </xsl:when> 1353 <xsl:otherwise> 1354 About: <xsl:call-template name="choose-title"/> 1355 </xsl:otherwise> 1356 </xsl:choose> 1323 1357 </div> 1324 1358 … … 1371 1405 <input id="progress-bar" type="range" 1372 1406 min='0' max='100' step='0.01' value='0' 1407 class="ui-state-default ui-corner-all" 1373 1408 style="width: 98%"/> <!-- used to be 100% --> 1374 1409 … … 1916 1951 $('#scaled-mytab').append($('#offscreen-jtab-chord-lineup')); 1917 1952 1953 console.log("!!!! forced background colour for F major in Guitar Tab area!!!") 1954 $('#builder_6').css("background-color","rgba(46,82,164,0.50)"); 1918 1955 }); 1919 1956 </gsf:script>
Note:
See TracChangeset
for help on using the changeset viewer.