smoosic 1.0.27 → 1.0.29

package/release/styles/media.css

@@ -278,9 +278,8 @@ body.printing .media div.d-flex
 
 }
 
-body.printing .workspace-container {
-    display:none;
-}
+body.printing .workspace-container,
+body.printing #top-bar ,
 body.printing .controls-left,
 body.printing .control-bar
  {

package/src/render/sui/mapper.ts

@@ -209,6 +209,10 @@ export abstract class SuiMapper {
 
   _copySelectionsByMeasure(staffIndex: number, measureIndex: number) {
     const rv = this.selections.filter((sel) => sel.selector.staff === staffIndex && sel.selector.measure === measureIndex);
+    const missingNotes = rv.filter((sel) => !sel.note);
+    if (rv.length < 1 || missingNotes.length > 0) {
+      return { ticks: 0, selectors: []};
+    }
     const ticks = rv.length < 1 ? 0 : rv.map((sel) => (sel.note as SmoNote).tickCount).reduce((a, b) => a + b);
     const selectors: SmoSelector[] = [];
     rv.forEach((sel) => {

package/src/styles/media.css

@@ -278,9 +278,8 @@ body.printing .media div.d-flex
 
 }
 
-body.printing .workspace-container {
-    display:none;
-}
+body.printing .workspace-container,
+body.printing #top-bar ,
 body.printing .controls-left,
 body.printing .control-bar
  {

package/src/ui/components/dialogs/partInfo.vue

@@ -18,26 +18,8 @@ interface Props {
 const props = defineProps<Props>();
 const { domId, label, commitCb, cancelCb, updatePartInfoCb } = { ...props };
 const partInfo = reactive(new SmoPartInfo(props.partInfo));
-type numberTypes = 'pageWidth' | 'pageHeight' | 'zoomScale' | 'svgScale' | 'noteSpacing' | 'maxMeasureSystem';
 
-const writeStringValue = async (attr: SmoPartInfoStringType, value: string) => {
-  if (partInfo[attr] === value) {
-    return;
-  }
-  partInfo[attr] = value;
-  await updatePartInfoCb(partInfo);
-}
-const writeNumberValue = async (attr: SmoPartInfoNumType, value: number) => {
-  if (partInfo[attr] === value) {
-    return;
-  }
-  partInfo[attr] = value;
-  await updatePartInfoCb(partInfo);
-}
 const writeBooleanValue = async (attr: SmoPartInfoBooleanType, value: boolean) => {
-  if (partInfo[attr] === value) {
-    return;
-  }
   partInfo[attr] = value;
   await updatePartInfoCb(partInfo);
 }
@@ -69,6 +51,7 @@ const predefinedDimensions: { [key: string]: dimensions } = {
 // Page size is in pixels, but if it matches a preset we just show that.
 // User chooses 'custom' to unlock width/height editing.
 const pageSize = ref('custom');
+
 const pageChange = () => {
  Object.keys(predefinedDimensions).forEach((key) => {
     const dims = predefinedDimensions[key];
@@ -78,6 +61,15 @@ const pageChange = () => {
     }
   });
 };
+const pageSizeCb = async (val: string) => {
+  const dims = predefinedDimensions[val];
+  if (dims) {
+    partInfo.layoutManager.globalLayout.pageWidth = dims.width;
+    partInfo.layoutManager.globalLayout.pageHeight = dims.height;
+  }
+  pageSize.value = val;
+  // The watch will trigger the callback
+}
 const lockDimensions = ref(false);
 pageChange();
 watch (pageSize, async (newVal) => {
@@ -160,18 +152,17 @@ const getId = (str: string) => {
     </div>
     <div class="row mb-2 align-items-center">
       <div class="col col-1">
-        <input class="form-check-input" type="checkbox" v-model="partInfo.preserveTextGroups" :id="getId('preserveText')"
-          @change="writeBooleanValue('preserveTextGroups', partInfo.preserveTextGroups)"></input>
+        <input class="form-check-input" type="checkbox" v-model="includeNext" :id="getId('includeNext')"></input>
       </div>
       <div class="col col-5">
-        <label class="form-check-label" :for="getId('preserveText')">Include Next Stave</label>
+        <label class="form-check-label" :for="getId('includeNext')">Include Next Stave</label>
       </div>
     </div>
     <div class="row mb-2">
       <div class="col col-3 text-end">Page Size</div>
       <div class="col col-6">
         <selectComp :domId="getId('page-size-select')" :label="''" :selections="pageSizes" :initialValue="pageSize"
-          :changeCb="pageChange" />
+          :changeCb="pageSizeCb" />
       </div>
     </div>
     <div class="row mb-2 align-items-center">

package/src/ui/components/dialogs/scoreTranspose.vue

@@ -18,9 +18,6 @@ const transposeIndex: Ref<number> = getTranspose();
 const xposeCb = async (val: number) => {
   transposeIndex.value = val;
 };
-const getDomId = () => {
-  return `attr-modal-dialog-${domId}`;
-}
 const getId = (str: string) => {
   return `${domId}-${str}`;
 }
@@ -30,6 +27,7 @@ const getId = (str: string) => {
       <div class="row mb-2 ms-2">
         <div class="col col-9 pe-0 me-n2">
           <numberInputApp :domId="getId('page-width-input')" :initialValue="transposeIndex" :precision="0"
+            :minValue="-12" :maxValue="12"
             :changeCb="xposeCb" :disabled="false"/>
         </div>
         <div class="col col-3 text-start ps-0 pe-0 ms-n4">

package/src/ui/dialogs/partInfo.ts

@@ -20,13 +20,15 @@ export const SuiPartInfoDialogVue = async (parameters: SuiDialogParams) => {
     // Since update will change the displayed score, wait for any display change to complete first.
     await parameters.view.renderer.updatePromise();
     
+    await parameters.view.updatePartInfo(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 (current.expandMultimeasureRests !== partInfo.expandMultimeasureRests) {
+    if (current.expandMultimeasureRests !== partInfo.expandMultimeasureRests ||
+      current.stavesAfter !== partInfo.stavesAfter) {
       parameters.view.resetPartView();
+      await parameters.view.refreshViewport();
     }
-    await parameters.view.updatePartInfo(partInfo);
-    current = backup;
+    current = new SmoPartInfo(partInfo);
   }
 
   const commitCb = async () => {