suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draft: Fixes in DXF exporter

Browse Source
This commit is contained in:
Yorik van Havre 2013-08-11 12:46:36 -03:00
parent 58dd79e79b
commit 1446ee0b69
3 changed files with 226 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Draft/Draft.py
View File

@ -278,6 +278,10 @@ def getGroupContents(objectslist,walls=False):
newlist = [] newlist = []
for obj in objectslist: for obj in objectslist:
if obj.isDerivedFrom("App::DocumentObjectGroup"): if obj.isDerivedFrom("App::DocumentObjectGroup"):
if obj.isDerivedFrom("Drawing::FeaturePage"):
# skip if the grou is a page
newlist.append(obj)
else:
newlist.extend(getGroupContents(obj.Group)) newlist.extend(getGroupContents(obj.Group))
else: else:
newlist.append(obj) newlist.append(obj)

4
src/Mod/Draft/importDXF.py
View File

@ -1487,8 +1487,12 @@ def export(objectslist,filename,nospline=False):
global exportList global exportList
exportList = objectslist exportList = objectslist
print exportList
exportList = Draft.getGroupContents(exportList) exportList = Draft.getGroupContents(exportList)
print exportList
if (len(exportList) == 1) and (Draft.getType(exportList[0]) == "ArchSectionView"): if (len(exportList) == 1) and (Draft.getType(exportList[0]) == "ArchSectionView"):
# arch view: export it "as is" # arch view: export it "as is"
dxf = exportList[0].Proxy.getDXF() dxf = exportList[0].Proxy.getDXF()

9
src/Mod/Draft/importSVG.py
View File

@ -413,8 +413,10 @@ class svgHandler(xml.sax.ContentHandler):
data = {} data = {}
for (keyword,content) in attrs.items(): for (keyword,content) in attrs.items():
#print keyword,content
content = content.replace(',',' ') content = content.replace(',',' ')
content = content.split() content = content.split()
#print keyword,content
data[keyword]=content data[keyword]=content
if 'style' in data: if 'style' in data:
@ -434,6 +436,9 @@ class svgHandler(xml.sax.ContentHandler):
for k in ['fill','stroke','stroke-width','font-size']: for k in ['fill','stroke','stroke-width','font-size']:
if k in data: if k in data:
if isinstance(data[k],list): if isinstance(data[k],list):
if data[k][0].lower().startswith("rgb("):
data[k] = ",".join(data[k])
else:
data[k]=data[k][0] data[k]=data[k][0]
# extracting style info # extracting style info
@ -748,7 +753,11 @@ class svgHandler(xml.sax.ContentHandler):
path.append(seg) path.append(seg)
elif (d == "Z") or (d == "z"): elif (d == "Z") or (d == "z"):
if not DraftVecUtils.equals(lastvec,firstvec): if not DraftVecUtils.equals(lastvec,firstvec):
try:
seg = Part.Line(lastvec,firstvec).toShape() seg = Part.Line(lastvec,firstvec).toShape()
except:
pass
else:
path.append(seg) path.append(seg)
if path: #the path should be closed by now if path: #the path should be closed by now
#sh=makewire(path,True) #sh=makewire(path,True)