From b4568bd754a8b3ede5f42214e854094bdbb1d3ca Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Sun, 9 Sep 2018 15:00:41 -0400 Subject: [PATCH] Cosmetically change mentions of Teigha to ODA Ref: https://forum.freecadweb.org/viewtopic.php?p=255339#p255339 This PR is superficial as it doesn't actually change the path to the newly named executable. --- src/Mod/Draft/Resources/ui/preferences-dwg.ui | 4 ++-- src/Mod/Draft/importDWG.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Mod/Draft/Resources/ui/preferences-dwg.ui b/src/Mod/Draft/Resources/ui/preferences-dwg.ui index 5e2a7fc175..d91df58a91 100644 --- a/src/Mod/Draft/Resources/ui/preferences-dwg.ui +++ b/src/Mod/Draft/Resources/ui/preferences-dwg.ui @@ -31,14 +31,14 @@ - Path to Teigha File Converter + Path to ODA (formerly Teigha) File Converter - The path to your Teigha File Converter executable + The path to your ODA (formerly Teigha) File Converter executable TeighaFileConverter diff --git a/src/Mod/Draft/importDWG.py b/src/Mod/Draft/importDWG.py index c64af8d5b7..93c15eda87 100644 --- a/src/Mod/Draft/importDWG.py +++ b/src/Mod/Draft/importDWG.py @@ -29,8 +29,9 @@ # \brief DWG file importer & exporter # # This module provides support for importing and exporting Autodesk DWG files. -# This module is only a thin layer that uses the Teigha Converter application -# to convert to/from DXF. Then the real work is done by importDXF +# This module is only a thin layer that uses the ODA (formerly Teigha) File +# Converter application to convert to/from DXF. Then the real work is done by +# importDXF if open.__module__ == '__builtin__': pythonopen = open # to distinguish python built-in open function from the one declared here @@ -52,7 +53,7 @@ def insert(filename,docname): doc = importDXF.insert(dxf,docname) return doc return - + def export(objectslist,filename): "called when freecad exports a file" import importDXF,os,tempfile @@ -87,9 +88,9 @@ def getTeighaConverter(): if os.path.exists(teigha): return teigha from DraftTools import translate - FreeCAD.Console.PrintMessage(translate("draft","Teigha File Converter not found, DWG support is disabled")+"\n") + FreeCAD.Console.PrintMessage(translate("draft","ODA (formerly Teigha) File Converter not found, DWG support is disabled")+"\n") return None - + def convertToDxf(dwgfilename): "converts a DWG file to DXF" import os,tempfile,subprocess,sys #import os,tempfile @@ -113,7 +114,7 @@ def convertToDxf(dwgfilename): print("Error during DWG to DXF conversion. Try moving the DWG file to a directory path") print("without spaces and non-english characters, or try saving to a lower DWG version") return None - + def convertToDwg(dxffilename,dwgfilename): "converts a DXF file to DWG" import os,subprocess #import os @@ -127,4 +128,3 @@ def convertToDwg(dxffilename,dwgfilename): subprocess.call(cmdline, shell=True) #os.system(cmdline) return dwgfilename return None -