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

Revert 1570 file menu #1590

Merged
merged 5 commits into from Jul 20, 2018

Conversation

Projects
5 participants
@arokem
Copy link
Member

arokem commented Jul 19, 2018

This supersedes #1577

arokem added some commits Jun 23, 2018

@pep8speaks

This comment has been minimized.

Copy link

pep8speaks commented Jul 19, 2018

Hello @arokem, Thank you for updating !

Cheers ! There are no PEP8 issues in this Pull Request. 🍻

Comment last updated on July 19, 2018 at 18:20 Hours UTC
@arokem

This comment has been minimized.

Copy link
Member

arokem commented Jul 19, 2018

Sorry folks: I don't understand the error that is currently happening on that one Travis bot (https://travis-ci.org/nipy/dipy/jobs/405653392). Can anyone provide some guidance for a fix?

@@ -3024,12 +3023,12 @@ def _setup(self):

# Add up and down buttons
arrow_up = read_viz_icons(fname="arrow-up.png")
self.up_button = Button2D([("up", arrow_up)])
self.up_button = Button2D(("up", arrow_up))

This comment has been minimized.

@skoudoro

skoudoro Jul 19, 2018

Member

I think the error comes from here. Button2D([("up", arrow_up)]) is the right version. Can you confirm @dmreagan ?

pos = self.panel.size - self.up_button.size // 2 - margin
self.panel.add_element(self.up_button, pos, anchor="center")

arrow_down = read_viz_icons(fname="arrow-down.png")
self.down_button = Button2D([("down", arrow_down)])
self.down_button = Button2D(("down", arrow_down))

This comment has been minimized.

@skoudoro

skoudoro Jul 19, 2018

Member

same here

@arokem

This comment has been minimized.

Copy link
Member

arokem commented Jul 19, 2018

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jul 19, 2018

Codecov Report

Merging #1590 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1590      +/-   ##
==========================================
- Coverage   87.32%   87.32%   -0.01%     
==========================================
  Files         246      246              
  Lines       31936    31802     -134     
  Branches     3471     3449      -22     
==========================================
- Hits        27889    27771     -118     
+ Misses       3220     3210      -10     
+ Partials      827      821       -6
Impacted Files Coverage Δ
dipy/viz/tests/test_ui.py 83.73% <ø> (+0.11%) ⬆️
dipy/viz/ui.py 88.84% <100%> (-0.12%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9994c2a...17d2977. Read the comment docs.

@@ -3029,7 +3028,7 @@ def _setup(self):
self.panel.add_element(self.up_button, pos, anchor="center")

arrow_down = read_viz_icons(fname="arrow-down.png")
self.down_button = Button2D([("down", arrow_down)])
self.down_button = Button2D([("down", arrow_down)]

This comment has been minimized.

@skoudoro

skoudoro Jul 19, 2018

Member

small typo here, you forgot to close ). I am surprised that pep8speak did not complain.

@arokem

This comment has been minimized.

Copy link
Member

arokem commented Jul 19, 2018

Maybe it's given up on me.

@skoudoro

This comment has been minimized.

Copy link
Member

skoudoro commented Jul 20, 2018

I think it is ready to go @dmreagan! Can you have a last look and merge it?

@dmreagan dmreagan added this to PR needs a review in Viz Module Jul 20, 2018

@dmreagan

This comment has been minimized.

Copy link
Contributor

dmreagan commented Jul 20, 2018

Looks good. Merging. And now, @karandeepSJ, can you resubmit your FileMenu PR?

@dmreagan dmreagan merged commit b55303c into nipy:master Jul 20, 2018

3 checks passed

codecov/patch 100% of diff hit (target 87.32%)
Details
codecov/project Absolute coverage decreased by -<.01% but relative coverage increased by +12.67% compared to 9994c2a
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

Viz Module automation moved this from PR needs a review to Done Jul 20, 2018

@dmreagan dmreagan added the gsoc2018 label Jul 20, 2018

ShreyasFadnavis pushed a commit to ShreyasFadnavis/dipy that referenced this pull request Sep 20, 2018

Revert 1570 file menu (nipy#1590)
* Revert "Added File Menu element to viz.ui"
* Restore fix implemented in nipy#1574
* Fix typo.
* Fix inputs to Button2D
* Typo: close parentheses.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment