Skip to content

fix DXF importer compatibility with newer Draft APIs #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
usimd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix DXF importer compatibility with newer Draft APIs #271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions dxf_parser/_importDXF.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,20 @@ def translate(context, txt):
_dxfReader = None
_dxfColorMap = None
_dxfLibrary = None
_draft_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")


def _get_draft_param(name, default):
"""Return a Draft preference across FreeCAD API versions."""
if hasattr(Draft, "getParam"):
return Draft.getParam(name, default)
if isinstance(default, bool):
return _draft_prefs.GetBool(name, default)
if isinstance(default, int):
return _draft_prefs.GetInt(name, default)
if isinstance(default, float):
return _draft_prefs.GetFloat(name, default)
return _draft_prefs.GetString(name, default)

# Save the native open function to avoid collisions
# with the function declared here
Expand Down Expand Up @@ -126,7 +140,7 @@ def getDXFlibs():

def prec():
"""Return the current Draft precision level."""
return Draft.getParam("precision", 6)
return _get_draft_param("precision", 6)


def deformat(text):
Expand Down Expand Up @@ -3483,7 +3497,7 @@ def export(objectslist, filename, nospline=False, lwPoly=False):
dxf = _dxfLibrary.Drawing()
# add global variables
if hasattr(dxf,"header"):
dxf.header.append(" 9\n$DIMTXT\n 40\n"+str(Draft.getParam("textheight", 20))+"\n")
dxf.header.append(" 9\n$DIMTXT\n 40\n"+str(_get_draft_param("textheight", 20.0))+"\n")
dxf.header.append(" 9\n$INSUNITS\n 70\n4\n")
for ob in exportLayers:
if ob.Label != "0": # dxflibrary already creates it
Expand Down