Merge pull request #4331 from chennes/openSCADFix

[Draft] OpenSCAD/DXF error: fix DXF import with no layers
This commit is contained in:
Yorik van Havre
2021-02-02 14:01:43 +01:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -2220,7 +2220,7 @@ def processdxf(document, filename, getShapes=False, reComputeFlag=True):
drawstyle = "Dashdot"
locateLayer(name, color, drawstyle)
else:
locateLayer("0", [0.0, 0.0, 0.0], "Solid")
locateLayer("0", (0.0, 0.0, 0.0), "Solid")
# Draw lines
lines = drawing.entities.get_type("line")

View File

@@ -500,7 +500,9 @@ def importDXFface(filename,layer=None,doc=None):
#shapeobj.Document.removeObject(shapeobj.Name)
#groupobj[0].Document.removeObject(groupobj[0].Name)
for layer in layers: #remove everything that has been imported
layer.removeObjectsFromDocument()
removeOp = getattr(layer, "removeObjectsFromDocument", None)
if callable(removeOp):
layer.removeObjectsFromDocument()
#for obj in layer.Group:
# obj.Document.removeObject(obj.Name)
layer.Document.removeObject(layer.Name)