Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Other Shelves #98

Merged
merged 15 commits into from
Nov 4, 2024
Merged

Adding Other Shelves #98

merged 15 commits into from
Nov 4, 2024

Conversation

jmwright
Copy link
Contributor

There are shelf assemblies outlined in the database and in the code that are not accounted for yet. This PR is an attempt to add some of those. #94 needs to be merged first, and potentially the new CadOrchestrator changes need to be merged and then used to reshape this PR.

@jmwright
Copy link
Contributor Author

Examples of other shelf assemblies that are being added. There is an automatically captured image of the assembly, followed by an image of the exploded assembly, for each shelf.
assembly_render_test_Hex
assembly_render_test_exploded_Hex
assembly_render_test_NUC8I5BEH
assembly_render_test_exploded_NUC8I5BEH
assembly_render_test_Raspberry Pi 4B
assembly_render_test_exploded_Raspberry Pi 4B
assembly_render_test_Unifi Flex Mini
assembly_render_test_exploded_Unifi Flex Mini
assembly_render_test_Unifi Switch Flex
assembly_render_test_exploded_Unifi Switch Flex
assembly_render_test_Western Digital Blue SSD
assembly_render_test_exploded_Western Digital Blue SSD
assembly_render_test_Western Digital Red HDD
assembly_render_test_exploded_Western Digital Red HDD

@julianstirling
Copy link
Collaborator

Awesome, we are really cooking on gas now. I'm going to try to get this all synced up so the renders are generated from the CadOrchestrator commands and server

@julianstirling julianstirling self-requested a review October 24, 2024 14:56
@julianstirling julianstirling marked this pull request as ready for review October 24, 2024 14:56
Copy link
Collaborator

@julianstirling julianstirling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jmwright

Great work here I have checked over the code and made a couple of comments and a minor suggestion.

I realise however than on rebasing I have slightly buggered up the renders, probably to do with the fastener axis:

assembly_render_test_exploded_Hex
assembly_render_test_exploded_Unifi Flex Mini
assembly_render_test_exploded_Western Digital Red HDD

Is it OK if I leave this to you to fix? I am going to click approve on this so you can merge once you fix my mistake

explode_translation=explode_translation,
size=size,
fastener_type=fastener_type,
direction_axis=axis)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason that the parameter is axis in Ziptie but directional_axis in the parent class Fastener?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I was trying to keep the variables separate as they're passed through the constructor and super calls on Screw and Ziptie.

jmwright and others added 2 commits October 24, 2024 15:10
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
@jmwright
Copy link
Contributor Author

@julianstirling I don't think you messed the alignment up. Please make sure that cq-annotate is up-to-date in your environment with the latest in the main branch on git.

@julianstirling julianstirling merged commit dee0601 into master Nov 4, 2024
5 checks passed
@jmwright jmwright deleted the other-shelves branch December 27, 2024 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants