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

- updated German language translation files

Browse Source 
- separated the Plotting thread from the transformations threads
This commit is contained in:
Marius Stanciu
2019-09-07 23:16:20 +03:00
committed by Marius
parent bdbe0f59f0
commit 28a86aa661
9 changed files with 4085 additions and 3458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatcamTools/ToolMove.py
View File

@@ -184,7 +184,7 @@ class ToolMove(FlatCAMTool):
def replot(self, obj_list):
def worker_task():
with self.app.proc_container.new(_("Plotting...")):
with self.app.proc_container.new('%s...' % _("Plotting")):
for sel_obj in obj_list:
sel_obj.plot()

24
flatcamTools/ToolPDF.py
View File

@@ -183,12 +183,20 @@ class ToolPDF(FlatCAMTool):
# 1 inch = 72 points => 1 point = 1 / 72 = 0.01388888888 inch
self.point_to_unit_factor = 1 / 72
if self.app.abort_flag:
# graceful abort requested by the user
raise FlatCAMApp.GracefulException
with self.app.proc_container.new(_("Parsing PDF file ...")):
with open(filename, "rb") as f:
pdf = f.read()
stream_nr = 0
for s in re.findall(self.stream_re, pdf):
if self.app.abort_flag:
# graceful abort requested by the user
raise FlatCAMApp.GracefulException
stream_nr += 1
log.debug(" PDF STREAM: %d\n" % stream_nr)
s = s.strip(b'\r\n')
@@ -389,10 +397,18 @@ class ToolPDF(FlatCAMTool):
if self.pdf_parsed:
obj_to_delete = []
for object_name in self.pdf_parsed:
if self.app.abort_flag:
# graceful abort requested by the user
raise FlatCAMApp.GracefulException
filename = deepcopy(self.pdf_parsed[object_name]['filename'])
pdf_content = deepcopy(self.pdf_parsed[object_name]['pdf'])
obj_to_delete.append(object_name)
for k in pdf_content:
if self.app.abort_flag:
# graceful abort requested by the user
raise FlatCAMApp.GracefulException
ap_dict = pdf_content[k]
if ap_dict:
layer_nr = k
@@ -470,6 +486,10 @@ class ToolPDF(FlatCAMTool):
lines = pdf_content.splitlines()
for pline in lines:
if self.app.abort_flag:
# graceful abort requested by the user
raise FlatCAMApp.GracefulException
line_nr += 1
log.debug("line %d: %s" % (line_nr, pline))
@@ -1328,6 +1348,10 @@ class ToolPDF(FlatCAMTool):
if x in object_dict:
object_dict.pop(x)
if self.app.abort_flag:
# graceful abort requested by the user
raise FlatCAMApp.GracefulException
return object_dict
def bezier_to_points(self, start, c1, c2, stop):