From 6b792952c35a181addf7a56174b51ba462df20fe Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Mon, 7 Sep 2015 16:46:08 -0300
Subject: [PATCH] Draft: Added preference setting to use the new C++ dxf
 importer

---
 src/Mod/Draft/Resources/ui/preferences-dxf.ui | 23 ++++++++
 src/Mod/Draft/importDXF.py                    | 55 ++++++++++++-------
 2 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/Mod/Draft/Resources/ui/preferences-dxf.ui b/src/Mod/Draft/Resources/ui/preferences-dxf.ui
index 688363a61..c8b063a4d 100644
--- a/src/Mod/Draft/Resources/ui/preferences-dxf.ui
+++ b/src/Mod/Draft/Resources/ui/preferences-dxf.ui
@@ -61,6 +61,29 @@
       <property name="margin">
        <number>9</number>
       </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_6">
+        <item>
+         <widget class="Gui::PrefCheckBox" name="checkBox_4">
+          <property name="toolTip">
+           <string>If this is checked, the old python importer is used, otherwise the new C++ one (faster, but not as many features yet)</string>
+          </property>
+          <property name="text">
+           <string>Use legacy python importer</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <property name="prefEntry" stdset="0">
+           <cstring>dxfUseLegacyImporter</cstring>
+          </property>
+          <property name="prefPath" stdset="0">
+           <cstring>Mod/Draft</cstring>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_7">
         <item>
diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py
index 080f7e519..3e1ee694d 100644
--- a/src/Mod/Draft/importDXF.py
+++ b/src/Mod/Draft/importDXF.py
@@ -1467,35 +1467,51 @@ def warn(dxfobject,num=None):
 def open(filename):
     "called when freecad opens a file."
     readPreferences()
-    if dxfReader:
+    if dxfUseLegacyImporter:
+        if dxfReader:
+            docname = os.path.splitext(os.path.basename(filename))[0]
+            if isinstance(docname,unicode): 
+                import sys #workaround since newDocument currently can't handle unicode filenames
+                docname = docname.encode(sys.getfilesystemencoding())
+            doc = FreeCAD.newDocument(docname)
+            doc.Label = decodeName(docname)
+            processdxf(doc,filename)
+            return doc
+        else:
+            errorDXFLib(gui)
+    else:
         docname = os.path.splitext(os.path.basename(filename))[0]
         if isinstance(docname,unicode): 
             import sys #workaround since newDocument currently can't handle unicode filenames
             docname = docname.encode(sys.getfilesystemencoding())
         doc = FreeCAD.newDocument(docname)
         doc.Label = decodeName(docname)
-        processdxf(doc,filename)
-        return doc
-    else:
-        errorDXFLib(gui)
+        FreeCAD.setActiveDocument(docname)
+        import DraftUtils
+        DraftUtils.readDXF(filename)
 
 def insert(filename,docname):
     "called when freecad imports a file"
     readPreferences()
-    if dxfReader:
-        groupname = os.path.splitext(os.path.basename(filename))[0]
-        try:
-            doc=FreeCAD.getDocument(docname)
-        except NameError:
-            doc=FreeCAD.newDocument(docname)
-        FreeCAD.setActiveDocument(docname)
-        importgroup = doc.addObject("App::DocumentObjectGroup",groupname)
-        importgroup.Label = decodeName(groupname)
-        processdxf(doc,filename)
-        for l in layers:
-            importgroup.addObject(l)
+    if dxfUseLegacyImporter:
+        if dxfReader:
+            groupname = os.path.splitext(os.path.basename(filename))[0]
+            try:
+                doc=FreeCAD.getDocument(docname)
+            except NameError:
+                doc=FreeCAD.newDocument(docname)
+            FreeCAD.setActiveDocument(docname)
+            importgroup = doc.addObject("App::DocumentObjectGroup",groupname)
+            importgroup.Label = decodeName(groupname)
+            processdxf(doc,filename)
+            for l in layers:
+                importgroup.addObject(l)
+        else:
+            errorDXFLib(gui)
     else:
-        errorDXFLib(gui)
+        FreeCAD.setActiveDocument(docname)
+        import DraftUtils
+        DraftUtils.readDXF(filename)
 
 def getShapes(filename):
     "reads a dxf file and returns a list of shapes from its contents"
@@ -1944,7 +1960,7 @@ def readPreferences():
     global dxfCreatePart, dxfCreateDraft, dxfCreateSketch, dxfDiscretizeCurves, dxfStarBlocks
     global dxfMakeBlocks, dxfJoin, dxfRenderPolylineWidth, dxfImportTexts, dxfImportLayouts
     global dxfImportPoints, dxfImportHatches, dxfUseStandardSize, dxfGetColors, dxfUseDraftVisGroups
-    global dxfFillMode, dxfBrightBackground, dxfDefaultColor
+    global dxfFillMode, dxfBrightBackground, dxfDefaultColor, dxfUseLegacyImporter
     dxfCreatePart = p.GetBool("dxfCreatePart",True)
     dxfCreateDraft = p.GetBool("dxfCreateDraft",False)
     dxfCreateSketch = p.GetBool("dxfCreateSketch",False)
@@ -1961,5 +1977,6 @@ def readPreferences():
     dxfGetColors = p.GetBool("dxfGetOriginalColors",False)
     dxfUseDraftVisGroups = p.GetBool("dxfUseDraftVisGroups",False)
     dxfFillMode = p.GetBool("fillmode",True)
+    dxfUseLegacyImporter = p.GetBool("dxfUseLegacyImporter",True)
     dxfBrightBackground = isBrightBackground()
     dxfDefaultColor = getColor()