diff options
Diffstat (limited to 'bundle.js')
| -rw-r--r-- | bundle.js | 52 |
1 files changed, 38 insertions, 14 deletions
@@ -40282,6 +40282,17 @@ var datasets = {}, var play_fn = _midi.play_sequence; data.load().then(function (lists) { console.log(lists); + var fm = lists.firearms_manufactured; + datasets['Firearms Manufactured'] = {}; + datasets['Firearms Manufactured'].name = 'Firearms Manufactured'; + datasets['Firearms Manufactured'].play_fn = _midi.play_sequence; + datasets['Firearms Manufactured'].h = fm.h.slice(1, 5); + datasets['Firearms Manufactured'].labels = fm.lines.map(function (l) { + return l.slice(0, 1); + }); + datasets['Firearms Manufactured'].lines = fm.lines.map(function (l) { + return l.slice(1, 5); + }); (0, _util.transpose)(lists.gun_violence_by_month.lines).forEach(function (row, i) { var name = lists.gun_violence_by_month.h[i]; if (name === 'Date') return; @@ -40297,6 +40308,7 @@ data.load().then(function (lists) { }); datasets["Mass Shootings"] = lists.mass_shootings_from_columbine; datasets["Mass Shootings"].name = "Mass Shootings"; + datasets["Mass Shootings"].pedal = true; datasets["Mass Shootings"].play_fn = play_mass_shootings; var lines = datasets["Mass Shootings"].lines.reverse(); @@ -40319,7 +40331,7 @@ data.load().then(function (lists) { return (parseInt(y) - parseInt(min_y)) * 12 + parseInt(m); }); - max_i = (parseInt(max_y) - parseInt(min_y)) * 12 + parseInt(12); + datasets["Mass Shootings"].max_i = (parseInt(max_y) - parseInt(min_y)) * 12 + parseInt(12); // console.log('max i', max_i) datasets["Mass Shootings"].data = lines; datasets["Mass Shootings"].lines = [lines.map(function (row) { @@ -40447,6 +40459,11 @@ function play_next() { notes = _play_fn2[1], timings = _play_fn2[2]; + if (dataset.labels) { + var j = Math.floor(i / bounds.rows[0].length); + document.querySelector('#cases').innerHTML = dataset.labels[j]; + } + i = new_i; if (recording) { var timing = _midi.note_values[_ui.nx.timing.active][2]; @@ -40475,6 +40492,7 @@ function pick_dataset(key) { bounds = (0, _util.get_bounds)(dataset); diff = (0, _util.get_diff_bounds)(bounds.rows); play_fn = dataset.play_fn; + max_i = dataset.max_i || bounds.rows.length * bounds.rows[0].length; } /* build and bind the UI */ @@ -40570,7 +40588,7 @@ function ready() { var export_midi_button = document.querySelector('#export_midi'); export_midi_button.addEventListener('click', function () { - (0, _midi.export_pattern_as_midi)(dataset.name, bounds, diff, _ui.nx.tempo.value, _ui.nx.timing.active, play_fn, max_i); + (0, _midi.export_pattern_as_midi)(dataset, bounds, diff, _ui.nx.tempo.value, _ui.nx.timing.active, play_fn, max_i); }); var record_midi_button = document.querySelector('#record_midi'); @@ -42034,8 +42052,9 @@ function play_sequence(i, bounds, diff, note_time) { i += 1; if (i >= count) i = 0; var midi_note = play_note((0, _util.norm)(n, min, max) * _ui.nx.multiply.value, note_time, channel, exporting); - return [i, [midi_note]]; + return [i, [midi_note], [128]]; } +// [next_i, notes, timings, pedal_note] /* play the next row as an interval */ @@ -42067,7 +42086,7 @@ function play_interval_sequence(i, bounds, diff, note_time) { /* generate a 1-track midi file by calling the play function repeatedly */ -function export_pattern_as_midi(datasetName, bounds, diff, tempo, timingIndex, play_fn, max_i) { +function export_pattern_as_midi(dataset, bounds, diff, tempo, timingIndex, play_fn, max_i) { // const behavior = document.querySelector('#behavior').value var rows = bounds.rows; // let count = behavior === 'sequence' ? rows[0].length * rows.length : rows.length @@ -42078,12 +42097,15 @@ function export_pattern_as_midi(datasetName, bounds, diff, tempo, timingIndex, p var note_time = void 0; // let timing = note_values[timingIndex][2] var pedal_note = void 0, + pedal_track = void 0, next_i = void 0; var wait = 0; var midi_track = new MidiWriter.Track(); midi_track.setTempo(tempo); - var pedal_track = new MidiWriter.Track(); - pedal_track.setTempo(tempo); + if (dataset.pedal) { + pedal_track = new MidiWriter.Track(); + pedal_track.setTempo(tempo); + } for (var i = 0, len = max_i; i < len; i++) { // if (timing.length) { // note_time = timing[i % timing.length] @@ -42114,16 +42136,18 @@ function export_pattern_as_midi(datasetName, bounds, diff, tempo, timingIndex, p midi_track.addEvent(new MidiWriter.NoteEvent(e)); wait = 0; } - pedal_track.addEvent(new MidiWriter.NoteEvent({ - pitch: pedal_note, - duration: 't128', - velocity: 25 - })); + if (dataset.pedal) { + pedal_track.addEvent(new MidiWriter.NoteEvent({ + pitch: pedal_note, + duration: 't128', + velocity: 25 + })); + } } - var tracks = [midi_track, pedal_track]; + var tracks = dataset.pedal ? [midi_track, pedal_track] : [midi_track]; var writer = new MidiWriter.Writer(tracks); var blob = (0, _util.dataURItoBlob)(writer.dataUri()); - (0, _FileSaver.saveAs)(blob, 'Recording - ' + datasetName + '.mid'); + (0, _FileSaver.saveAs)(blob, 'Recording - ' + dataset.name + '.mid'); } /***/ }), @@ -44009,7 +44033,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var files = [ // "gun_violence", -"mass_shootings_from_columbine", "gun_violence_by_month"]; +"mass_shootings_from_columbine", "gun_violence_by_month", "firearms_manufactured"]; var parse = __webpack_require__(145); var dataPromises = files.map(function (name) { |