Merge pull request #473 from gramaziokohler/GH_comp_fixes

GH component fixes

Author: obucklin

CHANGELOG.md

@@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Renamed `NullJoint` to `GenericJoint`.
 * Fixed bug in show_ref_faces GH component.
 * `BTLxProcessing.ref_side_index` defaults to `0` if not set, instead of the invalid `None`.
+* Fixed several GH Components for Rhino8 compatibility.
 
 ### Removed
 

src/compas_timber/connections/plate_joint.py

@@ -118,7 +118,7 @@ def __data__(self):
         return data
 
     def __init__(self, plate_a=None, plate_b=None, topology=None, a_segment_index=None, b_segment_index=None, **kwargs):
-        super(PlateJoint, self).__init__(topology=topology,**kwargs)
+        super(PlateJoint, self).__init__(topology=topology, **kwargs)
         self.plate_a = plate_a
         self.plate_b = plate_b
         self.a_segment_index = a_segment_index

src/compas_timber/elements/plate.py

@@ -383,7 +383,7 @@ def compute_geometry(self, include_features=True):
         """
 
         # TODO: consider if Brep.from_curves(curves) is faster/better
-        plate_geo = self.shape()
+        plate_geo = self.shape
         if include_features:
             for feature in self._features:
                 try:
@@ -446,3 +446,20 @@ def compute_collision_mesh(self):
 
         """
         return self.obb.to_mesh()
+
+    def opp_side(self, ref_side_index):
+        # type: (int) -> Frame
+        """Returns the the side that is directly across from the reference side, following the right-hand rule with the thumb along the beam's frame x-axis.
+        This method does not consider the start and end sides of the beam (RS5 & RS6).
+
+        Parameters
+        ----------
+        ref_side_index : int
+            The index of the reference side to which the opposite side should be calculated.
+
+        Returns
+        -------
+        frame : :class:`~compas.geometry.Frame`
+            The frame of the opposite side of the beam relative to the reference side.
+        """
+        return self.ref_sides[(ref_side_index + 2) % 4]

src/compas_timber/ghpython/components/CT_CustomBeamDimensions/code.py

@@ -1,3 +1,4 @@
+import Grasshopper
 from ghpythonlib.componentbase import executingcomponent as component
 
 from compas_timber.design import SurfaceModel
@@ -20,7 +21,7 @@ def RunScript(self, width, height):
 
         if ghenv.Component.Params.Output[0].NickName != "Dimensions":
             dims[ghenv.Component.Params.Output[0].NickName] = (width or 0, height or 0)
-        return (dims,)  # return a tuple to allow passing dict between components
+        return Grasshopper.Kernel.Types.GH_ObjectWrapper(dims)  # return a tuple to allow passing dict between components
 
     def AppendAdditionalMenuItems(self, menu):
         for name in beam_category_names:

src/compas_timber/ghpython/components/CT_SurfaceModelOptions/code.py

@@ -1,3 +1,4 @@
+import Grasshopper
 from ghpythonlib.componentbase import executingcomponent as component
 
 
@@ -24,4 +25,4 @@ def RunScript(self, sheeting_outside, sheeting_inside, lintel_posts, edge_stud_o
             "joint_overrides": joint_overrides,
         }
 
-        return (dict,)
+        return Grasshopper.Kernel.Types.GH_ObjectWrapper(dict)

src/compas_timber/ghpython/components_cpython/CT_BTLx_From_Geometry/code.py

@@ -1,3 +1,5 @@
+"""Generates a feature from BTLx type and input geometry."""
+
 # r: compas_timber>=0.15.3
 # flake8: noqa
 import inspect
@@ -49,11 +51,10 @@ def RunScript(self, elements: System.Collections.Generic.List[object], *args):
             for arg, arg_name in zip(args, self.arg_names()[0 : self.geometry_count]):
                 if arg is None:
                     warning(self.component, f"Input parameter {arg_name} failed to collect data")
-
             geometries = []
             for geo, arg_name in zip(args, self.arg_names()[0 : self.geometry_count]):
-                geo = rs.coercegeometry(geo)  # guid to geometry
-
+                if isinstance(geo, System.Guid):
+                    geo = rs.coercegeometry(geo)  # guid to geometry
                 if isinstance(geo, rg.LineCurve):
                     geometries.append(Line(geo.PointAtStart, geo.PointAtEnd))
                 elif isinstance(geo, rg.Plane):
@@ -76,7 +77,7 @@ def RunScript(self, elements: System.Collections.Generic.List[object], *args):
             return BTLxFromGeometryDefinition(self.processing_type, **kwargs)
 
     def arg_names(self):
-        names = inspect.getargspec(self.processing_type.from_shapes_and_element)[0][1:]
+        names = inspect.getfullargspec(self.processing_type.from_shapes_and_element)[0][1:]
         count = 0
         for name in names:
             if name == "element":

src/compas_timber/ghpython/components_cpython/CT_CustomBeamDimensions/code.py

@@ -23,7 +23,7 @@ def RunScript(self, width: float, height: float):
 
         if ghenv.Component.Params.Output[0].NickName != "Dimensions":
             dims[ghenv.Component.Params.Output[0].NickName] = (width or 0, height or 0)
-        return (dims,)  # return a tuple to allow passing dict between components
+        return Grasshopper.Kernel.Types.GH_ObjectWrapper(dims)
 
     def AppendAdditionalMenuItems(self, menu):
         for name in beam_category_names:

src/compas_timber/ghpython/components_cpython/CT_Plate/code.py

@@ -7,7 +7,7 @@
 import rhinoscriptsyntax as rs
 import System
 from compas.scene import Scene
-from compas_rhino.conversions import curve_to_compas
+from compas_rhino.conversions import polyline_to_compas
 
 from compas_timber.elements import Plate as CTPlate
 from compas_timber.ghpython.rhino_object_name_attributes import update_rhobj_attributes_name
@@ -58,7 +58,7 @@ def RunScript(
             for line, t, v, c in zip(outline, thickness, vector, category):
                 guid, geometry = self._get_guid_and_geometry(line)
                 rhino_polyline = rs.coercecurve(geometry)
-                line = curve_to_compas(rhino_polyline)
+                line = polyline_to_compas(rhino_polyline.ToPolyline())
 
                 plate = CTPlate.from_outline_thickness(line, t, v)
                 plate.attributes["rhino_guid"] = str(guid) if guid else None

src/compas_timber/ghpython/components_cpython/CT_Plate_from_top_botto/code.py

@@ -16,34 +16,30 @@
 
 class PlateFromTopBottom(Grasshopper.Kernel.GH_ScriptInstance):
     def RunScript(
-        self,
-        top: System.Collections.Generic.List[object],
-        bottom: System.Collections.Generic.List[float],
-        category: System.Collections.Generic.List[str],
-        updateRefObj: bool,
+        self, Top: System.Collections.Generic.List[object], Bottom: System.Collections.Generic.List[object], category: System.Collections.Generic.List[str], updateRefObj: bool
     ):
         # minimum inputs required
 
-        if not list_input_valid_cpython(ghenv, top, "Outline") or not list_input_valid_cpython(ghenv, bottom, "Thickness"):
+        if not list_input_valid_cpython(ghenv, Top, "Outline") or not list_input_valid_cpython(ghenv, Bottom, "Thickness"):
             return
         else:
             if not category:
                 category = [None]
             plates = []
             scene = Scene()
             # check list lengths for consistency
-            if len(top) != len(bottom):
+            if len(Top) != len(Bottom):
                 ghenv.Component.AddRuntimeMessage(Grasshopper.Kernel.GH_RuntimeMessageLevel.Error, " `Top` and `Bottom` must have the same number of elements.")
-            if len(category) not in (0, 1, len(top)):
+            if len(category) not in (0, 1, len(Top)):
                 ghenv.Component.AddRuntimeMessage(
                     Grasshopper.Kernel.GH_RuntimeMessageLevel.Error, " In 'Category' I need either none, one or the same number of inputs as the `Top` parameter."
                 )
 
             # duplicate data if None or single value
-            if len(category) != N:
-                category = [category[0] for _ in range(N)]
+            if len(category) != len(Top):
+                category = [category[0] for _ in range(len(Top))]
 
-            for top_line, bottom_line, c in zip(top, bottom, category):
+            for top_line, bottom_line, c in zip(Top, Bottom, category):
                 t_guid, t_geometry = self._get_guid_and_geometry(top_line)
                 b_guid, b_geometry = self._get_guid_and_geometry(bottom_line)
                 t_rhino_polyline = rs.coercecurve(t_geometry)

src/compas_timber/ghpython/components_cpython/CT_SurfaceModelOptions/code.py

@@ -36,4 +36,4 @@ def RunScript(
             "joint_overrides": joint_overrides,
         }
 
-        return (dict,)
+        return Grasshopper.Kernel.Types.GH_ObjectWrapper(dict)