kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Cosmetically change mentions of Teigha to ODA

Browse Source 
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.
This commit is contained in:
luz.paz
2018-09-09 15:00:41 -04:00
committed by wmayer
parent 69d46d1b43
commit b4568bd754
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Draft/Resources/ui/preferences-dwg.ui
View File

@@ -31,14 +31,14 @@
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Path to Teigha File Converter</string>
<string>Path to ODA (formerly Teigha) File Converter</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefFileChooser" name="gui::preffilechooser_2">
<property name="toolTip">
<string>The path to your Teigha File Converter executable</string>
<string>The path to your ODA (formerly Teigha) File Converter executable</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>TeighaFileConverter</cstring>

14
src/Mod/Draft/importDWG.py
View File

@@ -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