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.

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

Bugfix: note.tupletId gets out of sync with tuplet.id after deserialization #98

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/smo/data/measure.ts
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,10 @@ export class SmoMeasure implements SmoMeasureParams, TickMappable {
params.tupletTrees.push(tupletTree);
}
}
if (params.tupletTrees.length) {
SmoTupletTree.syncTupletIds(params.tupletTrees, voices)
}

params.modifiers = modifiers;
const measure = new SmoMeasure(params);
// Handle migration for measure-mapped parameters
Expand Down
22 changes: 21 additions & 1 deletion src/smo/data/tuplet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { SmoNote, SmoNoteParamsSer, TupletInfo } from './note';
import { SmoMusic } from './music';
import { SmoNoteModifierBase } from './noteModifiers';
import { getId, SmoAttrs, Clef } from './common';
import { SmoMeasure } from './measure';
import {SmoMeasure, SmoVoice} from './measure';
import {tuplets} from "vexflow_smoosic/build/esm/types/tests/formatter/tests";


Expand Down Expand Up @@ -39,6 +39,26 @@ export class SmoTupletTree {
this.tuplet = params.tuplet;
}

static syncTupletIds(tupletTrees: SmoTupletTree[], voices: SmoVoice[]) {
const traverseTupletTree = (parentTuplet: SmoTuplet): void => {
const notes: SmoNote[] = voices[parentTuplet.voice].notes;
for (let i = parentTuplet.startIndex; i <= parentTuplet.endIndex; i++) {
const note: SmoNote = notes[i];
note.tupletId = parentTuplet.attrs.id;
}
for (let i = 0; i < parentTuplet.childrenTuplets.length; i++) {
const tuplet = parentTuplet.childrenTuplets[i];
traverseTupletTree(tuplet);
}
};

//traverse tuplet tree
for (let i = 0; i < tupletTrees.length; i++) {
const tupletTree: SmoTupletTree = tupletTrees[i];
traverseTupletTree(tupletTree.tuplet);
}
}

static adjustTupletIndexes(tupletTrees: SmoTupletTree[], voice: number, startTick: number, diff: number) {
const traverseTupletTree = (parentTuplet: SmoTuplet): void => {
if (parentTuplet.endIndex >= startTick) {
Expand Down
2 changes: 2 additions & 0 deletions src/smo/mxml/xmlToSmo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { Pitch, PitchKey, Clef } from '../data/common';
import { SmoOperation } from '../xform/operations';
import { SmoInstrument, SmoSlur, SmoTie, TieLine } from '../data/staffModifiers';
import { SmoPartInfo } from '../data/partInfo';
import {SmoTupletTree} from "../data/tuplet";

/**
* A class that takes a music XML file and outputs a {@link SmoScore}
Expand Down Expand Up @@ -805,6 +806,7 @@ export class XmlToSmo {
const voiceId = smoMeasure.voices.length - 1;
xmlState.addTupletsToMeasure(smoMeasure, staffData.clefInfo.staffId, voiceId);
});
SmoTupletTree.syncTupletIds(smoMeasure.tupletTrees, smoMeasure.voices);
if (smoMeasure.voices.length === 0) {
smoMeasure.voices.push({ notes: SmoMeasure.getDefaultNotes(smoMeasure) });
}
Expand Down
Loading