Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow staff visualizers to be split into multiple lines #79

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow staff visualizers to be split into multiple lines #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4342ed8
Allow staff visualizers to be split into multiple lines
Cheezer1656 Apr 22, 2024
da3e8d3
Add multi-lined visualizer to index.html
Cheezer1656 Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ <h1><a href="https://github.com/cifkao/html-midi-player">HTML MIDI Player</a></h
<midi-visualizer type="piano-roll" class="visualizer" id="pianoRollVisualizer"></midi-visualizer>
<midi-visualizer type="waterfall" class="visualizer" id="waterfallVisualizer"></midi-visualizer>
<midi-visualizer type="staff" class="visualizer" id="staffVisualizer"></midi-visualizer>
<midi-visualizer type="staff" class="visualizer" id="staffVisualizer2" lines="3"></midi-visualizer>

<midi-player src="https://cdn.jsdelivr.net/gh/cifkao/html-midi-player@2b12128/notfound.mid" sound-font></midi-player>
<midi-player sound-font></midi-player>
Expand Down
52 changes: 42 additions & 10 deletions src/visualizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type Visualizer = mm.PianoRollSVGVisualizer | mm.WaterfallSVGVisualizer | mm.Sta
*
* @prop src - MIDI file URL
* @prop type - Visualizer type
* @prop lines - Number of lines in the visualizer (Only for `staff` type)
* @prop noteSequence - Magenta note sequence object representing the currently displayed content
* @prop config - Magenta visualizer config object
*/
Expand All @@ -27,7 +28,8 @@ export class VisualizerElement extends HTMLElement {
private initTimeout: number;

protected wrapper: HTMLDivElement;
protected visualizer: Visualizer;
protected visualizers: Visualizer[];
protected lastChunkIndex: number = 0;

protected ns: INoteSequence = null;
protected _config: mm.VisualizerConfig = {};
Expand Down Expand Up @@ -81,15 +83,24 @@ export class VisualizerElement extends HTMLElement {
this.wrapper.classList.add('piano-roll-visualizer');
const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
this.wrapper.appendChild(svg);
this.visualizer = new mm.PianoRollSVGVisualizer(this.ns, svg, this._config);
this.visualizers = [new mm.PianoRollSVGVisualizer(this.ns, svg, this._config)];
} else if (this.type === 'waterfall') {
this.wrapper.classList.add('waterfall-visualizer');
this.visualizer = new mm.WaterfallSVGVisualizer(this.ns, this.wrapper, this._config);
this.visualizers = [new mm.WaterfallSVGVisualizer(this.ns, this.wrapper, this._config)];
} else if (this.type === 'staff') {
this.wrapper.classList.add('staff-visualizer');
const div = document.createElement('div');
this.wrapper.appendChild(div);
this.visualizer = new mm.StaffSVGVisualizer(this.ns, div, this._config);
this.visualizers = [];
const chunkSize = Math.ceil(this.ns.notes.length / this.lines);
for (let i = 0; i < this.ns.notes.length; i += chunkSize) {
const chunk = structuredClone(this.ns.notes.slice(i, i + chunkSize));
let startTime = chunk[0].startTime;
chunk.forEach(n => {n.startTime -= startTime;n.endTime -= startTime;});
const div = document.createElement('div');
this.wrapper.appendChild(div);
const new_ns = structuredClone(this.ns);
new_ns.notes = chunk;
this.visualizers.push(new mm.StaffSVGVisualizer(new_ns, div, this._config));
}
}
}

Expand All @@ -98,14 +109,26 @@ export class VisualizerElement extends HTMLElement {
}

redraw(activeNote?: NoteSequence.INote) {
if (this.visualizer) {
this.visualizer.redraw(activeNote, activeNote != null);
if (this.visualizers) {
if (this.type == "staff") {
let chunkIndex = Math.floor(this.ns.notes.indexOf(activeNote) / Math.ceil(this.ns.notes.length / this.lines));
if (chunkIndex != this.lastChunkIndex) {
this.visualizers[this.lastChunkIndex].redraw(activeNote, false); // clearActiveNotes() doesn't work
this.lastChunkIndex = chunkIndex;
}
const note = structuredClone(activeNote);
note.startTime -= this.ns.notes[chunkIndex * Math.ceil(this.ns.notes.length / this.lines)].startTime;
this.visualizers[chunkIndex].redraw(note, activeNote != null);
}
else {
this.visualizers.forEach(visualizer => visualizer.redraw(activeNote, activeNote != null));
}
}
}

clearActiveNotes() {
if (this.visualizer) {
this.visualizer.clearActiveNotes();
if (this.visualizers) {
this.visualizers.forEach(visualizer => visualizer.clearActiveNotes());
}
}

Expand Down Expand Up @@ -148,6 +171,15 @@ export class VisualizerElement extends HTMLElement {
this.setOrRemoveAttribute('type', value);
}

get lines() {
let lines = Number(this.getAttribute('lines'))
return lines == 0 ? 1 : lines;
}

set lines(value: number) {
this.setOrRemoveAttribute('lines', value.toString() == '0' ? null : value.toString());
}

get config() {
return this._config;
}
Expand Down