Pārlūkot izejas kodu

refactor TabNote: rename StringNumber to StringNumberTab to avoid violin string confusion (#949)

sschmid 4 gadi atpakaļ
vecāks
revīzija
0682368baf

+ 1 - 1
src/MusicalScore/Graphical/VexFlow/VexFlowConverter.ts

@@ -647,7 +647,7 @@ export class VexFlowConverter {
         let tabVibrato: boolean = false;
         for (const note of gve.notes) {
             const tabNote: TabNote = note.sourceNote as TabNote;
-            const tabPosition: {str: number, fret: number} = {str: tabNote.StringNumber, fret: tabNote.FretNumber};
+            const tabPosition: {str: number, fret: number} = {str: tabNote.StringNumberTab, fret: tabNote.FretNumber};
             tabPositions.push(tabPosition);
             if (tabNote.BendArray) {
                 tabNote.BendArray.forEach( function( bend: {bendalter: number, direction: string} ): void {

+ 2 - 2
src/MusicalScore/ScoreIO/VoiceGenerator.ts

@@ -902,8 +902,8 @@ export class VoiceGenerator {
         const tieCandidateNote: TabNote = candidateNote as TabNote;
         if (tie.Pitch.FundamentalNote === candidateNote.Pitch.FundamentalNote && tie.Pitch.Octave === candidateNote.Pitch.Octave) {
           return parseInt(key, 10);
-        } else if (tieTabNote.StringNumber !== undefined) {
-          if (tieTabNote.StringNumber === tieCandidateNote.StringNumber) {
+        } else if (tieTabNote.StringNumberTab !== undefined) {
+          if (tieTabNote.StringNumberTab === tieCandidateNote.StringNumberTab) {
             return parseInt(key, 10);
           }
         }

+ 5 - 4
src/MusicalScore/VoiceData/TabNote.ts

@@ -10,19 +10,20 @@ export class TabNote extends Note {
                 stringNumber: number, fretNumber: number, bendArray: { bendalter: number, direction: string }[],
                 vibratoStroke: boolean) {
         super(voiceEntry, parentStaffEntry, length, pitch, sourceMeasure);
-        this.stringNumber = stringNumber;
+        this.stringNumberTab = stringNumber;
         this.fretNumber = fretNumber;
         this.bendArray = bendArray;
         this.vibratoStroke = vibratoStroke;
     }
 
-    private stringNumber: number;
+    private stringNumberTab: number; // there can also be string numbers for e.g. violin in treble clef.
     private fretNumber: number;
     private bendArray: { bendalter: number, direction: string }[];
     private vibratoStroke: boolean;
 
-    public get StringNumber(): number {
-        return this.stringNumber;
+    /** Returns the string number the note should be played on. Note there can also be violin string numbers in treble clef. */
+    public get StringNumberTab(): number {
+        return this.stringNumberTab;
     }
 
     public get FretNumber(): number {