VSinerva/freesewing
1
0
Fork 0
Code Activity

enhancement(title): Add alignment property

Browse source
This commit is contained in:
Benjamin F 2023-05-04 15:24:48 -07:00
parent 92a51ec163
commit e972c72793
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
markdown/dev/reference/macros/title/en.md
View file

@ -9,6 +9,7 @@ It is provided by the [annotations plugin](/reference/plugins/annotations).
```js ```js
macro('title', { macro('title', {
String align,
Boolean append, Boolean append,
Point at, Point at,
Boolean cutlist Boolean cutlist
@ -51,6 +52,7 @@ macro('title', {
| Property | Default | Type | Description | | Property | Default | Type | Description |
| ----------:| :-----: | ------------------- | ----------- | | ----------:| :-----: | ------------------- | ----------- |
| `align' | 'left' | String | Horizontal text alignment. Valid values: 'left', 'right', 'center' |
| `append` | `false` | Boolean | Set this to `true` to append the `nr` to any text already set in Point `at`'s attributes, rather than overwrite it | | `append` | `false` | Boolean | Set this to `true` to append the `nr` to any text already set in Point `at`'s attributes, rather than overwrite it |
| `at` | | [Point](/reference/api/point) | The point at which to insert the title | | `at` | | [Point](/reference/api/point) | The point at which to insert the title |
| `cutlist` | `true` | Boolean | Whether to include cutting instructions | | `cutlist` | `true` | Boolean | Whether to include cutting instructions |

25
plugins/plugin-annotations/src/title.mjs
View file

@ -32,19 +32,26 @@ const titleMacro = function (so, { points, scale, locale, store, part }) {
scale: 1, scale: 1,
rotation: 0, rotation: 0,
cutlist: true, cutlist: true,
align: 'left',
} }
so = { ...defaults, ...so } so = { ...defaults, ...so }
so.scale = so.scale * scale so.scale = so.scale * scale
const validAlignments = ['left', 'right', 'center']
const alignment = validAlignments.includes(so.align) ? ' ' + so.align : ' left'
points[`_${prefix}_titleNr`] = so.at points[`_${prefix}_titleNr`] = so.at
.clone() .clone()
.attr('data-text', so.nr, overwrite) .attr('data-text', so.nr, overwrite)
.attr('data-text-class', 'text-4xl fill-note font-bold') .attr('data-text-class', 'text-4xl fill-note font-bold' + alignment)
.attr('data-text-transform', transform(so.at)) .attr('data-text-transform', transform(so.at))
if (so.title) { if (so.title) {
points[`_${prefix}_titleName`] = nextPoint(so.title, 'text-lg fill-current font-bold') points[`_${prefix}_titleName`] = nextPoint(
so.title,
'text-lg fill-current font-bold' + alignment
)
shift += 8 shift += 8
} }
@ -59,7 +66,7 @@ const titleMacro = function (so, { points, scale, locale, store, part }) {
// each set of instructions // each set of instructions
partCutlist.materials[material].forEach(({ cut, identical, bias, ignoreOnFold }, c) => { partCutlist.materials[material].forEach(({ cut, identical, bias, ignoreOnFold }, c) => {
// make a new point for this set of instructions // make a new point for this set of instructions
const cutPoint = nextPoint('plugin:cut', 'text-md fill-current').addText(cut) const cutPoint = nextPoint('plugin:cut', 'text-md fill-current' + alignment).addText(cut)
// if they're not identical, add that to the point's text // if they're not identical, add that to the point's text
if (!identical && cut > 1) cutPoint.addText('plugin:mirrored') if (!identical && cut > 1) cutPoint.addText('plugin:mirrored')
@ -83,11 +90,14 @@ const titleMacro = function (so, { points, scale, locale, store, part }) {
let name = store.data?.name || 'No Name' let name = store.data?.name || 'No Name'
name = name.replace('@freesewing/', '') name = name.replace('@freesewing/', '')
name += ' v' + (store.data?.version || 'No Version') name += ' v' + (store.data?.version || 'No Version')
points[`_${prefix}_titlePattern`] = nextPoint(name, 'fill-note') points[`_${prefix}_titlePattern`] = nextPoint(name, 'fill-note' + alignment)
if (store.data.for) { if (store.data.for) {
shift += 8 shift += 8
points[`_${prefix}_titleFor`] = nextPoint(`( ${store.data.for} )`, 'fill-current font-bold') points[`_${prefix}_titleFor`] = nextPoint(
`( ${store.data.for} )`,
'fill-current font-bold' + alignment
)
} }
shift += 6 shift += 6
const now = new Date() const now = new Date()
@ -101,7 +111,10 @@ const titleMacro = function (so, { points, scale, locale, store, part }) {
month: 'short', month: 'short',
day: 'numeric', day: 'numeric',
}) })
points[`_${prefix}_exportDate`] = nextPoint(`${exportDate}@ ${hours}:${mins}`, 'text-sm') points[`_${prefix}_exportDate`] = nextPoint(
`${exportDate}@ ${hours}:${mins}`,
'text-sm' + alignment
)
} }
// Export macros // Export macros