Fixed fuse bug in Arch Wall

This commit is contained in:
Yorik van Havre 2012-04-27 18:32:02 -03:00
parent da43b9ecc2
commit 7067a1690e

View File

@ -307,12 +307,14 @@ class _Wall(ArchComponent.Component):
if obj.Align == "Left": if obj.Align == "Left":
dvec = dvec.multiply(width) dvec = dvec.multiply(width)
w2 = fcgeo.offsetWire(wire,dvec) w2 = fcgeo.offsetWire(wire,dvec)
sh = fcgeo.bind(wire,w2) w1 = Part.Wire(fcgeo.sortEdges(wire.Edges))
sh = fcgeo.bind(w1,w2)
elif obj.Align == "Right": elif obj.Align == "Right":
dvec = dvec.multiply(width) dvec = dvec.multiply(width)
dvec = fcvec.neg(dvec) dvec = fcvec.neg(dvec)
w2 = fcgeo.offsetWire(wire,dvec) w2 = fcgeo.offsetWire(wire,dvec)
sh = fcgeo.bind(wire,w2) w1 = Part.Wire(fcgeo.sortEdges(wire.Edges))
sh = fcgeo.bind(w1,w2)
elif obj.Align == "Center": elif obj.Align == "Center":
dvec = dvec.multiply(width/2) dvec = dvec.multiply(width/2)
w1 = fcgeo.offsetWire(wire,dvec) w1 = fcgeo.offsetWire(wire,dvec)
@ -359,10 +361,11 @@ class _Wall(ArchComponent.Component):
for wire in obj.Base.Shape.Wires: for wire in obj.Base.Shape.Wires:
sh = getbase(wire) sh = getbase(wire)
if temp: if temp:
temp = temp.oldFuse(sh) temp = temp.fuse(sh)
else: else:
temp = sh temp = sh
base = temp base = temp
base = base.removeSplitter()
if not base: if not base:
if obj.Length == 0: if obj.Length == 0:
return return