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

Changed the icon set in Button2D from Dictionary to List of Tuples #1547

Merged
merged 5 commits into from
Jun 15, 2018

Conversation

karandeepSJ
Copy link
Contributor

The Button2D class used a dictionary to store icons. The random ordering of dictionaries in Python was causing problems when a particular order was required for the button icons.
This PR changes the dictionary to a list of tuples of the form ((icon_name, icon), (icon_name, icon), ....)

Copy link
Contributor

@dmreagan dmreagan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a good solution to the problem.

@Garyfallidis
Copy link
Contributor

Thanks for fixing this @karandeepSJ :)

@Garyfallidis Garyfallidis merged commit afc3749 into dipy:master Jun 15, 2018
karandeepSJ added a commit to karandeepSJ/dipy that referenced this pull request Jun 16, 2018
@MarcCote
Copy link
Contributor

@Garyfallidis @dmreagan @karandeepSJ This PR was modified (fixing a bug) after it got merged. Master is failing the tests at the moment.

@karandeepSJ
Copy link
Contributor Author

I did not push anything to this branch. Master is failing because of some error in the latest version of scipy.

@arokem
Copy link
Contributor

arokem commented Jun 21, 2018

Yep. See #1565

@arokem
Copy link
Contributor

arokem commented Jun 21, 2018

Oh no - I am wrong. One of the failures does seem to be because of this branch:

https://travis-ci.org/nipy/dipy/jobs/394432361

@arokem
Copy link
Contributor

arokem commented Jun 21, 2018

Now in #1573

@karandeepSJ
Copy link
Contributor Author

Fixed

arokem added a commit that referenced this pull request Jun 29, 2018
karandeepSJ added a commit to karandeepSJ/dipy that referenced this pull request Jul 3, 2018
karandeepSJ added a commit to karandeepSJ/dipy that referenced this pull request Jul 24, 2018
karandeepSJ added a commit to karandeepSJ/dipy that referenced this pull request Aug 1, 2018
ShreyasFadnavis pushed a commit to ShreyasFadnavis/dipy that referenced this pull request Sep 20, 2018
 Changed the icon set in Button2D from Dictionary to List of Tuples
ShreyasFadnavis pushed a commit to ShreyasFadnavis/dipy that referenced this pull request Sep 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants