Commit cf8fc29e authored by sumpfralle's avatar sumpfralle

some more improvements for the contour model offsetting


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@564 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent 9c306788
...@@ -83,8 +83,10 @@ class Line(TransformableContainer): ...@@ -83,8 +83,10 @@ class Line(TransformableContainer):
self.maxy = max(self.p1.y, self.p2.y) self.maxy = max(self.p1.y, self.p2.y)
self.maxz = max(self.p1.z, self.p2.z) self.maxz = max(self.p1.z, self.p2.z)
def point(self, l): def get_length_line(self, length):
return self.p1.add(self.dir.mul(l*self.len)) """ return a line with the same direction and the specified length
"""
return Line(self.p1, self.p1.add(self.dir.mul(length)))
def closest_point(self, p): def closest_point(self, p):
v = self.dir v = self.dir
...@@ -153,9 +155,9 @@ class Line(TransformableContainer): ...@@ -153,9 +155,9 @@ class Line(TransformableContainer):
return None, None return None, None
# the lines are on one straight # the lines are on one straight
if self.is_point_in_line(x3): if self.is_point_in_line(x3):
return x3, a.len / c.len return x3, c.norm / a.norm
elif self.is_point_in_line(x4): elif self.is_point_in_line(x4):
return x4, a.len / line.p2.sub(self.p1).len return x4, line.p2.sub(self.p1).norm / a.norm
elif line.is_point_in_line(x1): elif line.is_point_in_line(x1):
return x1, 0 return x1, 0
elif line.is_point_in_line(x2): elif line.is_point_in_line(x2):
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment