kopia lustrzana https://github.com/inkstitch/inkstitch
Some updates for small issues in v2.2.0 (#1721)
* * autorun - underpath tolerance * save pdf file format * fill no geoms error for linestring * to satin: do not fail on mixed element listFI/fontupdate
rodzic
e23997ed1c
commit
4f7cd2885f
|
@ -80,7 +80,9 @@ app.on('activate', () => {
|
||||||
|
|
||||||
ipcMain.on('save-pdf', function (event, pageSize) {
|
ipcMain.on('save-pdf', function (event, pageSize) {
|
||||||
mainWindow.webContents.printToPDF({"pageSize": pageSize}, function(error, data) {
|
mainWindow.webContents.printToPDF({"pageSize": pageSize}, function(error, data) {
|
||||||
dialog.showSaveDialog(mainWindow, {"defaultPath": "inkstitch.pdf"}, function(filename, bookmark) {
|
dialog.showSaveDialog(mainWindow, {"defaultPath": "inkstitch.pdf",
|
||||||
|
"filters": [{ name: 'PDF', extensions: ['pdf'] }]
|
||||||
|
}, function(filename, bookmark) {
|
||||||
if (typeof filename !== 'undefined')
|
if (typeof filename !== 'undefined')
|
||||||
fs.writeFileSync(filename, data, 'utf-8');
|
fs.writeFileSync(filename, data, 'utf-8');
|
||||||
})
|
})
|
||||||
|
|
|
@ -269,6 +269,8 @@ class FillStitch(EmbroideryElement):
|
||||||
|
|
||||||
if isinstance(valid_shape, shgeo.Polygon):
|
if isinstance(valid_shape, shgeo.Polygon):
|
||||||
return shgeo.MultiPolygon([valid_shape])
|
return shgeo.MultiPolygon([valid_shape])
|
||||||
|
if isinstance(valid_shape, shgeo.LineString):
|
||||||
|
return shgeo.MultiPolygon([])
|
||||||
|
|
||||||
polygons = []
|
polygons = []
|
||||||
for polygon in valid_shape.geoms:
|
for polygon in valid_shape.geoms:
|
||||||
|
|
|
@ -35,12 +35,15 @@ class ConvertToSatin(InkstitchExtension):
|
||||||
inkex.errormsg(_("Please select at least one line to convert to a satin column."))
|
inkex.errormsg(_("Please select at least one line to convert to a satin column."))
|
||||||
return
|
return
|
||||||
|
|
||||||
if not all(isinstance(item, Stroke) for item in self.elements):
|
if not any(isinstance(item, Stroke) for item in self.elements):
|
||||||
# L10N: Convert To Satin extension, user selected one or more objects that were not lines.
|
# L10N: Convert To Satin extension, user selected one or more objects that were not lines.
|
||||||
inkex.errormsg(_("Only simple lines may be converted to satin columns."))
|
inkex.errormsg(_("Only simple lines may be converted to satin columns."))
|
||||||
return
|
return
|
||||||
|
|
||||||
for element in self.elements:
|
for element in self.elements:
|
||||||
|
if not isinstance(element, Stroke):
|
||||||
|
continue
|
||||||
|
|
||||||
parent = element.node.getparent()
|
parent = element.node.getparent()
|
||||||
index = parent.index(element.node)
|
index = parent.index(element.node)
|
||||||
correction_transform = get_correction_transform(element.node)
|
correction_transform = get_correction_transform(element.node)
|
||||||
|
|
|
@ -270,6 +270,7 @@ def create_element(path, position, direction, element):
|
||||||
|
|
||||||
# Set Ink/Stitch attributes
|
# Set Ink/Stitch attributes
|
||||||
stitch_length = element.node.get(INKSTITCH_ATTRIBS['running_stitch_length_mm'], '')
|
stitch_length = element.node.get(INKSTITCH_ATTRIBS['running_stitch_length_mm'], '')
|
||||||
|
tolerance = element.node.get(INKSTITCH_ATTRIBS['running_stitch_tolerance_mm'], '')
|
||||||
repeats = int(element.node.get(INKSTITCH_ATTRIBS['repeats'], 1))
|
repeats = int(element.node.get(INKSTITCH_ATTRIBS['repeats'], 1))
|
||||||
if repeats % 2 == 0:
|
if repeats % 2 == 0:
|
||||||
repeats -= 1
|
repeats -= 1
|
||||||
|
@ -284,6 +285,8 @@ def create_element(path, position, direction, element):
|
||||||
else:
|
else:
|
||||||
if stitch_length:
|
if stitch_length:
|
||||||
node.set(INKSTITCH_ATTRIBS['running_stitch_length_mm'], stitch_length)
|
node.set(INKSTITCH_ATTRIBS['running_stitch_length_mm'], stitch_length)
|
||||||
|
if tolerance:
|
||||||
|
node.set(INKSTITCH_ATTRIBS['running_stitch_tolerance_mm'], tolerance)
|
||||||
node.set("style", element.node.style + inkex.Style("stroke-dasharray:0.5,0.5;fill:none;"))
|
node.set("style", element.node.style + inkex.Style("stroke-dasharray:0.5,0.5;fill:none;"))
|
||||||
return Stroke(node)
|
return Stroke(node)
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue