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

Step joint notch feature #268

Open
wants to merge 65 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 62 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
50d5fef
initialization of step_joint_feature
papachap Jul 22, 2024
a686051
initialization of step_joint_notch and method from surface and beam
papachap Jul 23, 2024
61698a9
separate method for creating a mortise
papachap Jul 23, 2024
bea39ff
separate method for creating a mortise
papachap Jul 23, 2024
a8f8927
Merge branch 'step_joint_feature' of https://github.com/papachap/comp…
papachap Jul 23, 2024
017cc92
move add mortise method down
papachap Jul 24, 2024
6a6e14e
from_surface_and_beam cleanup
papachap Jul 24, 2024
7c8a56c
Merge branch 'jack_cut_feature_fork' of https://github.com/papachap/c…
papachap Jul 24, 2024
e2c4adf
implement BTLxProcessParams
papachap Jul 24, 2024
47ef6fe
planes from params and beam for step/heel/heeltappered
papachap Jul 25, 2024
4dcad65
brep boolean difference with notch volume
papachap Jul 26, 2024
e0f6230
split process for generating the planes into private methods for diff…
papachap Jul 27, 2024
906fd1d
fix linting with pylint/flake8
papachap Aug 5, 2024
e4ad54a
Enum for StepShape
papachap Aug 6, 2024
320a464
first round of comments + formatting
papachap Aug 6, 2024
1ee8919
initialization of step_joint
papachap Aug 6, 2024
9f73d9e
de-linting
papachap Aug 6, 2024
aff475e
remove step_joint from branch for clarity
papachap Aug 6, 2024
1b3acb4
remove f-strings for ironpython import
papachap Aug 6, 2024
5c9866c
bypass plane|surface intersection for gh test
papachap Aug 6, 2024
d0ad539
re-format
papachap Aug 6, 2024
3098461
adjustments after check in rhino
papachap Aug 7, 2024
5320993
gh test
papachap Aug 7, 2024
3c7d17a
pull from notch
papachap Aug 7, 2024
85bd267
Merge branch 'step_joint_feature' of https://github.com/papachap/comp…
papachap Aug 7, 2024
5021e04
planes for step
papachap Aug 7, 2024
16dc81b
planes for heel
papachap Aug 7, 2024
b49f6ba
Merge branch 'step_joint_feature' of https://github.com/papachap/comp…
papachap Aug 7, 2024
bcae5fe
tested cutting_planes in gh
papachap Aug 8, 2024
dcf7b0e
apply geometric implementetion
papachap Aug 9, 2024
4b2cea6
formatting
papachap Aug 9, 2024
a16d852
fully implement step joint
papachap Aug 9, 2024
f8a0c4c
fully implement step and notch
papachap Aug 9, 2024
3c4396c
minor fixes
papachap Aug 9, 2024
1470a96
Merge branch 'jack_cut_feature' of https://github.com/gramaziokohler/…
papachap Aug 10, 2024
00b6ee6
change alternative constructor from surface to plane
papachap Aug 10, 2024
a141528
implement step_joint joint
papachap Aug 10, 2024
506f8d5
wip stepjointjoint
papachap Aug 11, 2024
8b3b27f
bring back geometry as a parameter of the apply() method
papachap Aug 11, 2024
704be9f
fix splitting function for maintaining order in dict
papachap Aug 11, 2024
6f2ded2
functioning gh+btlx notch (planes need cleaning)
papachap Aug 11, 2024
dd5f8f5
functioning TStepJoint
papachap Aug 11, 2024
4b0f449
coherent gh & btlx
papachap Aug 12, 2024
5742f78
minor fixes for tenon and mortise
papachap Aug 12, 2024
0c4d876
update _beam_side_incidence (face-->ref_side)
papachap Aug 12, 2024
6d5d029
adjustments after comments
papachap Aug 12, 2024
0166cce
stepshape->stepshapetype
papachap Aug 12, 2024
10d8bd5
revert back to beam_side_incidence and write a new one for using ref_…
papachap Aug 13, 2024
3c17231
format
papachap Aug 13, 2024
b43c344
flip height and width
papachap Aug 14, 2024
c82285a
match beam faces to BTLxPart reference_surfaces
papachap Aug 14, 2024
45589ef
adjust unittest to i+1 aligning beam.faces to btlxpart.reference_surf…
papachap Aug 14, 2024
ba782f7
remove ghx and fill change log
papachap Aug 14, 2024
e6ee91d
stepshapetype to stepshape
papachap Sep 5, 2024
ef4b583
adjustments to notch
papachap Sep 5, 2024
27060bd
adjustment to step
papachap Sep 5, 2024
fcb4f60
new joint methods
papachap Sep 5, 2024
c24476d
coplanarity condition for t-stepjoint
papachap Sep 5, 2024
b11c4b8
linting
papachap Sep 5, 2024
f79fc6a
Merge branch 'main' of https://github.com/gramaziokohler/compas_timbe…
papachap Oct 15, 2024
71cef2d
format & lint
papachap Oct 15, 2024
21004bc
revert face indices
papachap Oct 15, 2024
7e271a7
conditional check for step shape and values
papachap Oct 16, 2024
689bddd
create joint utilities module
papachap Oct 16, 2024
00f2e9d
unittest, ghx, changelog
papachap Oct 16, 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
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Added

* Added new `compas_timber._fabrication.StepJoint`.
* Aded new `compas_timber._fabrication.StepJointNotch`.
* Aded new `compas_timber.connections.TStepJoint`.
* Added `side_as_surface` to `compas_timber.elements.Beam`.

### Changed
* Fixed the discrepancies between `height` and `width` attributes of `Beam`

### Removed


papachap marked this conversation as resolved.
Show resolved Hide resolved
## Unreleased

### Added
Expand Down
17 changes: 16 additions & 1 deletion src/compas_timber/_fabrication/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,21 @@
from .jack_cut import JackRafterCutParams
from .drilling import Drilling
from .drilling import DrillingParams
from .step_joint_notch import StepJointNotch
from .step_joint_notch import StepJointNotchParams
from .step_joint import StepJoint
from .step_joint import StepJointParams


__all__ = ["JackRafterCut", "BTLxProcess", "OrientationType", "JackRafterCutParams", "Drilling", "DrillingParams"]
__all__ = [
"JackRafterCut",
"BTLxProcess",
"OrientationType",
"JackRafterCutParams",
"Drilling",
"DrillingParams",
"StepJointNotch",
"StepJointNotchParams",
"StepJoint",
"StepJointParams",
]
21 changes: 21 additions & 0 deletions src/compas_timber/_fabrication/btlx_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,24 @@ class OrientationType(object):

START = "start"
END = "end"


class StepShapeType(object):
"""Enum for the step 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.
"""

STEP = "step"
HEEL = "heel"
TAPERED_HEEL = "taperedheel"
DOUBLE = "double"
2 changes: 1 addition & 1 deletion src/compas_timber/_fabrication/drilling.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from compas.geometry import Vector
from compas.geometry import angle_vectors_signed
from compas.geometry import distance_point_plane
from compas.geometry import intersection_segment_plane
from compas.geometry import intersection_line_plane
from compas.geometry import intersection_segment_plane
from compas.geometry import is_point_behind_plane
from compas.geometry import is_point_in_polyhedron
from compas.geometry import project_point_plane
Expand Down
Loading
Loading