bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Beta_8.995' into Beta_8.995

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-12 16:23:12 +02:00
parent 1a131eb71e e2963f8422
commit 918d446ac3
2 changed files with 122 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -17,6 +17,8 @@ CHANGELOG for FlatCAM beta
11.11.2020 11.11.2020
- removed the forcing of multigeo geometry usage when creating CNCJobs - removed the forcing of multigeo geometry usage when creating CNCJobs
- in Film Tool added messages to warn the user that it can't save a film to file due of existing locked file, if the file needs to overwrite another file who is opened in another application
- in Film Tool warn the user if it tries to save a film to file but the artwork is outside the page size therefore invisible
10.11.2020 10.11.2020

184
appTools/ToolFilm.py
View File

@@ -27,6 +27,7 @@ from svglib.svglib import svg2rlg
from xml.dom.minidom import parseString as parse_xml_string from xml.dom.minidom import parseString as parse_xml_string
from lxml import etree as ET from lxml import etree as ET
from io import StringIO from io import StringIO
import re
import gettext import gettext
import appTranslation as fcTranslate import appTranslation as fcTranslate
@@ -585,7 +586,7 @@ class Film(AppTool):
with open(filename, 'w') as fp: with open(filename, 'w') as fp:
fp.write(doc_final) fp.write(doc_final)
except PermissionError: except PermissionError:
self.app.inform.emit('[WARNING] %s' % self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Permission denied, saving not possible.\n" _("Permission denied, saving not possible.\n"
"Most likely another app is holding the file open and not accessible.")) "Most likely another app is holding the file open and not accessible."))
return 'fail' return 'fail'
@@ -599,32 +600,61 @@ class Film(AppTool):
# renderPM.drawToFile(drawing, filename, 'PNG') # renderPM.drawToFile(drawing, filename, 'PNG')
# else: # else:
# renderPM.drawToFile(drawing, filename, 'PNG', dpi=new_png_dpi) # renderPM.drawToFile(drawing, filename, 'PNG', dpi=new_png_dpi)
except PermissionError:
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Permission denied, saving not possible.\n"
"Most likely another app is holding the file open and not accessible."))
return 'fail'
except Exception as e: except Exception as e:
log.debug("FilmTool.export_negative() --> PNG output --> %s" % str(e)) log.debug("FilmTool.export_negative() --> PNG output --> %s" % str(e))
return 'fail' return 'fail'
else: else: # PDF
try: try:
if self.units == 'INCH': if self.units == 'IN':
unit = inch unit = inch
else: else:
unit = mm unit = mm
p_size = self.ui.pagesize_combo.get_value()
if p_size == 'Bounds':
page_size = None
elif self.ui.orientation_radio.get_value() == 'p':
page_size = portrait(self.ui.pagesize[p_size])
else:
page_size = landscape(self.ui.pagesize[p_size])
xmin, ymin, xmax, ymax = obj.bounds()
if page_size:
page_xmax, page_ymax = (
page_size[0] / mm,
page_size[1] / mm
)
else:
page_xmax, page_ymax = xmax, ymax
if xmax < 0 or ymax < 0 or xmin > page_xmax or ymin > page_ymax:
err_msg = '[ERROR_NOTCL] %s %s' % \
(_("Failed."),
_("The artwork has to be within the selected page size in order to be visible.\n"
"For 'Bounds' page size, it needs to be in the first quadrant."))
self.app.inform.emit(err_msg)
return 'fail'
doc_final = StringIO(doc_final) doc_final = StringIO(doc_final)
drawing = svg2rlg(doc_final) drawing = svg2rlg(doc_final)
p_size = self.ui.pagesize_combo.get_value()
if p_size == 'Bounds': if p_size == 'Bounds':
renderPDF.drawToFile(drawing, filename) renderPDF.drawToFile(drawing, filename)
else: else:
if self.ui.orientation_radio.get_value() == 'p':
page_size = portrait(self.ui.pagesize[p_size])
else:
page_size = landscape(self.ui.pagesize[p_size])
my_canvas = canvas.Canvas(filename, pagesize=page_size) my_canvas = canvas.Canvas(filename, pagesize=page_size)
my_canvas.translate(bounds[0] * unit, bounds[1] * unit) my_canvas.translate(bounds[0] * unit, bounds[1] * unit)
renderPDF.draw(drawing, my_canvas, 0, 0) renderPDF.draw(drawing, my_canvas, 0, 0)
my_canvas.save() my_canvas.save()
except PermissionError:
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Permission denied, saving not possible.\n"
"Most likely another app is holding the file open and not accessible."))
return 'fail'
except Exception as e: except Exception as e:
log.debug("FilmTool.export_negative() --> PDF output --> %s" % str(e)) log.debug("FilmTool.export_negative() --> PDF output --> %s" % str(e))
return 'fail' return 'fail'
@@ -835,7 +865,7 @@ class Film(AppTool):
with open(filename, 'w') as fp: with open(filename, 'w') as fp:
fp.write(doc_final) fp.write(doc_final)
except PermissionError: except PermissionError:
self.app.inform.emit('[WARNING] %s' % self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Permission denied, saving not possible.\n" _("Permission denied, saving not possible.\n"
"Most likely another app is holding the file open and not accessible.")) "Most likely another app is holding the file open and not accessible."))
return 'fail' return 'fail'
@@ -844,6 +874,11 @@ class Film(AppTool):
doc_final = StringIO(doc_final) doc_final = StringIO(doc_final)
drawing = svg2rlg(doc_final) drawing = svg2rlg(doc_final)
renderPM.drawToFile(drawing, filename, 'PNG') renderPM.drawToFile(drawing, filename, 'PNG')
except PermissionError:
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Permission denied, saving not possible.\n"
"Most likely another app is holding the file open and not accessible."))
return 'fail'
except Exception as e: except Exception as e:
log.debug("FilmTool.export_positive() --> PNG output --> %s" % str(e)) log.debug("FilmTool.export_positive() --> PNG output --> %s" % str(e))
return 'fail' return 'fail'
@@ -854,21 +889,45 @@ class Film(AppTool):
else: else:
unit = mm unit = mm
if p_size == 'Bounds':
page_size = None
elif orientation == 'p':
page_size = portrait(self.ui.pagesize[p_size])
else:
page_size = landscape(self.ui.pagesize[p_size])
xmin, ymin, xmax, ymax = obj.bounds()
if page_size:
page_xmax, page_ymax = (
page_size[0] / mm,
page_size[1] / mm
)
else:
page_xmax, page_ymax = xmax, ymax
if xmax < 0 or ymax < 0 or xmin > page_xmax or ymin > page_ymax:
err_msg = '[ERROR_NOTCL] %s %s' % \
(_("Failed."),
_("The artwork has to be within the selected page size in order to be visible.\n"
"For 'Bounds' page size, it needs to be in the first quadrant."))
self.app.inform.emit(err_msg)
return 'fail'
doc_final = StringIO(doc_final) doc_final = StringIO(doc_final)
drawing = svg2rlg(doc_final) drawing = svg2rlg(doc_final)
if p_size == 'Bounds': if p_size == 'Bounds':
renderPDF.drawToFile(drawing, filename) renderPDF.drawToFile(drawing, filename)
else: else:
if orientation == 'p':
page_size = portrait(self.ui.pagesize[p_size])
else:
page_size = landscape(self.ui.pagesize[p_size])
my_canvas = canvas.Canvas(filename, pagesize=page_size) my_canvas = canvas.Canvas(filename, pagesize=page_size)
my_canvas.translate(bounds[0] * unit, bounds[1] * unit) my_canvas.translate(bounds[0] * unit, bounds[1] * unit)
renderPDF.draw(drawing, my_canvas, 0, 0) renderPDF.draw(drawing, my_canvas, 0, 0)
my_canvas.save() my_canvas.save()
except PermissionError:
self.app.inform.emit('[ERROR_NOTCL] %s' %
_("Permission denied, saving not possible.\n"
"Most likely another app is holding the file open and not accessible."))
return 'fail'
except Exception as e: except Exception as e:
log.debug("FilmTool.export_positive() --> PDF output --> %s" % str(e)) log.debug("FilmTool.export_positive() --> PDF output --> %s" % str(e))
return 'fail' return 'fail'
@@ -1288,59 +1347,56 @@ class FilmUI:
self.pagesize_combo = FCComboBox() self.pagesize_combo = FCComboBox()
self.pagesize = {} self.pagesize = {
self.pagesize.update( 'Bounds': None,
{ 'A0': (841 * mm, 1189 * mm),
'Bounds': None, 'A1': (594 * mm, 841 * mm),
'A0': (841 * mm, 1189 * mm), 'A2': (420 * mm, 594 * mm),
'A1': (594 * mm, 841 * mm), 'A3': (297 * mm, 420 * mm),
'A2': (420 * mm, 594 * mm), 'A4': (210 * mm, 297 * mm),
'A3': (297 * mm, 420 * mm), 'A5': (148 * mm, 210 * mm),
'A4': (210 * mm, 297 * mm), 'A6': (105 * mm, 148 * mm),
'A5': (148 * mm, 210 * mm), 'A7': (74 * mm, 105 * mm),
'A6': (105 * mm, 148 * mm), 'A8': (52 * mm, 74 * mm),
'A7': (74 * mm, 105 * mm), 'A9': (37 * mm, 52 * mm),
'A8': (52 * mm, 74 * mm), 'A10': (26 * mm, 37 * mm),
'A9': (37 * mm, 52 * mm),
'A10': (26 * mm, 37 * mm),
'B0': (1000 * mm, 1414 * mm), 'B0': (1000 * mm, 1414 * mm),
'B1': (707 * mm, 1000 * mm), 'B1': (707 * mm, 1000 * mm),
'B2': (500 * mm, 707 * mm), 'B2': (500 * mm, 707 * mm),
'B3': (353 * mm, 500 * mm), 'B3': (353 * mm, 500 * mm),
'B4': (250 * mm, 353 * mm), 'B4': (250 * mm, 353 * mm),
'B5': (176 * mm, 250 * mm), 'B5': (176 * mm, 250 * mm),
'B6': (125 * mm, 176 * mm), 'B6': (125 * mm, 176 * mm),
'B7': (88 * mm, 125 * mm), 'B7': (88 * mm, 125 * mm),
'B8': (62 * mm, 88 * mm), 'B8': (62 * mm, 88 * mm),
'B9': (44 * mm, 62 * mm), 'B9': (44 * mm, 62 * mm),
'B10': (31 * mm, 44 * mm), 'B10': (31 * mm, 44 * mm),
'C0': (917 * mm, 1297 * mm), 'C0': (917 * mm, 1297 * mm),
'C1': (648 * mm, 917 * mm), 'C1': (648 * mm, 917 * mm),
'C2': (458 * mm, 648 * mm), 'C2': (458 * mm, 648 * mm),
'C3': (324 * mm, 458 * mm), 'C3': (324 * mm, 458 * mm),
'C4': (229 * mm, 324 * mm), 'C4': (229 * mm, 324 * mm),
'C5': (162 * mm, 229 * mm), 'C5': (162 * mm, 229 * mm),
'C6': (114 * mm, 162 * mm), 'C6': (114 * mm, 162 * mm),
'C7': (81 * mm, 114 * mm), 'C7': (81 * mm, 114 * mm),
'C8': (57 * mm, 81 * mm), 'C8': (57 * mm, 81 * mm),
'C9': (40 * mm, 57 * mm), 'C9': (40 * mm, 57 * mm),
'C10': (28 * mm, 40 * mm), 'C10': (28 * mm, 40 * mm),
# American paper sizes # American paper sizes
'LETTER': (8.5 * inch, 11 * inch), 'LETTER': (8.5 * inch, 11 * inch),
'LEGAL': (8.5 * inch, 14 * inch), 'LEGAL': (8.5 * inch, 14 * inch),
'ELEVENSEVENTEEN': (11 * inch, 17 * inch), 'ELEVENSEVENTEEN': (11 * inch, 17 * inch),
# From https://en.wikipedia.org/wiki/Paper_size # From https://en.wikipedia.org/wiki/Paper_size
'JUNIOR_LEGAL': (5 * inch, 8 * inch), 'JUNIOR_LEGAL': (5 * inch, 8 * inch),
'HALF_LETTER': (5.5 * inch, 8 * inch), 'HALF_LETTER': (5.5 * inch, 8 * inch),
'GOV_LETTER': (8 * inch, 10.5 * inch), 'GOV_LETTER': (8 * inch, 10.5 * inch),
'GOV_LEGAL': (8.5 * inch, 13 * inch), 'GOV_LEGAL': (8.5 * inch, 13 * inch),
'LEDGER': (17 * inch, 11 * inch), 'LEDGER': (17 * inch, 11 * inch),
} }
)
page_size_list = list(self.pagesize.keys()) page_size_list = list(self.pagesize.keys())
self.pagesize_combo.addItems(page_size_list) self.pagesize_combo.addItems(page_size_list)