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

Show path in rlv title bar #1771

Merged
merged 5 commits into from
Jul 1, 2021
Merged

Show path in rlv title bar #1771

merged 5 commits into from
Jul 1, 2021

Conversation

dagewa
Copy link
Member

@dagewa dagewa commented Jun 30, 2021

When comparing dials.reciprocal_lattice_viewer windows side by side it could be difficult to keep track of which was which because the title bar just says "Reflection data viewer". This change makes it more similar to the dials.image_viewer, by printing a useful path up there (here the path to reflections)

Screenshot from 2021-06-30 16-11-43

@dagewa dagewa requested a review from rjgildea June 30, 2021 15:14
@dagewa
Copy link
Member Author

dagewa commented Jun 30, 2021

Oops looks like I branched off #1770, so included those changes here too

@Anthchirp
Copy link
Member

git rebase --onto master 002dc1835e71a5cbe649551c47361798b35d7fd1 && git push -f
should now be the correct set of commits?

@dagewa
Copy link
Member Author

dagewa commented Jun 30, 2021

Looks right. Thanks for untangling.

@ndevenish
Copy link
Member

ndevenish commented Jul 1, 2021

The test failures on previous commit are because it looks like the feature branch was inadvertantly rebased onto master instead of main. Merged in again.

@ndevenish ndevenish enabled auto-merge (squash) July 1, 2021 09:42
@Anthchirp
Copy link
Member

rebased onto master instead of main

🤦 sorry

@ndevenish
Copy link
Member

It's hard to train out that muscle memory sometimes :)

@ndevenish ndevenish merged commit 211624e into main Jul 1, 2021
@ndevenish ndevenish deleted the rlv-show-path branch July 1, 2021 11:17
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.

None yet

4 participants