Commit 02e7c001 authored by sumpfralle's avatar sumpfralle

removed duplicate definition of default program locations

a failure during the execution of a conversion tool is now an error instead of a warning


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@553 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent 3f72432c
...@@ -35,7 +35,8 @@ def convert_svg2eps(svg_filename, eps_filename, location=None): ...@@ -35,7 +35,8 @@ def convert_svg2eps(svg_filename, eps_filename, location=None):
stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
args = [location, "--export-eps", eps_filename, svg_filename]) args = [location, "--export-eps", eps_filename, svg_filename])
except OSError, err_msg: except OSError, err_msg:
log.warning("SVGImporter: failed to execute 'inkscape': %s" % err_msg) log.error("SVGImporter: failed to execute 'inkscape' (%s): %s" \
% (location, err_msg))
return False return False
returncode = process.wait() returncode = process.wait()
if returncode == 0: if returncode == 0:
...@@ -57,7 +58,8 @@ def convert_eps2dxf(eps_filename, dxf_filename, location=None): ...@@ -57,7 +58,8 @@ def convert_eps2dxf(eps_filename, dxf_filename, location=None):
"-f", "dxf:-polyaslines", "-f", "dxf:-polyaslines",
eps_filename, dxf_filename]) eps_filename, dxf_filename])
except OSError, err_msg: except OSError, err_msg:
log.warning("SVGImporter: failed to execute 'pstoedit': %s" % err_msg) log.error("SVGImporter: failed to execute 'pstoedit' (%s): %s" \
% (location, err_msg))
return False return False
returncode = process.wait() returncode = process.wait()
if returncode == 0: if returncode == 0:
...@@ -76,12 +78,12 @@ def import_model(filename, program_locations=None): ...@@ -76,12 +78,12 @@ def import_model(filename, program_locations=None):
if program_locations and "inkscape" in program_locations: if program_locations and "inkscape" in program_locations:
inkscape_path = program_locations["inkscape"] inkscape_path = program_locations["inkscape"]
else: else:
inkscape_path = "inkscape" inkscape_path = None
if program_locations and "pstoedit" in program_locations: if program_locations and "pstoedit" in program_locations:
pstoedit_path = program_locations["pstoedit"] pstoedit_path = program_locations["pstoedit"]
else: else:
pstoedit_path = "pstoedit" pstoedit_path = None
# the "right" way would be: # the "right" way would be:
# inkscape --print='| pstoedit -dt -f dxf:-polyaslines - -' input.svg # inkscape --print='| pstoedit -dt -f dxf:-polyaslines - -' input.svg
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment