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

Arch: Gave small tolerance to pipe connectors in case their baselines don't join exactly

Browse Source
This commit is contained in:
Yorik van Havre
2017-07-06 17:43:13 -03:00
parent 087a1c1056
commit fdedf8fb4d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Mod/Arch/ArchPipe.py
View File

@@ -303,6 +303,7 @@ class _ArchPipeConnector(ArchComponent.Component):
def execute(self,obj):
tol = 1 # tolerance for alignment. This is only visual, we can keep it low...
ptol = 0.001 # tolerance for coincident points
import math,Part,DraftGeomUtils,ArchCommands
if len(obj.Pipes) < 2:
@@ -315,16 +316,16 @@ class _ArchPipeConnector(ArchComponent.Component):
order = []
for o in obj.Pipes:
wires.append(o.Proxy.getWire(o))
if wires[0].Vertexes[0].Point == wires[1].Vertexes[0].Point:
if wires[0].Vertexes[0].Point.sub(wires[1].Vertexes[0].Point).Length <= ptol:
order = ["start","start"]
point = wires[0].Vertexes[0].Point
elif wires[0].Vertexes[0].Point == wires[1].Vertexes[-1].Point:
elif wires[0].Vertexes[0].Point.sub(wires[1].Vertexes[-1].Point).Length <= ptol:
order = ["start","end"]
point = wires[0].Vertexes[0].Point
elif wires[0].Vertexes[-1].Point == wires[1].Vertexes[-1].Point:
elif wires[0].Vertexes[-1].Point.sub(wires[1].Vertexes[-1].Point).Length <= ptol:
order = ["end","end"]
point = wires[0].Vertexes[-1].Point
elif wires[0].Vertexes[-1].Point == wires[1].Vertexes[0].Point:
elif wires[0].Vertexes[-1].Point.sub(wires[1].Vertexes[0].Point).Length <= ptol:
order = ["end","start"]
point = wires[0].Vertexes[-1].Point
else: