MILESTONE merge raw with plates into single plugin.

src/rhino/plugin/commands/w_dataset.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_dataset_annen.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_dataset_beam_volume.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 from wood_nano import beam_volumes as wood_nano_beam_volumes

src/rhino/plugin/commands/w_dataset_closest_lines_insertion.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_dataset_closest_points_joints.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_dataset_cross_connectors.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_dataset_folded_plates.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_install.py

@@ -1,6 +1,6 @@
 #! python3
 # venv: timber_connections
-# r: wood-nano==0.1.1, compas-wood==2.3.0, compas==2.4.3, wood-rui==0.1.0, shapely, compas_model==6.0.1
+# r: wood-nano==0.2.0, compas-wood==2.4.0, compas==2.4.3, wood-rui==0.2.0
 
 from wood_nano import test
 

src/rhino/plugin/commands/w_loft_brep.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_loft_mesh.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino

src/rhino/plugin/commands/w_parameters.py

@@ -1,12 +1,10 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 from typing import *
 from wood_rui import wood_rui_globals, NamedValuesForm  # Import the singleton instance
 from compas_wood.binding import wood_globals
 
 if __name__ == "__main__":
-
     # Define the parameters
     parameters: Tuple[str, Any] = [
         ("SEARCH TYPE", " "),  # 0
@@ -109,6 +107,8 @@
         ("limit_min_joint_length", wood_globals.limit_min_joint_length),  # 64
         ("three_valence", wood_rui_globals.three_valence),  # 65
         ("adjacency", wood_rui_globals.adjacency),  # 66
+        ("dowel_radius", wood_rui_globals.dowel_radius),  # 67
+        ("loft", wood_rui_globals.loft),  # 68
     ]
 
     # Extract names and values separately
@@ -148,7 +148,11 @@
         ]
 
         wood_globals.joints_parameters_and_types = joint_parameters
-        wood_globals.joint_volume_extension = [form.attributes[12][1], form.attributes[13][1], form.attributes[14][1]]
+        wood_globals.joint_volume_extension = [
+            form.attributes[12][1],
+            form.attributes[13][1],
+            form.attributes[14][1],
+        ]
         wood_globals.output_geometry_type = form.attributes[4][1]
         wood_globals.clipper_scale = form.attributes[52][1]
         wood_globals.clipper_area = form.attributes[53][1]
@@ -159,9 +163,15 @@
         wood_globals.data_set_input_folder = form.attributes[58][1]
         wood_globals.data_set_output_file = form.attributes[59][1]
         wood_globals.data_set_output_database = form.attributes[60][1]
-        wood_globals.face_to_face_side_to_side_joints_all_treated_as_rotated = form.attributes[61][1]
-        wood_globals.face_to_face_side_to_side_joints_rotated_joint_as_average = form.attributes[62][1]
-        wood_globals.face_to_face_side_to_side_joints_dihedral_angle = form.attributes[63][1]
+        wood_globals.face_to_face_side_to_side_joints_all_treated_as_rotated = (
+            form.attributes[61][1]
+        )
+        wood_globals.face_to_face_side_to_side_joints_rotated_joint_as_average = (
+            form.attributes[62][1]
+        )
+        wood_globals.face_to_face_side_to_side_joints_dihedral_angle = form.attributes[
+            63
+        ][1]
         wood_globals.limit_min_joint_length = form.attributes[64][1]
 
     wood_rui_globals.scale = [
@@ -190,3 +200,11 @@
     wood_rui_globals.adjacency = form.attributes[66][
         1
     ]  # temporary parameter that must go from compas_wood.binding import wood_globals
+
+    wood_rui_globals.dowel_radius = form.attributes[67][
+        1
+    ]  # temporary parameter that must go from compas_wood.binding import wood_globals
+
+    wood_rui_globals.loft = form.attributes[68][
+        1
+    ]  # temporary parameter that must go from compas_wood.binding import wood_globals

src/rhino/raw/commands/w_raw_features_parallel.py → src/rhino/plugin/commands/w_raw_features_parallel.py

@@ -18,6 +18,7 @@ def callback(selection: dict[str, any], name: str):
         selection["distance"],
         selection["display_plane"],
         selection["display_line"],
+        selection["intersection"],
     )
 
     ####################################################################################################
@@ -93,6 +94,7 @@ def callback(selection: dict[str, any], name: str):
         "display_plane": (False, bool),
         "display_line": (False, bool),
         "display_features": (False, bool),
+        "intersection" : (False, bool),
         "replace_or_extend_features": (True, bool),
     }
 

src/rhino/raw/commands/w_raw_solver.py → src/rhino/plugin/commands/w_raw_solver.py

@@ -221,6 +221,9 @@ def callback(selection: dict[str, any], name: str):
     polylines_lists: list[list[Rhino.Geometry.Polyline]] = from_point3(ow_polylines)
     fab_types: list[list[int]] = from_cut_type2(ow_fab_types)
 
+    print(polylines_lists)
+    print(fab_types)
+
     ######################################################################
     # Loft the output and add it to elements as features
     # index_to_group[count] = (group_id, pair_id)

src/rhino/plugin/commands/w_solver.py

@@ -1,4 +1,3 @@
-# flags: python.reloadEngine
 #! python3
 # venv: timber_connections
 import Rhino