zoriya/Chromacase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed accidental as it's own type and integrated it with note type

Browse Source
This commit is contained in:
Clément Le Bihan
2023-03-20 00:40:01 +01:00
parent c3d2e0a4e5
commit 885c819ab5
4 changed files with 190 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/models/Piano.ts
+121 -70
View File
@@ -1,20 +1,18 @@
export enum Note {
"C",
"C#",
"D",
"D#",
"E",
"F",
"F#",
"G",
"G#",
"A",
"A#",
"B",
}
export enum Accidental {
"#",
"b",
"##",
"bb",
}
export enum NoteNameBehavior {
"always",
"onpress",
@@ -25,7 +23,7 @@ export enum NoteNameBehavior {
export enum KeyPressStyle {
"subtle",
"vivid",
};
}
export type HighlightedKey = {
key: PianoKey;
// if not specified, the default color for highlighted notes will be used
@@ -34,83 +32,136 @@ export type HighlightedKey = {
export class PianoKey {
public note: Note;
public accidental?: Accidental;
public octave?: number;
constructor(note: Note, accidental?: Accidental, octave?: number) {
constructor(note: Note, octave?: number) {
this.note = note;
this.accidental = accidental;
this.octave = octave;
}
public toString = () => {
return this.note as unknown as string + (this.accidental || "") + (this.octave || "");
return (this.note as unknown as string) + (this.octave || "");
};
}
export const strToKey = (str: string): PianoKey => {
let note : Note;
switch (str[0]) {
case "C": note = Note.C; break;
case "D": note = Note.D; break;
case "E": note = Note.E; break;
case "F": note = Note.F; break;
case "G": note = Note.G; break;
case "A": note = Note.A; break;
case "B": note = Note.B; break;
default: throw new Error("Invalid note name");
}
if (str.length === 1) {
return new PianoKey(note);
}
let accidental : Accidental;
switch (str[1]) {
case "#": accidental = Accidental["#"]; break;
case "b": accidental = Accidental["b"]; break;
case "x": accidental = Accidental["##"]; break;
case "n": accidental = Accidental["bb"]; break;
default: throw new Error("Invalid accidental");
}
if (str.length === 2) {
return new PianoKey(note, accidental);
}
const octave = parseInt(str[2] as unknown as string);
return new PianoKey(note, accidental, octave);
let note: Note;
switch (str[0]) {
case "C":
note = Note.C;
break;
case "D":
note = Note.D;
break;
case "E":
note = Note.E;
break;
case "F":
note = Note.F;
break;
case "G":
note = Note.G;
break;
case "A":
note = Note.A;
break;
case "B":
note = Note.B;
break;
case "C#":
note = Note["C#"];
break;
case "D#":
note = Note["D#"];
break;
case "F#":
note = Note["F#"];
break;
case "G#":
note = Note["G#"];
break;
case "A#":
note = Note["A#"];
break;
default:
throw new Error("Invalid note name");
}
if (str.length < 3) {
return new PianoKey(note);
}
const octave = parseInt(str[2] as unknown as string);
return new PianoKey(note, octave);
};
export const keyToStr = (key: PianoKey, showOctave: boolean = true): string => {
let s = "";
switch (key.note) {
case Note.C: s += "C"; break;
case Note.D: s += "D"; break;
case Note.E: s += "E"; break;
case Note.F: s += "F"; break;
case Note.G: s += "G"; break;
case Note.A: s += "A"; break;
case Note.B: s += "B"; break;
}
if (key.accidental !== undefined) {
switch (key.accidental) {
default: s += "#"; break;
}
}
if (showOctave && key.octave) {
s += key.octave;
}
return s;
let s = "";
switch (key.note) {
case Note.C:
s += "C";
break;
case Note.D:
s += "D";
break;
case Note.E:
s += "E";
break;
case Note.F:
s += "F";
break;
case Note.G:
s += "G";
break;
case Note.A:
s += "A";
break;
case Note.B:
s += "B";
break;
case Note["C#"]:
s += "C#";
break;
case Note["D#"]:
s += "D#";
break;
case Note["F#"]:
s += "F#";
break;
case Note["G#"]:
s += "G#";
break;
case Note["A#"]:
s += "A#";
break;
default:
throw new Error("Invalid note name");
}
if (showOctave && key.octave) {
s += key.octave;
}
return s;
};
export const isAccidental = (key: PianoKey): boolean => {
return (
key.note === Note["C#"] ||
key.note === Note["D#"] ||
key.note === Note["F#"] ||
key.note === Note["G#"] ||
key.note === Note["A#"]
);
};
export const octaveKeys: Array<PianoKey> = [
new PianoKey(Note.C),
new PianoKey(Note.C, Accidental["#"]),
new PianoKey(Note.D),
new PianoKey(Note.D, Accidental["#"]),
new PianoKey(Note.E),
new PianoKey(Note.F),
new PianoKey(Note.F, Accidental["#"]),
new PianoKey(Note.G),
new PianoKey(Note.G, Accidental["#"]),
new PianoKey(Note.A),
new PianoKey(Note.A, Accidental["#"]),
new PianoKey(Note.B),
];
new PianoKey(Note["C#"]),
new PianoKey(Note.D),
new PianoKey(Note["D#"]),
new PianoKey(Note.E),
new PianoKey(Note.F),
new PianoKey(Note["F#"]),
new PianoKey(Note.G),
new PianoKey(Note["G#"]),
new PianoKey(Note.A),
new PianoKey(Note["A#"]),
new PianoKey(Note.B),
];