浏览代码

Fixed errors

Matthias Uiberacker 7 年之前
父节点
当前提交
e962653251

+ 3 - 2
src/MusicalScore/ScoreIO/MusicSymbolModules/RepetitionCalculator.ts

@@ -1,5 +1,6 @@
 import {SourceMeasure} from "../../VoiceData/SourceMeasure";
 import {RepetitionInstruction, RepetitionInstructionEnum, AlignmentType} from "../../VoiceData/Instructions/RepetitionInstruction";
+import {RepetitionInstructionComparer} from "../../VoiceData/Instructions/RepetitionInstruction";
 import {ArgumentOutOfRangeException} from "../../Exceptions";
 import {MusicSheet} from "../../MusicSheet";
 
@@ -32,10 +33,10 @@ export class RepetitionCalculator {
     for (let idx: number = 0, len: number = this.musicSheet.SourceMeasures.length; idx < len; ++idx) {
       const measure: SourceMeasure = this.musicSheet.SourceMeasures[idx];
       if (measure.FirstRepetitionInstructions.length > 1) {
-        measure.FirstRepetitionInstructions.sort(RepetitionInstruction.compare);
+        measure.FirstRepetitionInstructions.sort(RepetitionInstructionComparer.Compare);
       }
       if (measure.LastRepetitionInstructions.length > 1) {
-        measure.LastRepetitionInstructions.sort(RepetitionInstruction.compare);
+        measure.LastRepetitionInstructions.sort(RepetitionInstructionComparer.Compare);
       }
     }
   }

+ 2 - 1
src/MusicalScore/ScoreIO/MusicSymbolModules/RepetitionInstructionReader.ts

@@ -2,6 +2,7 @@ import {MusicSheet} from "../../MusicSheet";
 import {IXmlElement} from "../../../Common/FileIO/Xml";
 import {SourceMeasure} from "../../VoiceData/SourceMeasure";
 import {RepetitionInstruction, RepetitionInstructionEnum, AlignmentType} from "../../VoiceData/Instructions/RepetitionInstruction";
+import {RepetitionInstructionComparer} from "../../VoiceData/Instructions/RepetitionInstruction";
 import {StringUtil} from "../../../Common/Strings/StringUtil";
 export class RepetitionInstructionReader {
   /**
@@ -340,7 +341,7 @@ export class RepetitionInstructionReader {
         }
       }
     }
-    this.repetitionInstructions.sort(RepetitionInstruction.compare);
+    this.repetitionInstructions.sort(RepetitionInstructionComparer.Compare);
   }
 
   private findInstructionInPreviousMeasure(currentInstructionIndex: number, currentMeasureIndex: number, searchedType: RepetitionInstructionEnum): boolean {

+ 4 - 4
src/MusicalScore/VoiceData/Instructions/RepetitionInstruction.ts

@@ -60,14 +60,14 @@ export class RepetitionInstruction /*implements IComparable*/ {
         const other: RepetitionInstruction = <RepetitionInstruction>obj;
         if (this.measureIndex > other.measureIndex) {
             return 1;
-        } else if (one.measureIndex < other.measureIndex) {
+        } else if (this.measureIndex < other.measureIndex) {
             return -1;
         }
-        if (one.alignment === AlignmentType.Begin) {
+        if (this.alignment === AlignmentType.Begin) {
             if (other.alignment === AlignmentType.End) {
                 return -1;
             }
-            switch (one.type) {
+            switch (this.type) {
                 case RepetitionInstructionEnum.Ending:
                     return 1;
                 case RepetitionInstructionEnum.StartLine:
@@ -87,7 +87,7 @@ export class RepetitionInstruction /*implements IComparable*/ {
             if (other.alignment === AlignmentType.Begin) {
                 return 1;
             }
-            switch (one.type) {
+            switch (this.type) {
                 case RepetitionInstructionEnum.Ending:
                     return -1;
                 case RepetitionInstructionEnum.Fine: