Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dovetail Tenon-Mortise Joint #309

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
338cb3c
stepshapetype
papachap Aug 12, 2024
71c09d2
init dovetail_tenon
papachap Aug 12, 2024
2adf4ed
btlx paramas
papachap Aug 13, 2024
3882d30
add to docs
papachap Aug 13, 2024
d3417dd
calculate tenon dimension bounds
papachap Aug 14, 2024
d5ed2fa
gh check dovetail tenon
papachap Aug 15, 2024
e779f9c
dovetail_tenon gh check
papachap Aug 22, 2024
a058394
ini mortise
papachap Aug 22, 2024
801571e
Merge branch 'step_joint_feature' of https://github.com/papachap/comp…
papachap Aug 22, 2024
1689bf6
correct btlx // missing viz & eccentricity offset logic
papachap Aug 27, 2024
d4d28b8
clean ghx file
papachap Aug 27, 2024
bd741d7
simplify subtraction volume logic
papachap Sep 1, 2024
5caf8b3
step_joint refinement
papachap Sep 5, 2024
9d2a145
wip t-dovetail refinement
papachap Sep 5, 2024
17c7611
internal forces wip
papachap Sep 5, 2024
ad75207
are coplanar method
papachap Sep 5, 2024
7435cd7
REVERT
papachap Sep 7, 2024
99bd780
Merge branch 'step_joint_feature' of https://github.com/papachap/comp…
papachap Sep 7, 2024
9eaaca1
wip
papachap Sep 10, 2024
d35bac3
dovetail_touches
papachap Oct 15, 2024
b83155e
Merge branch 'internal_forces_solver' of https://github.com/papachap/…
papachap Oct 17, 2024
91b4797
new utilities function
papachap Oct 17, 2024
7ef0687
Merge branch 'internal_forces_solver' of https://github.com/papachap/…
papachap Oct 17, 2024
c0123fb
adjustments on tenon
papachap Oct 17, 2024
a8844ed
coherent btlx & geo implementation
papachap Oct 21, 2024
bc6f830
cleaning_up
papachap Oct 22, 2024
b5c54c3
not_broken
papachap Oct 23, 2024
04b00ba
Merge branch 'main' of https://github.com/gramaziokohler/compas_timbe…
papachap Oct 23, 2024
f3e393c
Merge branch 'line_plane_with_param' of https://github.com/gramazioko…
papachap Oct 23, 2024
9fe3fb6
functioning dovetail!!!
papachap Oct 23, 2024
54da4dd
unittest and formatting
papachap Oct 24, 2024
d74400a
unittest and formatting
papachap Oct 24, 2024
9bde558
Merge branch 'dovetail_tenon_mortise' of https://github.com/papachap/…
papachap Oct 24, 2024
32ee6c7
Merge branch 'main' of https://github.com/gramaziokohler/compas_timbe…
papachap Oct 24, 2024
af6b6d5
update changelog
papachap Oct 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.

### Changed
Expand Down
8 changes: 8 additions & 0 deletions src/compas_timber/_fabrication/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,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 @@ -23,4 +27,8 @@
"StepJointNotchParams",
"StepJoint",
"StepJointParams",
"DovetailTenon",
"DovetailTenonParams",
"DovetailMortise",
"DovetailMortiseParams",
]
40 changes: 40 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,43 @@ class StepShapeType(object):
HEEL = "heel"
TAPERED_HEEL = "taperedheel"
DOUBLE = "double"


class TenonShapeType(object):
"""Enum for the tenon shape of the cut.

Attributes
----------
STEP : literal("step")
A step shape.
HEEL : literal("heel")
A heel shape.
TAPERED_HEEL : literal("taperedheel")
A tapered heel shape.
DOUBLE : literal("double")
A double 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
Loading