fix a bug with part-specific text

AaronDavidNewman · Jan 28, 2024 · c9fe94e · c9fe94e
1 parent d2590a8
commit c9fe94e
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 15 deletions.
diff --git a/release/library/trumpet/BeethovenOp21.json b/release/library/trumpet/BeethovenOp21.json
diff --git a/release/smoosic.js b/release/smoosic.js
@@ -4259,8 +4259,8 @@ function createStave(params) {
         }
         sig.addToStave(stave);
     }
-    const curX = stave.getNoteStartX();
-    stave.setNoteStartX(curX + (params.startX - params.adjX));
+    // const curX = stave.getNoteStartX();
+    // stave.setNoteStartX(curX + (params.startX - params.adjX));  
     return stave;
 }
 function getVexTuplets(params) {
@@ -8601,7 +8601,7 @@ class SuiScoreRender {
             // If this text is attached to the measure, base the block location on the rendered measure location.
             if (newGroup.attachToSelector) {
                 // If this text is attached to a staff that is not visible, don't draw it.
-                const mappedStaff = this.score.staves.find((staff) => staff.getMappedStaffId() === newGroup.selector.staff);
+                const mappedStaff = this.score.staves.find((staff) => staff.staffId === newGroup.selector.staff);
                 if (!mappedStaff) {
                     return;
                 }
@@ -9550,6 +9550,12 @@ class SuiScoreView {
             staff.setMappedStaffId(this.staffMap[staff.staffId]);
         });
     }
+    resetPartView() {
+        if (this.staffMap.length === 1) {
+            const staff = this.storeScore.staves[this.staffMap[0]];
+            this.exposePart(staff);
+        }
+    }
     /**
      * Exposes a part:  hides non-part staves, shows part staves.
      * Note this will reset the view.  After this operation, staff 0 will
@@ -9853,7 +9859,7 @@ class SuiScoreViewOperations extends _scoreView__WEBPACK_IMPORTED_MODULE_0__.Sui
         }
         else {
             const stave = this.storeScore.staves[this._getEquivalentStaff(0)];
-            stave.partInfo.updateTextGroup(altGroup, false);
+            stave.partInfo.textGroups = this.score.textGroups;
             _smo_xform_undo__WEBPACK_IMPORTED_MODULE_10__.SmoUndoable.changeTextGroup(this.storeScore, this.storeUndo, altGroup, _smo_xform_undo__WEBPACK_IMPORTED_MODULE_10__.UndoBuffer.bufferSubtypes.REMOVE);
         }
         this.renderer.renderScoreModifiers();
@@ -11375,6 +11381,8 @@ class SuiScoreViewOperations extends _scoreView__WEBPACK_IMPORTED_MODULE_0__.Sui
             }
         }
         if (resetView || restChange || stavesChange) {
+            _smo_xform_operations__WEBPACK_IMPORTED_MODULE_11__.SmoOperation.computeMultipartRest(this.score);
+            // this.resetPartView();
             this.renderer.rerenderAll();
         }
         return this.renderer.updatePromise();
@@ -25165,7 +25173,7 @@ class SmoScoreText extends _scoreModifiers__WEBPACK_IMPORTED_MODULE_1__.SmoScore
             y: 15,
             width: 0,
             height: 0,
-            text: 'Smoosic',
+            text: 'Text',
             fontInfo: {
                 size: 14,
                 family: SmoScoreText.fontFamilies.serif,
@@ -25231,7 +25239,7 @@ class SmoScoreText extends _scoreModifiers__WEBPACK_IMPORTED_MODULE_1__.SmoScore
         this.y = 15;
         this.width = 0;
         this.height = 0;
-        this.text = 'Smoosic';
+        this.text = 'Text';
         this.fontInfo = {
             size: 14,
             family: SmoScoreText.fontFamilies.serif,
@@ -26472,10 +26480,21 @@ class SmoSystemStaff {
     isRest(index) {
         return this.measures[index].isRest();
     }
+    /**
+     * for the purposes of breaking up multimeasure rests, isRepeat is true if
+     * the next bar has a start repeat, or the current bar has an end repeat.
+     * @param index
+     * @returns
+     */
     isRepeat(index) {
-        const specialBar = !(this.measures[index].getEndBarline().barline === _measureModifiers__WEBPACK_IMPORTED_MODULE_3__.SmoBarline.barlines.singleBar &&
-            (this.measures[index].getStartBarline().barline === _measureModifiers__WEBPACK_IMPORTED_MODULE_3__.SmoBarline.barlines.singleBar ||
-                this.measures[index].getStartBarline().barline === _measureModifiers__WEBPACK_IMPORTED_MODULE_3__.SmoBarline.barlines.noBar));
+        if (index < this.measures.length - 1) {
+            if (this.measures[index + 1].getStartBarline().barline !== _measureModifiers__WEBPACK_IMPORTED_MODULE_3__.SmoBarline.barlines.singleBar &&
+                this.measures[index + 1].getStartBarline().barline !== _measureModifiers__WEBPACK_IMPORTED_MODULE_3__.SmoBarline.barlines.noBar) {
+                return true;
+            }
+        }
+        const specialBar = this.measures[index].getEndBarline().barline !== _measureModifiers__WEBPACK_IMPORTED_MODULE_3__.SmoBarline.barlines.singleBar &&
+            this.measures[index].getStartBarline().barline !== _measureModifiers__WEBPACK_IMPORTED_MODULE_3__.SmoBarline.barlines.noBar;
         return specialBar || this.measures[index].repeatSymbol;
     }
     isRepeatSymbol(index) {
@@ -47789,6 +47808,7 @@ class SuiPartInfoAdapter extends _adapter__WEBPACK_IMPORTED_MODULE_5__.SuiCompon
     constructor(view) {
         super(view);
         this.changed = false;
+        this.expandedMultimeasure = false;
         this.currentView = [];
         this.resetPart = false;
         this.currentView = this.view.getView();
@@ -47803,6 +47823,13 @@ class SuiPartInfoAdapter extends _adapter__WEBPACK_IMPORTED_MODULE_5__.SuiCompon
             // Since update will change the displayed score, wait for any display change to complete first.
             yield this.view.renderer.updatePromise();
             yield this.view.updatePartInfo(this.partInfo);
+            // If we are expanding rests, we need to reload the part after setting the 
+            // part change.  So we update the part display a second time with the new value.
+            if (this.resetPart) {
+                this.view.resetPartView();
+                yield this.view.updatePartInfo(this.partInfo);
+                this.resetPart = false;
+            }
         });
     }
     writeLayoutValue(attr, value) {
@@ -47825,7 +47852,10 @@ class SuiPartInfoAdapter extends _adapter__WEBPACK_IMPORTED_MODULE_5__.SuiCompon
     }
     set expandMultimeasureRest(value) {
         this.partInfo.expandMultimeasureRests = value;
-        this.resetPart = true;
+        // If expanding rests, we need to re-read the score, so end
+        if (value === true) {
+            this.resetPart = true;
+        }
         this.update();
     }
     get noteSpacing() {

diff --git a/release/smoosic.js.map b/release/smoosic.js.map
diff --git a/src/common/vex.ts b/src/common/vex.ts
@@ -165,8 +165,8 @@ export function createStave(params: SmoVexStaveParams) {
     }
     sig.addToStave(stave);
   }
-  const curX = stave.getNoteStartX();
-  stave.setNoteStartX(curX + (params.startX - params.adjX));  
+  // const curX = stave.getNoteStartX();
+  // stave.setNoteStartX(curX + (params.startX - params.adjX));  
 
   return stave;
 }

diff --git a/src/render/sui/scoreRender.ts b/src/render/sui/scoreRender.ts
@@ -104,7 +104,7 @@ export class SuiScoreRender {
       // If this text is attached to the measure, base the block location on the rendered measure location.
       if (newGroup.attachToSelector) {
         // If this text is attached to a staff that is not visible, don't draw it.
-        const mappedStaff = this.score!.staves.find((staff) => staff.getMappedStaffId() === newGroup.selector!.staff);
+        const mappedStaff = this.score!.staves.find((staff) => staff.staffId === newGroup.selector!.staff);
         if (!mappedStaff) {
           return;
         }