fixed additional StaffMeasure -> GraphicalMeasure renames, compiles again

src/MusicalScore/Graphical/VexFlow/VexFlowMeasure.ts

@@ -576,7 +576,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) {
@@ -634,7 +634,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 {

src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator.ts

@@ -45,18 +45,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();
                 }
             }
@@ -138,8 +138,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();
   }
 
   /**
@@ -197,7 +197,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;
   }
 
@@ -268,7 +268,7 @@ export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
   protected calculateDynamicExpressionsForSingleMultiExpression(multiExpression: MultiExpression, measureIndex: number, staffIndex: number): void {
     if (multiExpression.InstantaniousDynamic) {
         const timeStamp: Fraction = multiExpression.Timestamp;
-        const measure: StaffMeasure = this.graphicalMusicSheet.MeasureList[measureIndex][staffIndex];
+        const measure: GraphicalMeasure = this.graphicalMusicSheet.MeasureList[measureIndex][staffIndex];
         const startStaffEntry: GraphicalStaffEntry = measure.findGraphicalStaffEntryFromTimestamp(timeStamp);
         const idx: VexFlowInstantaniousDynamicExpression = new VexFlowInstantaniousDynamicExpression(multiExpression.InstantaniousDynamic, startStaffEntry);
         (measure as VexFlowMeasure).instantaniousDynamics.push(idx);
@@ -291,12 +291,12 @@ export class VexFlowMusicSheetCalculator extends MusicSheetCalculator {
 
     const startStaffLine: StaffLine = this.graphicalMusicSheet.MeasureList[measureIndex][staffIndex].ParentStaffLine;
 
-    let endMeasure: StaffMeasure = undefined;
+    let endMeasure: GraphicalMeasure = undefined;
     if (octaveShift.ParentEndMultiExpression !== undefined) {
         endMeasure = this.graphicalMusicSheet.getGraphicalMeasureFromSourceMeasureAndIndex(octaveShift.ParentEndMultiExpression.SourceMeasureParent,
                                                                                            staffIndex);
     }
-    let startMeasure: StaffMeasure = undefined;
+    let startMeasure: GraphicalMeasure = undefined;
     if (octaveShift.ParentEndMultiExpression !== undefined) {
       startMeasure = this.graphicalMusicSheet.getGraphicalMeasureFromSourceMeasureAndIndex(octaveShift.ParentStartMultiExpression.SourceMeasureParent,
                                                                                            staffIndex);