From a562cbc9d74c1bb18c6f075842ceed3e0ca13b7c Mon Sep 17 00:00:00 2001 From: obucklin Date: Wed, 14 Feb 2024 17:31:58 +0100 Subject: [PATCH 1/2] fixed bug --- src/compas_timber/ghpython/components/CT_Assembly/code.py | 2 +- src/compas_timber/ghpython/workflow.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compas_timber/ghpython/components/CT_Assembly/code.py b/src/compas_timber/ghpython/components/CT_Assembly/code.py index fb16cbbb3..d241c6289 100644 --- a/src/compas_timber/ghpython/components/CT_Assembly/code.py +++ b/src/compas_timber/ghpython/components/CT_Assembly/code.py @@ -58,7 +58,7 @@ def get_joints_from_rules(self, beams, rules, topologies): for rule in direct_rules: # apply direct rules first if rule.comply(pair): - joints.append(JointDefinition(rule.joint_type, [beam_a, beam_b], **rule.kwargs)) + joints.append(JointDefinition(rule.joint_type, [rule.beams[0], rule.beams[1]], **rule.kwargs)) pair_joined = True break diff --git a/src/compas_timber/ghpython/workflow.py b/src/compas_timber/ghpython/workflow.py index 2c22784eb..54cf724d4 100644 --- a/src/compas_timber/ghpython/workflow.py +++ b/src/compas_timber/ghpython/workflow.py @@ -36,7 +36,7 @@ def comply(self, beams): class DirectRule(JointRule): - """for a given connection topology type (L,T,X,I,K...), this rule assigns a joint type.""" + """Creates a Joint Rule that directly joins two beams.""" def __init__(self, joint_type, beams, **kwargs): self.beams = beams From a9442e1795b76d0046134170f303f3671bdabb5e Mon Sep 17 00:00:00 2001 From: Chen Kasirer Date: Thu, 15 Feb 2024 12:20:24 +0100 Subject: [PATCH 2/2] Update src/compas_timber/ghpython/components/CT_Assembly/code.py --- src/compas_timber/ghpython/components/CT_Assembly/code.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compas_timber/ghpython/components/CT_Assembly/code.py b/src/compas_timber/ghpython/components/CT_Assembly/code.py index d241c6289..e17b06218 100644 --- a/src/compas_timber/ghpython/components/CT_Assembly/code.py +++ b/src/compas_timber/ghpython/components/CT_Assembly/code.py @@ -58,7 +58,7 @@ def get_joints_from_rules(self, beams, rules, topologies): for rule in direct_rules: # apply direct rules first if rule.comply(pair): - joints.append(JointDefinition(rule.joint_type, [rule.beams[0], rule.beams[1]], **rule.kwargs)) + joints.append(JointDefinition(rule.joint_type, rule.beams, **rule.kwargs)) pair_joined = True break