Merge branch 'main' into plate_element

gramaziokohler · Sep 4, 2024 · 0934c10 · 0934c10
2 parents b81f8c7 + 1dbfaac
commit 0934c10
Show file tree

Hide file tree

Showing 33 changed files with 1,164 additions and 36 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.9.0
+current_version = 0.9.1
 message = Bump version to {new_version}
 commit = True
 tag = True

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,17 +18,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 
+## [0.9.1] 2024-07-05
+
+### Added
+
+* Added `ref_frame` attribute to `Beam`.
+* Added `ref_sides` attribute to `Beam`.
+* Added `ref_edges` attribute to `Beam`.
+
+### Changed
+
+* Fixed error in BakeWithBoxMap component.
+
+### Removed
+
+
 ## [0.9.0] 2024-06-14
 
 ### Added
 
 * Added `birdsmouth` parameter to `butt_joint` which applies a `btlx_double_cut` process to the part. 
-* Added `BTLxDoubleCut` BTLx Processing class
+* Added `BTLxDoubleCut` BTLx Processing class.
 * Added BTLx support for `TButtJoint` and `LButtJoint`
-* Added `BTLxLap` process class
+* Added `BTLxLap` process class.
 
 ### Changed
 
+* Moved module `workflow` from package `ghpython` to new package `design`.
+* Moved `compas_timber.ghpython.CategoryRule` to `compas_timber.design`.
+* Moved `compas_timber.ghpython.DirectRule` to `compas_timber.design`.
+* Moved `compas_timber.ghpython.JointRule` to `compas_timber.design`.
+* Moved `compas_timber.ghpython.TopologyRule` to `compas_timber.design`.
+* Moved `compas_timber.ghpython.JointDefinition` to `compas_timber.design`.
+* Moved `compas_timber.ghpython.FeatureDefinition` to `compas_timber.design`.
+* Moved `compas_timber.ghpython.DebugInfomation` to `compas_timber.design`.
+
 ### Removed
 
 
@@ -89,6 +113,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added new `L_TopologyJointRule`, `T_TopologyJointRule`, `X_TopologyJointRule` GH components
 * Added GH component param support functions in `compas_timber.ghpython.ghcomponent_helpers.py`
 * Added `topos` attribute to `CategoryRule` to filter when joints get applied
+* Added new `SurfaceAssembly` class
+* Added GH component `SurfaceAssembly` which directly generates a `TimberAssembly` with standard wall framing from a planar surface. 
+* Added GH component `SurfaceAssemblyOptions`
+* Added GH component `CustomBeamDimensions` for `SurfaceAssembly`
 
 ### Changed
 

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ If you found an issue or have a suggestion for a dandy new feature, please file
 
 We love contributions!
 
-Check the [Contributor's Guide](https://github.com/compas-dev/compas_timber/blob/main/CONTRIBUTING.md)
+Check the [Contributor's Guide](https://github.com/gramaziokohler/compas_timber/blob/main/CONTRIBUTING.md)
 for more details.
 
 ## Credits

diff --git a/examples/Ass_from_srf_V2.3dm b/examples/Ass_from_srf_V2.3dm
diff --git a/examples/Ass_from_srf_demo.gh b/examples/Ass_from_srf_demo.gh
diff --git a/examples/Grasshopper/dynamic_gh_demo.gh b/examples/Grasshopper/dynamic_gh_demo.gh
diff --git a/src/compas_timber/__version__.py b/src/compas_timber/__version__.py
@@ -3,7 +3,7 @@
 __title__ = "compas_timber"
 __description__ = "COMPAS package for modeling, designing and fabricating timber assemblies."
 __url__ = "https://github.com/gramaziokohler/compas_timber"
-__version__ = "0.9.0"
+__version__ = "0.9.1"
 __author__ = "Gramazio Kohler Research"
 __author_email__ = "[email protected]"
 __license__ = "MIT license"

diff --git a/src/compas_timber/design/__init__.py b/src/compas_timber/design/__init__.py
@@ -0,0 +1,20 @@
+from .workflow import CategoryRule
+from .workflow import DirectRule
+from .workflow import JointRule
+from .workflow import TopologyRule
+from .workflow import JointDefinition
+from .workflow import FeatureDefinition
+from .workflow import DebugInfomation
+
+from .wall_from_surface import SurfaceModel
+
+__all__ = [
+    "CategoryRule",
+    "DirectRule",
+    "JointRule",
+    "TopologyRule",
+    "JointDefinition",
+    "FeatureDefinition",
+    "DebugInfomation",
+    "SurfaceModel",
+]