Skip to content

Commit

Permalink
Merge branch 'butt_mill' of https://github.com/gramaziokohler/compas_…
Browse files Browse the repository at this point in the history
…timber into butt_mill
  • Loading branch information
obucklin committed Apr 29, 2024
2 parents fcac9a7 + 010ae60 commit 54b0686
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
3 changes: 1 addition & 2 deletions src/compas_timber/connections/butt_joint.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ def subtraction_volume(self):
top_front = Line(vertices[0], vertices[4])
top_back = Line(vertices[1], vertices[5])
_len = distance_line_line(top_front, top_back)
print(_len)

front_line = Line(*intersection_plane_plane(Plane.from_frame(front_frame), Plane.from_frame(top_frame)))

Expand Down Expand Up @@ -176,5 +175,5 @@ def subtraction_volume(self):
ph = Polyhedron(
vertices, [[3, 2, 1, 0], [5, 4, 0, 1], [6, 5, 1, 2], [7, 6, 2, 3], [4, 7, 3, 0], [4, 5, 6, 7]]
)
# self.test = vertices

return ph
7 changes: 5 additions & 2 deletions src/compas_timber/fabrication/btlx.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,10 @@ def __init__(self, process_type, header_attributes, process_parameters):
def et_element(self):
element = ET.Element(self.process_type, self.header_attributes)
for key, value in self.process_parameters.items():
child = ET.Element(key)
child.text = value
if isinstance(value, dict):
child = ET.Element(key, value)
else:
child = ET.Element(key)
child.text = value
element.append(child)
return element
2 changes: 1 addition & 1 deletion src/compas_timber/parts/beam.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,4 +410,4 @@ def endpoint_closest_to_point(self, point):
if ds <= de:
return ["start", ps]
else:
return ["end", pe]
return ["end", pe]

0 comments on commit 54b0686

Please sign in to comment.