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

Easier override of panel geometry #644

Merged
merged 2 commits into from
Jul 25, 2023

Conversation

dagewa
Copy link
Member

@dagewa dagewa commented Jul 6, 2023

This is intended to fix #299

Multiple PHIL scope extracts are merged by panel id before panels are constructed, ensuring all overrides for a single panel are contained in the same object.

@dagewa dagewa requested a review from graeme-winter July 6, 2023 11:57
@codecov
Copy link

codecov bot commented Jul 6, 2023

Codecov Report

Merging #644 (7d3189b) into main (1625cfa) will increase coverage by 0.01%.
The diff coverage is 56.00%.

❗ Current head 7d3189b differs from pull request most recent head cc95e92. Consider uploading reports for the commit cc95e92 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #644      +/-   ##
==========================================
+ Coverage   39.39%   39.40%   +0.01%     
==========================================
  Files         178      178              
  Lines       15519    15542      +23     
  Branches     2996     3004       +8     
==========================================
+ Hits         6113     6125      +12     
- Misses       8827     8836       +9     
- Partials      579      581       +2     

@dagewa dagewa merged commit 930be09 into cctbx:main Jul 25, 2023
toastisme pushed a commit to toastisme/dxtbx that referenced this pull request Jul 18, 2024
When setting panels by PHIL, merge multiple definitions first by id. This fixes cctbx#299.
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.

Trying to override panel geometry fails
1 participant