kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Fixes bugs from last commit

Browse Source
This commit is contained in:
Yorik van Havre
2013-07-31 13:55:06 -03:00
parent b3f79881c5
commit c6858f69fd
8 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Arch/ArchComponent.py
View File

@@ -26,6 +26,7 @@ __author__ = "Yorik van Havre"
__url__ = "http://free-cad.sourceforge.net"
import FreeCAD,FreeCADGui,Draft
from FreeCAD import Vector
from PyQt4 import QtGui,QtCore
from DraftTools import translate
@@ -309,7 +310,7 @@ class Component:
v1 = DraftVecUtils.scaleTo(n,width*1.1) # we extrude a little more to avoid face-on-face
f.translate(v1)
v2 = v1.negative()
v2 = v1.multiply(-2)
v2 = Vector(v1).multiply(-2)
f = f.extrude(v2)
if plac:
f.Placement = plac

10
src/Mod/Arch/ArchWall.py
View File

@@ -411,18 +411,18 @@ class _Wall(ArchComponent.Component):
if not DraftVecUtils.isNull(dvec):
dvec.normalize()
if obj.Align == "Left":
dvec = dvec.multiply(width)
dvec.multiply(width)
w2 = DraftGeomUtils.offsetWire(wire,dvec)
w1 = Part.Wire(DraftGeomUtils.sortEdges(wire.Edges))
sh = DraftGeomUtils.bind(w1,w2)
elif obj.Align == "Right":
dvec = dvec.multiply(width)
dvec.multiply(width)
dvec = dvec.negative()
w2 = DraftGeomUtils.offsetWire(wire,dvec)
w1 = Part.Wire(DraftGeomUtils.sortEdges(wire.Edges))
sh = DraftGeomUtils.bind(w1,w2)
elif obj.Align == "Center":
dvec = dvec.multiply(width/2)
dvec.multiply(width/2)
w1 = DraftGeomUtils.offsetWire(wire,dvec)
dvec = dvec.negative()
w2 = DraftGeomUtils.offsetWire(wire,dvec)
@@ -459,8 +459,8 @@ class _Wall(ArchComponent.Component):
pass
elif (len(base.Faces) == 1) and (not obj.ForceWire):
if height:
norm = normal.multiply(height)
base = base.extrude(norm)
normal.multiply(height)
base = base.extrude(normal)
elif len(base.Wires) >= 1:
temp = None
for wire in obj.Base.Shape.Wires: