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

Projects
6 participants
@karandeepSJ
Copy link
Contributor

karandeepSJ commented Jun 4, 2018

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), ....)

@skoudoro skoudoro added the gsoc2018 label Jun 4, 2018

@dmreagan dmreagan added this to PR needs a review in Viz Module Jun 7, 2018

@dmreagan dmreagan requested a review from ranveeraggarwal Jun 13, 2018

@dmreagan
Copy link
Contributor

dmreagan left a comment

This looks like a good solution to the problem.

@Garyfallidis

This comment has been minimized.

Copy link
Member

Garyfallidis commented Jun 15, 2018

Thanks for fixing this @karandeepSJ :)

@Garyfallidis Garyfallidis merged commit afc3749 into nipy:master Jun 15, 2018

1 check failed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details

Viz Module automation moved this from PR needs a review to Done Jun 15, 2018

karandeepSJ added a commit to karandeepSJ/dipy that referenced this pull request Jun 16, 2018

@MarcCote

This comment has been minimized.

Copy link
Contributor

MarcCote commented Jun 17, 2018

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

@karandeepSJ

This comment has been minimized.

Copy link
Contributor

karandeepSJ commented Jun 21, 2018

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

@arokem

This comment has been minimized.

Copy link
Member

arokem commented Jun 21, 2018

Yep. See #1565

@arokem

This comment has been minimized.

Copy link
Member

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

This comment has been minimized.

Copy link
Member

arokem commented Jun 21, 2018

Now in #1573

@karandeepSJ karandeepSJ referenced this pull request Jun 21, 2018

Merged

Fixed Bug in PR #1547 #1574

@karandeepSJ

This comment has been minimized.

Copy link
Contributor

karandeepSJ commented Jun 21, 2018

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

Merge pull request nipy#1547 from karandeepSJ/ButtonDict2List
 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