From f38e6da3c763dd61388c0b666d044deaa24759bb Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Mon, 12 Mar 2012 18:45:47 -0300 Subject: [PATCH] Fixed bug 625 in Draft importers --- src/Mod/Draft/importAirfoilDAT.py | 12 +++++++----- src/Mod/Draft/importDXF.py | 3 ++- src/Mod/Draft/importOCA.py | 4 +++- src/Mod/Draft/importSVG.py | 3 ++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Mod/Draft/importAirfoilDAT.py b/src/Mod/Draft/importAirfoilDAT.py index 8815ee9a3..4b0d68162 100644 --- a/src/Mod/Draft/importAirfoilDAT.py +++ b/src/Mod/Draft/importAirfoilDAT.py @@ -28,7 +28,9 @@ import re, FreeCAD, FreeCADGui, Part, cProfile, os, string from FreeCAD import Vector, Base from Draft import * -pythonopen = open +if open.__module__ == '__builtin__': + pythonopen = open + useDraftWire = True def decodeName(name): @@ -53,10 +55,10 @@ def open(filename): def insert(filename,docname): "called when freecad imports a file" groupname = os.path.splitext(os.path.basename(filename))[0] - try: - doc=FreeCAD.getDocument(docname) - except: - doc=FreeCAD.newDocument(docname) + try: + doc=FreeCAD.getDocument(docname) + except: + doc=FreeCAD.newDocument(docname) importgroup = doc.addObject("App::DocumentObjectGroup",groupname) importgroup.Label = decodeName(groupname) process(doc,filename) diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 234da7d88..58f9bbee5 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -52,7 +52,8 @@ else: gui = True try: draftui = FreeCADGui.draftToolBar except: draftui = None -pythonopen = open # to distinguish python built-in open function from the one declared here +if open.__module__ == '__builtin__': + pythonopen = open # to distinguish python built-in open function from the one declared here def prec(): "returns the current Draft precision level" diff --git a/src/Mod/Draft/importOCA.py b/src/Mod/Draft/importOCA.py index 18220fa53..6324ce710 100644 --- a/src/Mod/Draft/importOCA.py +++ b/src/Mod/Draft/importOCA.py @@ -37,7 +37,9 @@ try: import FreeCADGui except ValueError: gui = False else: gui = True -pythonopen = open +if open.__module__ == '__builtin__': + pythonopen = open + params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft") def getpoint(data): diff --git a/src/Mod/Draft/importSVG.py b/src/Mod/Draft/importSVG.py index b2f737710..14ff99076 100644 --- a/src/Mod/Draft/importSVG.py +++ b/src/Mod/Draft/importSVG.py @@ -48,7 +48,8 @@ else: gui = True try: draftui = FreeCADGui.draftToolBar except: draftui = None -pythonopen = open +if open.__module__ == '__builtin__': + pythonopen = open svgcolors = { 'Pink': (255, 192, 203),