Matthias пре 9 година
родитељ
комит
d9f16a2c3c

+ 1 - 1
src/MusicalScore/Graphical/GraphicalMusicSheet.ts

@@ -9,7 +9,7 @@ import {MusicSystem} from "./MusicSystem";
 import {GraphicalStaffEntry} from "./GraphicalStaffEntry";
 import {SourceStaffEntry} from "../VoiceData/SourceStaffEntry";
 import {PointF2D} from "../../Common/DataObjects/PointF2D";
-import {ClefInstruction, ClefEnum} from "../VoiceData/Instructions/ClefInstruction";
+import {ClefInstruction} from "../VoiceData/Instructions/ClefInstruction";
 import {AbstractNotationInstruction} from "../VoiceData/Instructions/AbstractNotationInstruction";
 import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
 import {Fraction} from "../../Common/DataObjects/fraction";

+ 0 - 1
src/MusicalScore/MusicSource/Repetition.ts

@@ -1,5 +1,4 @@
 import {SourceMusicPart} from "./SourceMusicPart";
-import {SourceStaffEntry} from "../VoiceData/SourceStaffEntry";
 import {SourceMeasure} from "../VoiceData/SourceMeasure";
 import {Fraction} from "../../Common/DataObjects/fraction";
 import {MusicSheet} from "../MusicSheet";

+ 6 - 3
src/MusicalScore/ScoreIO/InstrumentReader.ts

@@ -768,8 +768,9 @@ export class InstrumentReader {
             }
           }
         }
-        if (key <= this.activeClefs.length && clefInstruction === this.activeClefs[key - 1])
+        if (key <= this.activeClefs.length && clefInstruction === this.activeClefs[key - 1]) {
           this.abstractInstructions.remove(key);
+        }
       }
       if (value instanceof KeyInstruction) {
         let keyInstruction: KeyInstruction = <KeyInstruction>value;
@@ -812,8 +813,9 @@ export class InstrumentReader {
             }
           }
         }
-        if (this.activeKey !== undefined && this.activeKey === keyInstruction)
+        if (this.activeKey !== undefined && this.activeKey === keyInstruction) {
           this.abstractInstructions.remove(key);
+        }
       }
       if (value instanceof RhythmInstruction) {
         let rhythmInstruction: RhythmInstruction = <RhythmInstruction>value;
@@ -836,8 +838,9 @@ export class InstrumentReader {
             }
           }
         }
-        if (this.activeRhythm !== undefined && this.activeRhythm === rhythmInstruction)
+        if (this.activeRhythm !== undefined && this.activeRhythm === rhythmInstruction) {
           this.abstractInstructions.remove(key);
+        }
       }
     }
   }