From 534014042793f9a88eefae40e88f630265115190 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Sun, 4 Aug 2019 21:35:00 -0500 Subject: [PATCH] Draft: importDWG.py, use FreeCAD.Console.Print, instead of basic Python print() --- src/Mod/Draft/importDWG.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Mod/Draft/importDWG.py b/src/Mod/Draft/importDWG.py index 5f51835235..3ed05ec142 100644 --- a/src/Mod/Draft/importDWG.py +++ b/src/Mod/Draft/importDWG.py @@ -45,6 +45,8 @@ https://knowledge.autodesk.com/support/autocad/downloads/ # * * # *************************************************************************** +# TODO: use subprocess.popen() instead of subprocess.call() + import six import FreeCAD from FreeCAD import Console as FCC @@ -208,7 +210,8 @@ def convertToDxf(dwgfilename): basename = os.path.basename(dwgfilename) cmdline = ('"%s" "%s" "%s" "ACAD2000" "DXF" "0" "1" "%s"' % (teigha, indir, outdir, basename)) - print("Converting: " + cmdline) + FCC.PrintMessage(translate("ImportDWG", "Converting: ") + + cmdline + "\n") if six.PY2: if isinstance(cmdline, six.text_type): encoding = sys.getfilesystemencoding() @@ -216,7 +219,8 @@ def convertToDxf(dwgfilename): subprocess.call(cmdline, shell=True) # os.system(cmdline) result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf" if os.path.exists(result): - print("Conversion successful") + FCC.PrintMessage(translate("ImportDWG", + "Conversion successful") + "\n") return result else: _msg = ("Error during DWG to DXF conversion. " @@ -252,7 +256,8 @@ def convertToDwg(dxffilename, dwgfilename): basename = os.path.basename(dxffilename) cmdline = ('"%s" "%s" "%s" "ACAD2000" "DWG" "0" "1" "%s"' % (teigha, indir, outdir, basename)) - print("converting " + cmdline) + FCC.PrintMessage(translate("ImportDWG", "Converting: ") + + cmdline + "\n") subprocess.call(cmdline, shell=True) # os.system(cmdline) return dwgfilename return None