Feature priorities

CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added new `FeaturePriority` enumeration.
+* Added attribute `priority` to `Feature`.
+
 ### Changed
 
 ### Removed

src/compas_timber/consumers/geometry.py

@@ -272,7 +272,7 @@ def result(self):
 
     def _apply_features(self, geometry, features):
         debug_info = []
-        for feature in features:
+        for feature in sorted(features, key=lambda f: f.PRIORITY):
             cls = self.FEATURE_MAP.get(type(feature), None)
             if not cls:
                 raise ValueError("No applicator found for feature type: {}".format(type(feature)))

src/compas_timber/parts/__init__.py

@@ -3,11 +3,13 @@
 from .features import DrillFeature
 from .features import MillVolume
 from .features import BrepSubtraction
+from .features import FeaturePriority
 
 __all__ = [
     "Beam",
     "CutFeature",
     "DrillFeature",
     "MillVolume",
     "BrepSubtraction",
+    "FeaturePriority",
 ]

src/compas_timber/parts/beam.py

@@ -88,6 +88,8 @@ def __init__(self, frame, length, width, height, **kwargs):
         self.height = height
         self.length = length
         self.features = []
+        self.attributes = {}
+        self.attributes.update(kwargs)
         self._blank_extensions = {}
 
     @property
@@ -98,13 +100,18 @@ def __data__(self):
             "width": self.width,
             "height": self.height,
             "length": self.length,
+            # joinery features are readded when deserializing via the assembly
+            "features": [feature for feature in self.features if not feature.is_joinery],
+            "attributes": self.attributes,
         }
         return data
 
     @classmethod
     def __from_data__(cls, data):
         instance = cls(Frame.__from_data__(data["frame"]), data["length"], data["width"], data["height"])
         instance.key = data["key"]
+        instance.features = data["features"]
+        instance.attributes.update(data.get("attributes", {}))
         return instance
 
     @property

src/compas_timber/parts/features.py

@@ -1,6 +1,11 @@
 from compas.data import Data
 
 
+class FeaturePriority(object):
+    EARLY = 0
+    LATER = 1
+
+
 class Feature(Data):
     """
 
@@ -11,7 +16,9 @@ class Feature(Data):
 
     """
 
-    def __init__(self, name=None, is_joinery=False):
+    PRIORITY = FeaturePriority.EARLY
+
+    def __init__(self, name=None, is_joinery=True):
         super(Feature, self).__init__(name)
         self._is_joiney = is_joinery
 
@@ -59,6 +66,8 @@ class DrillFeature(Feature):
 
     """
 
+    PRIORITY = FeaturePriority.LATER
+
     def __init__(self, line, diameter, length, **kwargs):
         super(DrillFeature, self).__init__(**kwargs)
         self.line = line