Create staves in new Part

stringsync · Dec 21, 2023 · fb82aef · fb82aef
1 parent 46b9b48
commit fb82aef
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 11 deletions.
diff --git a/src/rendering/measurefragment.ts b/src/rendering/measurefragment.ts
@@ -162,8 +162,10 @@ export class MeasureFragment {
         config: this.config,
         staveSignature: this.leadingStaveSignature,
         number: staveNumber,
-        beginningBarStyle: this.beginningBarStyle,
-        endBarStyle: this.endBarStyle,
+        musicXml: {
+          beginningBarStyle: this.beginningBarStyle,
+          endBarStyle: this.endBarStyle,
+        },
         measureEntries: this.measureEntries.filter((entry) => {
           if (entry instanceof musicxml.Note) {
             return entry.getStaveNumber() === staveNumber;

diff --git a/src/rendering/measurefragment2.ts b/src/rendering/measurefragment2.ts
@@ -91,6 +91,7 @@ export class MeasureFragment {
       }
 
       return new Part({
+        config: this.config,
         id: partId,
         musicXml: {
           staveLayouts: this.musicXml.staveLayouts,

diff --git a/src/rendering/part2.ts b/src/rendering/part2.ts
@@ -2,6 +2,7 @@ import * as util from '@/util';
 import * as musicxml from '@/musicxml';
 import { Stave, StaveRendering } from './stave';
 import { MeasureEntry, StaveSignature } from './stavesignature';
+import { Config } from './config';
 
 /** The result of rendering a part. */
 export type PartRendering = {
@@ -12,6 +13,7 @@ export type PartRendering = {
 
 /** A part in a musical score. */
 export class Part {
+  private config: Config;
   private id: string;
   private musicXml: {
     staveLayouts: musicxml.StaveLayout[];
@@ -22,6 +24,7 @@ export class Part {
   private staveSignature: StaveSignature;
 
   constructor(opts: {
+    config: Config;
     id: string;
     musicXml: {
       staveLayouts: musicxml.StaveLayout[];
@@ -31,6 +34,7 @@ export class Part {
     measureEntries: MeasureEntry[];
     staveSignature: StaveSignature;
   }) {
+    this.config = opts.config;
     this.id = opts.id;
     this.musicXml = opts.musicXml;
     this.measureEntries = opts.measureEntries;
@@ -48,6 +52,34 @@ export class Part {
 
   @util.memoize()
   private getStaves(): Stave[] {
-    return [];
+    const result = new Array<Stave>();
+
+    const staveCount = this.staveSignature.getStaveCount();
+
+    for (let staveIndex = 0; staveIndex < staveCount; staveIndex++) {
+      const staveNumber = staveIndex + 1;
+
+      const measureEntries = this.measureEntries.filter((entry) => {
+        if (entry instanceof musicxml.Note) {
+          return entry.getStaveNumber() === staveNumber;
+        }
+        return true;
+      });
+
+      result.push(
+        new Stave({
+          config: this.config,
+          staveSignature: this.staveSignature,
+          number: staveNumber,
+          musicXml: {
+            beginningBarStyle: this.musicXml.beginningBarStyle,
+            endBarStyle: this.musicXml.endBarStyle,
+          },
+          measureEntries,
+        })
+      );
+    }
+
+    return result;
   }
 }
diff --git a/src/rendering/stave.ts b/src/rendering/stave.ts
@@ -49,24 +49,27 @@ export type StaveModifier = 'clef' | 'keySignature' | 'timeSignature';
 export class Stave {
   private config: Config;
   private number: number;
+  private musicXml: {
+    beginningBarStyle: musicxml.BarStyle;
+    endBarStyle: musicxml.BarStyle;
+  };
   private staveSignature: StaveSignature;
-  private beginningBarStyle: musicxml.BarStyle;
-  private endBarStyle: musicxml.BarStyle;
   private measureEntries: MeasureEntry[];
 
   constructor(opts: {
     config: Config;
     number: number;
     staveSignature: StaveSignature;
-    beginningBarStyle: musicxml.BarStyle;
-    endBarStyle: musicxml.BarStyle;
+    musicXml: {
+      beginningBarStyle: musicxml.BarStyle;
+      endBarStyle: musicxml.BarStyle;
+    };
     measureEntries: MeasureEntry[];
   }) {
     this.config = opts.config;
     this.number = opts.number;
     this.staveSignature = opts.staveSignature;
-    this.beginningBarStyle = opts.beginningBarStyle;
-    this.endBarStyle = opts.endBarStyle;
+    this.musicXml = opts.musicXml;
     this.measureEntries = opts.measureEntries;
   }
 
@@ -166,10 +169,10 @@ export class Stave {
         ? new vexflow.TabStave(opts.x, opts.y, opts.width)
         : new vexflow.Stave(opts.x, opts.y, opts.width);
 
-    const vfBeginningBarlineType = conversions.fromBarStyleToBarlineType(this.beginningBarStyle);
+    const vfBeginningBarlineType = conversions.fromBarStyleToBarlineType(this.musicXml.beginningBarStyle);
     vfStave.setBegBarType(vfBeginningBarlineType);
 
-    const vfEndBarlineType = conversions.fromBarStyleToBarlineType(this.endBarStyle);
+    const vfEndBarlineType = conversions.fromBarStyleToBarlineType(this.musicXml.endBarStyle);
     vfStave.setEndBarType(vfEndBarlineType);
 
     if (opts.modifiers.includes('clef')) {