GH_UI_overhaul #169

obucklin · 2024-01-17T10:41:00Z

This is a major rework of the Grasshopper UI.

I added two new Joint Rule components:
-TopologyRule allows users to define a joint type to be applied on a detected topology. This has default joints in case none are defined
-DirectRule allows users to directly define joints between a pair of beams.

I changed the Category rule component to take JointOption components as input instead of text tags.

I changed the Automatic rules component to process the new rule types. The rules are applied such that Direct rules override all other rules, and category rules override topology rules.

I added JointOptions class to connections/joint.py which is a container for joint type and kwargs for specific joint parameters

I added JointOption GH components for each implemented joint type, which act as the input to define joint type in the Rule components

I changed JointDefinition class, Assembly GH component, and Automatic Rules GH component to allow kwargs passthrough for joint parameters

What type of change is this?

Bug fix in a backwards-compatible manner.
New feature in a backwards-compatible manner.
Breaking change: bug fix or new feature that involve incompatible API changes.
Other (e.g. doc update, configuration, etc)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

I added a line to the CHANGELOG.md file in the Unreleased section under the most fitting heading (e.g. Added, Changed, Removed).
I ran all tests on my computer and it's all green (i.e. invoke test).
I ran lint on my computer and there are no errors (i.e. invoke lint).
I added new functions/classes and made them available on a second-level import, e.g. compas_timber.datastructures.Beam.
I have added tests that prove my fix is effective or that my feature works.
I have added necessary documentation (if appropriate)
GH_UI_Sample.zip

chenkasirer · 2024-01-17T10:55:02Z

@obucklin cool! can you attach a Rhino+GH doc which demonstrates the new UI?

obucklin · 2024-01-17T12:39:24Z

@obucklin cool! can you attach a Rhino+GH doc which demonstrates the new UI?

yeah where do I do that?

chenkasirer · 2024-01-17T12:44:31Z

@obucklin cool! can you attach a Rhino+GH doc which demonstrates the new UI?

yeah where do I do that?

you can zip them and drag and drop onto the main PR comment

obucklin · 2024-01-17T17:25:29Z

@obucklin cool! can you attach a Rhino+GH doc which demonstrates the new UI?

yeah where do I do that?

you can zip them and drag and drop onto the main PR comment

OK Done. Also ready for review. Thanks!!

chenkasirer

I like the new flow! left first round of comments.
Please run invoke format and invoke lint and fix any issues.

chenkasirer · 2024-01-19T09:29:55Z

src/compas_timber/fabrication/btlx.py

@@ -167,6 +167,14 @@ def __init__(self, beam):
        self.processings = []
        self._et_element = None

+


to many spaces around method, run invoke format

chenkasirer · 2024-01-19T09:30:32Z

src/compas_timber/fabrication/btlx.py

@@ -167,6 +167,14 @@ def __init__(self, beam):
        self.processings = []
        self._et_element = None

+
+    def reference_surface_from_beam_face(self, beam_face):
+        """ Finds the reference surface with normal that matches the normal of the beam face argument"""


Parameters and Returns missing in docstring

CHANGELOG.md

src/compas_timber/connections/l_butt.py

chenkasirer · 2024-01-19T12:15:29Z

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

+
+
+
+


lots of spaces. run auto-formatter

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

src/compas_timber/ghpython/components/CT_Joint_Rule_Topology/metadata.json

chenkasirer · 2024-01-19T12:22:34Z

src/compas_timber/ghpython/workflow.py

+    def comply(self, beams):
+        try:
+            return set(self.beams) == set(beams)
+        except KeyError:


When is a KeyError raised?

Hmm good point. what kind of error should we raise? maybe comply should check for topo match...?

src/compas_timber/connections/joint.py

…compas_timber into compas_fab_test1

chenkasirer · 2024-01-23T13:24:13Z

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

+        args = {"cutoff": Cutoff}
+        options = JointOptions(FrenchRidgeLapJoint, **args)


Seems like FrenchRidgeLapJoint doesn't take a parameter cutoff:

compas_timber/src/compas_timber/connections/french_ridge_lap.py

Line 42 in 37e9ae8

def __init__(self, beam_a=None, beam_b=None, gap=0.0, frame=None, key=None):

chenkasirer

LGTM!

There's a couple of issues still open (rule priorities), but I think we can address them in other PRs since this one is big enough.

Pending the build (Actions) all completing fine, and assuming the concept is OK with everyone (e.g. @jonashaldemann) I say we can merge this.

obucklin added 7 commits January 5, 2024 16:23

added reference surface from beam face

ec1ea89

added_jointsByTopo

e8aacf1

added Info to jointByTopo

6c440bc

Added_jointsFromTopology

2cb06a2

updated changelog

544ee74

Added JointOptions topoJointRule and DirectJoint

0c24bac

added some documentaiton

a1a921b

obucklin requested review from chenkasirer and funkchaser January 17, 2024 10:41

obucklin added 2 commits January 17, 2024 11:48

updated changelog

5bedbe4

formatted and de-linted

769a53b

obucklin requested a review from gonzalocasas January 17, 2024 12:12

obucklin added 2 commits January 17, 2024 14:50

added cut_plane_bias to x-halfLap

2117782

removed old joint defs

5a08aaf

obucklin added 3 commits January 18, 2024 11:03

eliminated_autoJoints

4bba990

added new UI example files

e177306

changed component label

1a0b0bf

chenkasirer requested changes Jan 19, 2024

View reviewed changes

obucklin and others added 8 commits January 19, 2024 17:51

linted and formatted

2f1cba8

weekend!

524c79b

resolving comments

d23f5e7

Hopefully addressed all comments

e6bcdd2

Merge branch 'main' into compas_fab_test1

a2eb0ad

removed old XHalfLap component

7f7e429

updated example file with new GH components

ff797ed

fixed halflap data interface

12d78ea

chenkasirer and others added 11 commits January 23, 2024 12:00

added unittests

c1a4815

added missing member to french ridge lap

ab12e89

changed beam face sorting

cf27c52

Merge branch 'compas_fab_test1' of https://github.com/gramaziokohler/…

06c1dda

…compas_timber into compas_fab_test1

fixed some docstrings

2941ef7

added unittests for xhalflap and frenchridge

2858b03

Merge branch 'compas_fab_test1' of https://github.com/gramaziokohler/…

5a0a602

…compas_timber into compas_fab_test1

removed unused variable

2a6d955

added unittests

3d156ec

linting

80d2bfa

removed french ridge unittest as not yet implemented

37e9ae8

chenkasirer reviewed Jan 23, 2024

View reviewed changes

removed unused import

ce2e24d

chenkasirer approved these changes Jan 23, 2024

View reviewed changes

chenkasirer merged commit ce30cc9 into main Jan 24, 2024
11 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GH_UI_overhaul #169

GH_UI_overhaul #169

obucklin commented Jan 17, 2024 •

edited by chenkasirer

Loading

chenkasirer commented Jan 17, 2024

obucklin commented Jan 17, 2024

chenkasirer commented Jan 17, 2024

obucklin commented Jan 17, 2024

chenkasirer left a comment •

edited

Loading

chenkasirer Jan 19, 2024

chenkasirer Jan 19, 2024

chenkasirer Jan 19, 2024

chenkasirer Jan 19, 2024

obucklin Jan 19, 2024

chenkasirer Jan 23, 2024

chenkasirer left a comment

		@@ -167,6 +167,14 @@ def __init__(self, beam):
		self.processings = []
		self._et_element = None

		args = {"cutoff": Cutoff}
		options = JointOptions(FrenchRidgeLapJoint, **args)

GH_UI_overhaul #169

GH_UI_overhaul #169

Conversation

obucklin commented Jan 17, 2024 • edited by chenkasirer Loading

What type of change is this?

Checklist

chenkasirer commented Jan 17, 2024

obucklin commented Jan 17, 2024

chenkasirer commented Jan 17, 2024

obucklin commented Jan 17, 2024

chenkasirer left a comment • edited Loading

Choose a reason for hiding this comment

chenkasirer Jan 19, 2024

Choose a reason for hiding this comment

chenkasirer Jan 19, 2024

Choose a reason for hiding this comment

chenkasirer Jan 19, 2024

Choose a reason for hiding this comment

chenkasirer Jan 19, 2024

Choose a reason for hiding this comment

obucklin Jan 19, 2024

Choose a reason for hiding this comment

chenkasirer Jan 23, 2024

Choose a reason for hiding this comment

chenkasirer left a comment

Choose a reason for hiding this comment

obucklin commented Jan 17, 2024 •

edited by chenkasirer

Loading

chenkasirer left a comment •

edited

Loading