Skip to content

Commit

Permalink
Merge pull request #309 from papachap/dovetail_tenon_mortise
Browse files Browse the repository at this point in the history
Dovetail Tenon-Mortise Joint
  • Loading branch information
papachap authored Oct 30, 2024
2 parents dd63b76 + 7c43823 commit 4fb781f
Show file tree
Hide file tree
Showing 11 changed files with 16,183 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Added new `compas_timber._fabrication.DrillingParams`.
* Added new `compas_timber._fabrication.StepJoint`.
* Added new `compas_timber._fabrication.StepJointNotch`.
* Added new `compas_timber._fabrication.DovetailTenon`.
* Added new `compas_timber._fabrication.DovetailMortise`.
* Added new `compas_timber.connections.TStepJoint`.
* Added new `compas_timber.connections.TDovetailJoint`.
* Added new `utilities` module in `connections` package.
* Added new `compas_timber._fabrication.DoubleCut`.
* Added new `compas_timber.connections.TBirdsmouthJoint`.
Expand Down
2 changes: 1 addition & 1 deletion examples/Grasshopper/tests/test_double_cut.ghx
Original file line number Diff line number Diff line change
Expand Up @@ -4754,4 +4754,4 @@ class Beam_fromCurve(component):
</items>
</chunk>
</chunks>
</Archive>
</Archive>
7,290 changes: 7,290 additions & 0 deletions examples/Grasshopper/tests/test_dovetail_joint.ghx

Large diffs are not rendered by default.

6,489 changes: 6,489 additions & 0 deletions examples/Grasshopper/tests/test_step_joint.ghx

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/compas_timber/_fabrication/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
from .step_joint_notch import StepJointNotchParams
from .step_joint import StepJoint
from .step_joint import StepJointParams
from .dovetail_tenon import DovetailTenon
from .dovetail_tenon import DovetailTenonParams
from .dovetail_mortise import DovetailMortise
from .dovetail_mortise import DovetailMortiseParams


__all__ = [
Expand All @@ -27,4 +31,8 @@
"StepJointNotchParams",
"StepJoint",
"StepJointParams",
"DovetailTenon",
"DovetailTenonParams",
"DovetailMortise",
"DovetailMortiseParams",
]
42 changes: 42 additions & 0 deletions src/compas_timber/_fabrication/btlx_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,45 @@ class StepShapeType(object):
HEEL = "heel"
TAPERED_HEEL = "taperedheel"
DOUBLE = "double"


class TenonShapeType(object):
"""Enum for the tenon shape of the cut.
Attributes
----------
AUTOMATIC : literal("automatic")
Automatic tenon shape.
SQUARE : literal("square")
Square tenon shape.
ROUND : literal("round")
Round tenon shape.
ROUNDED : literal("rounded")
Rounded tenon shape.
RADIUS : literal("radius")
Radius tenon shape.
"""

AUTOMATIC = "automatic"
SQUARE = "square"
ROUND = "round"
ROUNDED = "rounded"
RADIUS = "radius"


class LimitationTopType(object):
"""Enum for the top limitation of the cut.
Attributes
----------
LIMITED : literal("limited")
Limitation to the cut.
UNLIMITED : literal("unlimited")
No limit to the cut.
POCKET : literal("pocket")
Pocket like limitation to the cut.
"""

LIMITED = "limited"
UNLIMITED = "unlimited"
POCKET = "pocket"
Loading

0 comments on commit 4fb781f

Please sign in to comment.