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.

Sign up for GitHub

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

Jump to bottom

Adding canvases and intents (nx xpcs ingestor and projector) #11

Merged
merged 42 commits into from
Oct 14, 2020
Merged

Adding canvases and intents (nx xpcs ingestor and projector) #11

merged 42 commits into from
Oct 14, 2020

Conversation

ihumphrey
Copy link
Contributor

@ihumphrey ihumphrey commented Sep 2, 2020 •
edited
Loading

See Xi-CAM/Xi-cam.SAXS#29 for details.

@ihumphrey ihumphrey mentioned this pull request Sep 2, 2020
Closed
ihumphrey and others added 23 commits September 17, 2020 21:55
@ihumphrey
update to intents and canvases
3e30d87
@ihumphrey
update canvas manager
64e40ca
@ihumphrey
fixing setdata and data for xpcs models
42a8141
@ihumphrey
fix connection from model to proxy, will need to replace with filterD…
7729380 
…ataChanged
@ihumphrey
Cleanup code for intents and canvases
2f847f5
@ihumphrey
fixing integration with layouts
1fadd92
@ihumphrey
attempting to refactor proxy model
90e9f80
@ihumphrey
add new data role to ensemble model; experimenting with proxy
1500db4
@ronpandolfi
Add IntentsModel as a QAbstractItemModel replacement for CanvasProxyM…
9481146 
…odel
@ronpandolfi
Merge remote-tracking branch 'origin/intents' into intents
a82c100
@ihumphrey
Switching between results views works now (with one canvas)
5359de0
@ronpandolfi
Add (temporary) cute raccoon face.
75ba333
@ihumphrey
add canvases accessor to canvas manager, fix setdata for canvas_role
7f9b78f
@ihumphrey
Change canvasmanager canvas to only return unique canvases
11a2820
@ronpandolfi
Fix coupling of intentsmodel with CanvasView
4c6e838
@ihumphrey
add projector as arg to add_ensemble (so we can move this module into…
278a627 
… xi-cam)
@ihumphrey
update nx xpcs ingestor/projector for q rois
06b1da1
@ihumphrey
fixing projection
142a21b
@ronpandolfi
Use display_name util for describing BlueskyRuns in models
98352da
@ronpandolfi
emit layoutchanged when adding items to EnsembleModel (triggers neede…
fac5d6d 
…d UI updates)
@ronpandolfi
Change .canvases to return a Generator rather than list
c4cf418
@ihumphrey
fix project_nxXPCS to get pure python strings when creating Intents
f39b452
@JulReinhardt
try to get data with different dimensions in one bluesky run
47b041a
@ihumphrey ihumphrey marked this pull request as ready for review October 14, 2020 17:51
@ihumphrey ihumphrey changed the title Adding canvases and intents (first to xpcs) Adding canvases and intents Oct 14, 2020
@ihumphrey ihumphrey changed the title Adding canvases and intents Adding canvases and intents (nx xpcs ingestor and projector) Oct 14, 2020
@ihumphrey ihumphrey merged commit 7266285 into master Oct 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ihumphrey @ronpandolfi @JulReinhardt