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

Improve performance on Bragg and PDF's plotting #95

Merged
merged 34 commits into from
Nov 2, 2017

Conversation

wdzhou
Copy link
Contributor

@wdzhou wdzhou commented Sep 9, 2017

This PR implemented line color and style scheme for Bragg plots and PDF plots.

Fixes #75, #81,#85, #95, and #96.

== Test ==

  1. Save S(Q)
    a) From tree item
    b) From combo box

  2. Edit S(Q) by shifting and scaling from Edit S(Q) dialogue box.

  3. Save G(R) by various file type.

@marshallmcdonnell
Copy link
Member

marshallmcdonnell commented Sep 14, 2017

The Bragg plotting is working great! Thanks for that.

There is one thing that I noticed that is not working in this branch that is still working in the "stable" version. When creating a new workspace via using the docked IPython widget, the workspace tree does not update with the new workspace. Thus, we can't plot up any workspaces we manipulate. The red box and arrows show the unsuccessful update:

image

Just to note, the same is true for the Bragg Peaks tab but this is an issue still in the "stable" version so it shouldn't hold up this merge.

@marshallmcdonnell
Copy link
Member

marshallmcdonnell commented Sep 14, 2017

You were right, the different alpha for same S(Q) but different configurations is a bad idea. Below is 4 different configs with the NOM_96771SQ_3 being an extreme case we would probably never use. Only then do we get enough change to see a difference:

image

Sorry but can we instead try the different line styles mixed with different markers idea? So maybe have the following dictionaries:

line_styles = { 0: '-', 1:'--', 2:':'}
marker_styles = { 0:'', 1:'.', 2:'o', 3:'D', 4:'x' }

and then do combinations when we append a new configuration:

plot(x,y,line_style[i]+marker_style[j])

Just an idea though.

@marshallmcdonnell
Copy link
Member

Another one, when pressing the 'Save G(r)' button in the 'Calculate G(r) Tab', we get the following error:

image

@marshallmcdonnell
Copy link
Member

Ready for merge.

@marshallmcdonnell marshallmcdonnell merged commit f5aeff1 into master Nov 2, 2017
@marshallmcdonnell marshallmcdonnell deleted the wz_issues_2017_01 branch November 2, 2017 15:51
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