From 650fed9795f9ea97e701fbb5d47da15836573c4b Mon Sep 17 00:00:00 2001 From: wandererfan Date: Wed, 2 May 2018 12:29:18 -0400 Subject: [PATCH] Point Draft importDXF to Mod/Import/ImpExpDxf - also add "deprecated" message to DraftUtils.readDXF --- src/Mod/Draft/App/AppDraftUtilsPy.cpp | 1 + src/Mod/Draft/importDXF.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Mod/Draft/App/AppDraftUtilsPy.cpp b/src/Mod/Draft/App/AppDraftUtilsPy.cpp index 2966113093..f8bcefb29c 100644 --- a/src/Mod/Draft/App/AppDraftUtilsPy.cpp +++ b/src/Mod/Draft/App/AppDraftUtilsPy.cpp @@ -56,6 +56,7 @@ public: private: Py::Object readDXF(const Py::Tuple& args) { + Base::Console().Warning("DraftUtils.readDXF is deprecated. Use Import.readDxf instead.\n"); char* Name; const char* DocName=0; bool IgnoreErrors=true; diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index e88ef5087e..f46ba6ef95 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -1570,8 +1570,8 @@ def open(filename): doc = FreeCAD.newDocument(docname) doc.Label = decodeName(docname) FreeCAD.setActiveDocument(doc.Name) - import DraftUtils - DraftUtils.readDXF(filename) + import Import + Import.readDXF(filename) def insert(filename,docname): "called when freecad imports a file" @@ -1597,8 +1597,8 @@ def insert(filename,docname): else: errorDXFLib(gui) else: - import DraftUtils - DraftUtils.readDXF(filename) + import Import + Import.readDXF(filename) def getShapes(filename): "reads a dxf file and returns a list of shapes from its contents"