Ver Fonte

added a few GraphicalMeasure renames not caught by cherry-picked commit, builds again
demo working too

sschmidTU há 7 anos atrás
pai
commit
432674c3d3

+ 2 - 2
src/MusicalScore/Graphical/VexFlow/VexFlowMeasure.ts

@@ -574,7 +574,7 @@ export class VexFlowMeasure extends GraphicalMeasure {
         return;
     }
 
-    public staffMeasureCreatedCalculations(): void {
+    public graphicalMeasureCreatedCalculations(): void {
         for (const graphicalStaffEntry of this.staffEntries as VexFlowStaffEntry[]) {
             // create vex flow Stave Notes:
             for (const gve of graphicalStaffEntry.graphicalVoiceEntries) {
@@ -629,7 +629,7 @@ export class VexFlowMeasure extends GraphicalMeasure {
     }
 
     /**
-     * Return the VexFlow Stave corresponding to this StaffMeasure
+     * Return the VexFlow Stave corresponding to this graphicalMeasure
      * @returns {Vex.Flow.Stave}
      */
     public getVFStave(): Vex.Flow.Stave {

+ 10 - 10
src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator.ts

@@ -44,18 +44,18 @@ export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
 
   protected clearRecreatedObjects(): void {
     super.clearRecreatedObjects();
-    for (const staffMeasures of this.graphicalMusicSheet.MeasureList) {
-      for (const staffMeasure of staffMeasures) {
-        (<VexFlowMeasure>staffMeasure).clean();
+    for (const graphicalMeasures of this.graphicalMusicSheet.MeasureList) {
+      for (const graphicalMeasure of graphicalMeasures) {
+        (<VexFlowMeasure>graphicalMeasure).clean();
       }
     }
   }
 
     protected formatMeasures(): void {
-        for (const staffMeasures of this.graphicalMusicSheet.MeasureList) {
-            for (const staffMeasure of staffMeasures) {
-                (<VexFlowMeasure>staffMeasure).format();
-                for (const staffEntry of staffMeasure.staffEntries) {
+        for (const graphicalMeasures of this.graphicalMusicSheet.MeasureList) {
+            for (const graphicalMeasure of graphicalMeasures) {
+                (<VexFlowMeasure>graphicalMeasure).format();
+                for (const staffEntry of graphicalMeasure.staffEntries) {
                     (<VexFlowStaffEntry>staffEntry).calculateXPosition();
                 }
             }
@@ -137,8 +137,8 @@ export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
     return;
   }
 
-  protected staffMeasureCreatedCalculations(measure: GraphicalMeasure): void {
-    (measure as VexFlowMeasure).staffMeasureCreatedCalculations();
+  protected graphicalMeasureCreatedCalculations(measure: GraphicalMeasure): void {
+    (measure as VexFlowMeasure).graphicalMeasureCreatedCalculations();
   }
 
   /**
@@ -196,7 +196,7 @@ export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
   /**
    * Is called at the begin of the method for creating the vertically aligned staff measures belonging to one source measure.
    */
-  protected initStaffMeasuresCreation(): void {
+  protected initGraphicalMeasuresCreation(): void {
     return;
   }