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

New layout for qt4 subplottool + QMainWindow -> QDialog #2594

Merged
merged 5 commits into from Nov 30, 2013
Merged

New layout for qt4 subplottool + QMainWindow -> QDialog #2594

merged 5 commits into from Nov 30, 2013

Conversation

twmr
Copy link
Contributor

@twmr twmr commented Nov 15, 2013

This supersedes the subplottool part from #2112.

@tacaswell
Copy link
Member

This needs a re-base.

Not sure if this should be addressed here or in #2112 but we should be using new-style QT signal/slots (see the discussion in #2382). This undoes all of those changes and will re-introduce the issues fixed in #2382

👎 on merging in it's current state.

@twmr
Copy link
Contributor Author

twmr commented Nov 24, 2013

@tacaswell rebased + use new style qt signals


"""

__author__ = 'rudolf.hoefler@gmail.com'
Copy link
Member

Choose a reason for hiding this comment

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

We only have this one other place in the code base, is there a policy on this? @mdboom

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are 4 occurrences of __author__ in the mpl codebase

examples/api/sankey_demo_old.py:__author__ = "Yannick Copin <ycopin@ipnl.in2p3.fr>"
examples/user_interfaces/interactive.py:__author__ = "Fernando Perez <Fernando.Perez@colorado.edu>"
examples/user_interfaces/svg_histogram.py:__author__="david.huard@gmail.com"
lib/matplotlib/sankey.py:__author__ = "Kevin L. Davies"

Copy link
Member

Choose a reason for hiding this comment

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

I would argue that the examples are not part of the library proper (as they are stand alone examples of using the library)

@tacaswell
Copy link
Member

@thisch Awesome, thanks!

I am a little concerned about two non-code things (both of which may be me worrying too much):

  • @rhoef has been cut out of the commit logs entirely. Fixing that would require completely re-writing history to replace the first commit of this branch with a squashed version of the New subplottool and various fixes #2112 branch.
  • What is the license on files created with pyuic? I think it is clean, but IANAL.

@twmr
Copy link
Contributor Author

twmr commented Nov 24, 2013

@tacaswell: Put @rhoef back into the commit logs (by squashing the #2112 branch)

@efiring
Copy link
Member

efiring commented Nov 28, 2013

I just tested this quickly on my machine, and it looks very nice. Just one glitch: the label on the "tight layout" button is misspelled (starts with "th" instead of "t").

Signed-off-by: Thomas Hisch <t.hisch@gmail.com>
@twmr
Copy link
Contributor Author

twmr commented Nov 28, 2013

@efiring fixed typo

efiring added a commit that referenced this pull request Nov 30, 2013
New layout for qt4 subplottool + QMainWindow -> QDialog
@efiring efiring merged commit b6a0c7e into matplotlib:master Nov 30, 2013
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.

None yet

4 participants