Repository navigation
Expand reference to resolve conflict - #546
Merged
Chrisshort92 merged 1 commit intoSep 7, 2026
Merged
Chrisshort92 merged 1 commit into
Chrisshort92 merged 1 commit into
Conversation
Contributor
Author
|
@BHoMBot check required |
|
@Chrisshort92 to confirm, the following actions are now queued:
|
Contributor
Author
|
@BHoMBot check copyright-compliance |
|
@Chrisshort92 to confirm, the following actions are now queued:
There are 19 requests in the queue ahead of you. |
IsakNaslundBh
approved these changes
Sep 7, 2026
IsakNaslundBh
left a comment
IsakNaslundBh
left a comment
Contributor
There was a problem hiding this comment.
Se no issue with this, and given it build fine I am happy to approve.
The model pushed to ETABS 22.7 successfully. A warning about undefine material, but expected behavior, and not code breaking.
Level imported correctly
All geometry imported correctly
Property aligns with input
Successfully pulled in models back into Grasshopper
Happy to say this works as intended, and the adaptor works for pushing and pulling |
Martian42
approved these changes
Sep 7, 2026
Martian42
left a comment
Martian42
left a comment
There was a problem hiding this comment.
Test script has been used to test the functionality to push and pull with ETABS 22.7, All works as intended.
Contributor
Author
|
@BHoMBot check ready-to-merge |
|
@Chrisshort92 to confirm, the following actions are now queued:
There are 10 requests in the queue ahead of you. |
Chrisshort92
deleted the
Etabs_Toolkit-#545-resolve-new-conflict-between-adapterquery-unitsquery
branch
September 7, 2026 10:27
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NOTE: Depends on
Issues addressed by this PR
Closes #545
Expanded single Query reference to its full path to resolve conflict between Adapter.Query() & Units.Query(). New Units.Query() method added in Localisation_Toolkit introduces this conflict.
BHoM/Localisation_Toolkit#181
object runningInstance = Query.GetActiveObject(programId);now reads
object runningInstance = BH.Engine.Adapter.Query.GetActiveObject(programId);Test files
https://burohappold.sharepoint.com/:f:/r/sites/BHoM/02_Current/12_Scripts/02_Pull%20Request/BHoM/ETABS_Toolkit/%23546-ExpandReferenceToResolveConflict?d=we8cfb29e1da74b90bd6d02b4414afd53&csf=1&web=1&e=sYDoi8
Changelog
Additional comments