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

small fix if error happens inside thread execution, then pass correct error_info to display

Browse Source 
command imort_svg was using self  instead self.app wrong object

Fix in svgparse for rotate regexp and division by zero problem.
Linestring  need at least 2 points  within very small arcs.
In svg  rect x and  y are optional , they are  0 by default.
Ignore transformation for  unknown kind.
Strip spaces  for  ptliststr In parse_svg_point_list to avoid parsing errors.
This commit is contained in:
Kamil Sopko
2016-04-12 19:44:56 +02:00
parent 611d76e877
commit 96419921e5
3 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tclCommands/TclCommand.py
View File

@@ -388,7 +388,11 @@ class TclCommandSignaled(TclCommand):
return self.output
except Exception as unknown:
error_info=sys.exc_info()
# if error happens inside thread execution, then pass correct error_info to display
if self.error_info is not None:
error_info = self.error_info
else:
error_info=sys.exc_info()
self.log.error("TCL command '%s' failed." % str(self))
self.app.display_tcl_error(unknown, error_info)
self.raise_tcl_unknown_error(unknown)

8
tclCommands/TclCommandImportSvg.py
View File

@@ -58,14 +58,14 @@ class TclCommandImportSvg(TclCommand.TclCommandSignaled):
else:
outname = filename.split('/')[-1].split('\\')[-1]
with self.app.proc_container.new("Opening Gerber"):
with self.app.proc_container.new("Import SVG"):
# Object creation
self.app.new_object("gerber", outname, obj_init)
self.app.new_object("geometry", outname, obj_init)
# Register recent file
self.file_opened.emit("svg", filename)
self.app.file_opened.emit("svg", filename)
# GUI feedback
self.inform.emit("Opened: " + filename)
self.app.inform.emit("Opened: " + filename)