Pārlūkot izejas kodu

refactor: rename NewSystemAndPartAfterFinalBarline to NewPartAndSystemAfterFinalBarline

it puts the more relevant part in front, and it helps avoid being mixed up with NewSystemAtXMLNewSystemAttribute
sschmid 4 gadi atpakaļ
vecāks
revīzija
65af7b59a6

+ 2 - 2
src/MusicalScore/Graphical/EngravingRules.ts

@@ -60,7 +60,7 @@ export class EngravingRules {
     public KeyRightMargin: number;
     public RhythmRightMargin: number;
     public ShowRhythmAgainAfterPartEndOrFinalBarline: boolean;
-    public NewSystemAndPartAfterFinalBarline: boolean;
+    public NewPartAndSystemAfterFinalBarline: boolean;
     public InStaffClefScalingFactor: number;
     public DistanceBetweenNaturalAndSymbolWhenCancelling: number;
     public NoteHelperLinesOffset: number;
@@ -320,7 +320,7 @@ export class EngravingRules {
         this.KeyRightMargin = 0.75;
         this.RhythmRightMargin = 1.25;
         this.ShowRhythmAgainAfterPartEndOrFinalBarline = true;
-        this.NewSystemAndPartAfterFinalBarline = false;
+        this.NewPartAndSystemAfterFinalBarline = false;
         this.InStaffClefScalingFactor = 0.8;
         this.DistanceBetweenNaturalAndSymbolWhenCancelling = 0.4;
 

+ 2 - 1
src/MusicalScore/Graphical/MusicSystemBuilder.ts

@@ -82,6 +82,7 @@ export class MusicSystemBuilder {
             }
             const sourceMeasure: SourceMeasure = graphicalMeasures[0].parentSourceMeasure;
             const sourceMeasureEndsPart: boolean = sourceMeasure.HasEndLine;
+            const sourceMeasureBreaksSystem: boolean = sourceMeasureEndsPart && this.rules.NewPartAndSystemAfterFinalBarline;
             const isSystemStartMeasure: boolean = this.currentSystemParams.IsSystemStartMeasure();
             const isFirstSourceMeasure: boolean = sourceMeasure === this.graphicalMusicSheet.ParentMusicSheet.getFirstSourceMeasure();
             let currentMeasureBeginInstructionsWidth: number = this.rules.MeasureLeftMargin;
@@ -140,7 +141,7 @@ export class MusicSystemBuilder {
                 );
                 this.updateActiveClefs(sourceMeasure, graphicalMeasures);
                 this.measureListIndex++;
-                if (sourceMeasureEndsPart && this.rules.NewSystemAndPartAfterFinalBarline) {
+                if (sourceMeasureBreaksSystem) {
                     this.finalizeCurrentAndCreateNewSystem(graphicalMeasures, !this.rules.StretchLastSystemLine, false);
                 }
                 prevMeasureEndsPart = sourceMeasureEndsPart;

+ 2 - 1
src/MusicalScore/ScoreIO/MusicSheetReader.ts

@@ -147,7 +147,8 @@ export class MusicSheetReader /*implements IMusicSheetReader*/ {
         }
 
         while (couldReadMeasure) {
-            if (this.currentMeasure !== undefined && this.currentMeasure.HasEndLine && this.rules.NewSystemAndPartAfterFinalBarline) {
+            // TODO changing this.rules.PartAndSystemAfterFinalBarline requires a reload of the piece for measure numbers to be updated
+            if (this.currentMeasure !== undefined && this.currentMeasure.HasEndLine && this.rules.NewPartAndSystemAfterFinalBarline) {
                 sourceMeasureCounter = 0;
             }
             this.currentMeasure = new SourceMeasure(this.completeNumberOfStaves, this.musicSheet.Rules);