Merge branch 'main' into lbutt_extend_cross

gramaziokohler · Feb 7, 2024 · bbc4632 · bbc4632
2 parents bf7690d + c1e80e9
commit bbc4632
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,9 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-* `BeamFromCurve` GH component accepts now referenced Rhino curves, referenced Rhino object IDs and internalized lines. 
+* `BeamFromCurve` GH component accepts now referenced Rhino curves, referenced Rhino object IDs and internalized lines.
+* `BeamFromCurve` GH component accepts now referenced Rhino curves, referenced Rhino object IDs and internalized lines.
 * Fixed `FeatureError` when L-Butt applies the cutting plane.
 * Fixed T-Butt doesn't get extended to cross beam's plane.
+* Changed GH Categories for joint rules.
+* `SimpleSequenceGenerator` updated to work with `compas.datastructures.assembly` and generates building plan acording to type.
 * Made `beam_side_incident` a `staticmethod` of `Joint` and reworked it.
 
 ### Removed

diff --git a/src/compas_timber/ghpython/components/CT_Assembly/metadata.json b/src/compas_timber/ghpython/components/CT_Assembly/metadata.json
@@ -4,7 +4,7 @@
     "category": "COMPAS Timber",
     "subcategory": "Assembly",
     "description": "Creates an Assembly",
-    "exposure": 4,
+    "exposure": 2,
     "ghpython": {
         "isAdvancedMode": true,
         "iconDisplay": 0,

diff --git a/src/compas_timber/ghpython/components/CT_Attributes_Set/metadata.json b/src/compas_timber/ghpython/components/CT_Attributes_Set/metadata.json
@@ -38,14 +38,14 @@
                 "description": "Category.",
                 "typeHintID": "str",
                 "scriptParamAccess": 1
-            },         
+            },
             {
                 "name": "update",
                 "description": "Set to True to apply. Nothing happens if None or False.",
                 "typeHintID": "bool",
                 "scriptParamAccess": 0
             }
-            
+
         ],
         "outputParameters": [
 

diff --git a/src/compas_timber/ghpython/components/CT_BTLx/metadata.json b/src/compas_timber/ghpython/components/CT_BTLx/metadata.json
@@ -2,7 +2,7 @@
     "name": "WriteBTLx",
     "nickname": "WriteBTLx",
     "category": "COMPAS Timber",
-    "subcategory": "Utils",
+    "subcategory": "Fabrication",
     "description": "Writes a BTLx file for machining of assembly parts.",
     "exposure": 4,
     "ghpython": {

diff --git a/src/compas_timber/ghpython/components/CT_Joint_Rule_Category/metadata.json b/src/compas_timber/ghpython/components/CT_Joint_Rule_Category/metadata.json
@@ -2,7 +2,7 @@
     "name": "Category Joints Rules ",
     "nickname": "JointsByCategory",
     "category": "COMPAS Timber",
-    "subcategory": "Joints",
+    "subcategory": "Joint Rules",
     "description": "Defines which Joint type will be applied in the Automatic Joints component for connecting Beams with the given Category attributes. This overrides Topological Joint rules and is overriden by Direct joint rules",
     "exposure": 2,
     "ghpython": {

diff --git a/src/compas_timber/ghpython/components/CT_Joint_Rule_Direct/metadata.json b/src/compas_timber/ghpython/components/CT_Joint_Rule_Direct/metadata.json
@@ -2,9 +2,9 @@
     "name": "Direct Joint Rules",
     "nickname": "DirectJoints",
     "category": "COMPAS Timber",
-    "subcategory": "Joints",
+    "subcategory": "Joint Rules",
     "description": "Generates a direct joint between two beams. This overrides other joint rules.",
-    "exposure": 4,
+    "exposure": 2,
     "ghpython": {
         "isAdvancedMode": true,
         "iconDisplay": 0,

diff --git a/src/compas_timber/ghpython/components/CT_Joint_Rule_Topology/metadata.json b/src/compas_timber/ghpython/components/CT_Joint_Rule_Topology/metadata.json
@@ -2,7 +2,7 @@
     "name": "Topological Joint Rules",
     "nickname": "JointsByTopo",
     "category": "COMPAS Timber",
-    "subcategory": "Joints",
+    "subcategory": "Joint Rules",
     "description": "makes rules to apply joint types for each topology type.",
     "exposure": 2,
     "ghpython": {

diff --git a/src/compas_timber/planning/sequencer.py b/src/compas_timber/planning/sequencer.py
@@ -2,6 +2,7 @@
 from compas.data import json_dump
 from compas.data import json_load
 from compas.geometry import Frame
+from compas_timber.assembly import TimberAssembly
 
 
 class Actor(object):
@@ -268,7 +269,7 @@ class SimpleSequenceGenerator(object):
 
     Parameters
     ----------
-    assembly : :class:`compas_timber.assembly.TimberAssembly`
+    assembly : :class:'compas.datastructures.Assembly'
         Assembly to be sequenced.
 
     Attributes
@@ -283,7 +284,11 @@ def __init__(self, assembly):
 
     @property
     def result(self):
+        if isinstance(self.assembly, TimberAssembly):
+            parts = self.assembly.beams
+        else:
+            parts = self.assembly.parts()
         plan = BuildingPlan()
-        for beam in self.assembly.beams:
-            plan.add_step(Step(element_ids=[beam.key], actor=Actor.HUMAN, location=beam.frame))
+        for part in parts:
+            plan.add_step(Step(element_ids=[part.key], actor=Actor.HUMAN, location=part.frame))
         return plan