Merge remote-tracking branch 'origin/joint_preview_assembly'

Author: 9and3

src/gh/components/DF_preview_assembly/code.py

@@ -2,9 +2,13 @@
 
 import System
 
+import typing
+
 import Rhino.Geometry as rg
 
 from ghpythonlib.componentbase import executingcomponent as component
+import Grasshopper as gh
+from Grasshopper.Kernel import GH_RuntimeMessageLevel as RML
 
 import diffCheck
 from diffCheck.df_geometries import DFAssembly
@@ -14,24 +18,88 @@
 import numpy as np
 
 
+def add_bool_toggle(self,
+    nickname: str,
+    indx: int,
+    X_param_coord: float,
+    Y_param_coord: float,
+    X_offset: int=87
+    ) -> None:
+    """
+        Adds a boolean toggle to the component input
+
+        :param nickname: the nickname of the value list
+        :param indx: the index of the input parameter
+        :param X_param_coord: the x coordinate of the input parameter
+        :param Y_param_coord: the y coordinate of the input parameter
+        :param X_offset: the offset of the value list from the input parameter
+    """
+    param = ghenv.Component.Params.Input[indx]  # noqa: F821
+    if param.SourceCount == 0:
+        toggle = gh.Kernel.Special.GH_BooleanToggle()
+        toggle.NickName = nickname
+        toggle.Description = "Toggle the value to use with DFVizSettings"
+        toggle.CreateAttributes()
+        toggle.Attributes.Pivot = System.Drawing.PointF(
+            X_param_coord - (toggle.Attributes.Bounds.Width) - X_offset,
+            Y_param_coord - (toggle.Attributes.Bounds.Height / 2 + 0.1)
+            )
+        toggle.Attributes.ExpireLayout()
+        gh.Instances.ActiveCanvas.Document.AddObject(toggle, False)
+        ghenv.Component.Params.Input[indx].AddSource(toggle)  # noqa: F821
+
 class DFPreviewAssembly(component):
     def __init__(self):
         super(DFPreviewAssembly, self).__init__()
         self._dfassembly = None
+        self._joint_rnd_clr = None
 
-    def RunScript(self, i_assembly: DFAssembly=None):
+        ghenv.Component.ExpireSolution(True)  # noqa: F821
+        ghenv.Component.Attributes.PerformLayout()  # noqa: F821
+        params = getattr(ghenv.Component.Params, "Input")  # noqa: F821
+        for j in range(len(params)):
+            Y_cord = params[j].Attributes.InputGrip.Y + 1
+            X_cord = params[j].Attributes.Pivot.X + 20
+            input_indx = j
+            if "i_are_joints_visible" == params[j].NickName:
+                add_bool_toggle(
+                    ghenv.Component,  # noqa: F821
+                    "show_joints",
+                    input_indx, X_cord, Y_cord)
+
+
+    def RunScript(self,
+        i_assembly: DFAssembly=None,
+        i_are_joints_visible: bool=None
+        ):
         if i_assembly is None:
             return None
+        if i_are_joints_visible is None:
+            i_are_joints_visible = False
 
         self._dfassembly = i_assembly
 
+        self._joint_rnd_clr = [System.Drawing.Color.FromArgb(
+            System.Convert.ToInt32(255 * np.random.rand()),
+            System.Convert.ToInt32(255 * np.random.rand()),
+            System.Convert.ToInt32(255 * np.random.rand())) for _ in range(len(self._dfassembly.beams))]
+
+        self._are_joints_visible = i_are_joints_visible
+
+        return None
+
     # Preview overrides
     def DrawViewportWires(self, args):
         for beam in self._dfassembly.beams:
+            #######################################
+            ## DFBeams
+            #######################################
             # beams' obb
             df_cloud = diffCheck.diffcheck_bindings.dfb_geometry.DFPointCloud()
-            df_cloud.points = [np.array([vertex.Location.X, vertex.Location.Y, vertex.Location.Z]).reshape(3, 1) for vertex in beam.to_brep().Vertices]
+            vertices_pt3d_rh : typing.List[rg.Point3d] = [vertex.to_rg_point3d() for vertex in beam.vertices]
+            df_cloud.points = [np.array([vertex.X, vertex.Y, vertex.Z]).reshape(3, 1) for vertex in vertices_pt3d_rh]
             obb: rg.Brep = diffCheck.df_cvt_bindings.cvt_dfOBB_2_rhbrep(df_cloud.get_tight_bounding_box())
+            # args.Display.DrawBrepWires(obb, System.Drawing.Color.Red)  ## keep for debugging
 
             # axis arrow
             obb_faces = obb.Faces
@@ -49,3 +117,28 @@ def DrawViewportWires(self, args):
                 System.Drawing.Color.Violet,
                 anchor_pt,
                 True, 18)
+
+            #######################################
+            ## DFJoints
+            #######################################
+            if self._are_joints_visible:
+                for idx_joint, joint in enumerate(beam.joints):
+                    joint_faces = joint.faces
+                    for idx_face, face in enumerate(joint_faces):
+                        face_center = face.to_brep_face().GetBoundingBox(False).Center
+                        args.Display.DrawPoint(face_center, self._joint_rnd_clr[idx_joint])
+
+                        vector_face_center_2_beam_center = face_center - beam.center
+                        vector_face_center_2_beam_center.Unitize()
+                        vector_face_center_2_beam_center *= 0.4 * extension_length
+
+                        ln = rg.Line(face_center, face_center + vector_face_center_2_beam_center)
+                        args.Display.DrawDottedLine(ln, self._joint_rnd_clr[idx_joint])
+
+                        ghenv.Component.AddRuntimeMessage(RML.Remark, "legend joint naming: the beam index - the joint index - the face index by list order")  # noqa: F821
+                        name_face_joint: str = f"{beam.index_assembly}-{joint.id}-{idx_face}"
+                        args.Display.Draw2dText(
+                            name_face_joint,
+                            self._joint_rnd_clr[idx_joint],
+                            ln.To,
+                            True, 18)

src/gh/components/DF_preview_assembly/metadata.json

@@ -24,6 +24,18 @@
                 "wireDisplay": "default",
                 "sourceCount": 0,
                 "typeHintID": "ghdoc"
+            },
+            {
+                "name": "i_are_joints_visible",
+                "nickname": "i_are_joints_visible",
+                "description": "Show the joints' identifiers widgets.",
+                "optional": false,
+                "allowTreeAccess": true,
+                "showTypeHints": true,
+                "scriptParamAccess": "item",
+                "wireDisplay": "default",
+                "sourceCount": 0,
+                "typeHintID": "bool"
             }
         ],
         "outputParameters": [

src/gh/components/DF_visualization_settings/code.py

@@ -183,21 +183,6 @@ def RunScript(self,
         i_legend_width: float,
         i_legend_plane: rg.Plane,
         i_histogram_scale_factor: float):
-
-        """
-        Compiles all the visualization settings to feed to the visualization component
-
-        :param i_value_type: selected type indicates Which values to display. Possible values: "dist", "RMSE", "MAX", "MIN", "STD"
-        :param i_palette: Select a color palette to map the values to. Possible values: "Jet", "Rainbow", "RdPu", "Viridis"
-        :param i_upper_threshold: Thresholds the values with a maximum value
-        :param i_lower_threshold: Thresholds the values with a minimum value
-        :param i_legend_height: the total height of the legend
-        :param i_legend_width: the total width of the legend
-        :param i_legend_plane: the construction plane of the legend
-        :param i_histogram_scale_factor: Scales the height of the histogram with a factor
-
-        :returns o_viz_settings: the results of the comparison all in one object
-        """
         # set default values
         if i_value_type is not None:
             if i_value_type not in self.poss_value_types:

src/gh/diffCheck/diffCheck/df_geometries.py

@@ -287,6 +287,7 @@ def __post_init__(self):
         self.faces = self.faces or []
         self._joint_faces = []
         self._side_faces = []
+        self._vertices = []
 
         self._joints = []
 
@@ -388,6 +389,15 @@ def index_assembly(self):
             raise ValueError("The beam is not added to an assembly")
         return self._index_assembly
 
+    @property
+    def vertices(self):
+        self._vertices = []
+        for face in self.faces:
+            all_loops_cpy = face.all_loops.copy()
+            for loop in all_loops_cpy:
+                self._vertices.extend(loop)
+        return self._vertices
+
 
 @dataclass
 class DFAssembly: