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

Multifigure toolbar #1

Open
wants to merge 44 commits into
base: backend-refactor
Choose a base branch
from

Conversation

fariza
Copy link

@fariza fariza commented May 8, 2015

Getting rid of the canvas property inside FigureManager and replacing it with a figure property with setter and getter
Also, allows to instantiate FigureManager without any figure.
In window added a method to replace_element this allows to reuse the same FigureManager object with different figures.

@fariza
Copy link
Author

fariza commented May 8, 2015

Why this PR is showing me 38 commits? when I only made one?

@OceanWolf
Copy link
Owner

Hmm, not sure when you pulled from my branch, perhaps I had done a merge/rebase, in which case you need to update your local copy of my branch and then do a rebase.

@fariza
Copy link
Author

fariza commented May 14, 2015

But, in general what do you think of this idea?

@OceanWolf
Copy link
Owner

Can you clear up your PR first (rebase) so that I can take a good look.

@fariza
Copy link
Author

fariza commented May 15, 2015

There is nothing to rebase, your PR (From your branch to MPL master) hasn't changed

@fariza fariza force-pushed the multifigure-toolbar branch from 9499c33 to 11cc44f Compare May 15, 2015 12:54
@fariza
Copy link
Author

fariza commented May 15, 2015

I rebased again from the your PR on MPL.
Still I see too many commits here, I don't get it.

@OceanWolf
Copy link
Owner

@fariza that looks slightly better, it removes some of my commits from your PR, but still very odd.

You have commits from master since my last rebase (no idea how they got in there), and I miss commits prior to my last rebase (no idea why I don't have them).

@fariza
Copy link
Author

fariza commented May 15, 2015

If you check fariza@07d30a6 you'll see the main differences.

I will make a clean PR if you agree with the way this one is going. In any case I'll change a couple of minor things. But before putting more time into it, I would like to have your opinion

@OceanWolf
Copy link
Owner

I just had a brainwave as to what could have caused this... did you branch this from mine, or did you branch this say from master and then later rebased it from my branch?

@fariza
Copy link
Author

fariza commented Jun 21, 2015

I branched this from the PR on MPL,

@OceanWolf
Copy link
Owner

Hmm, that might explain it... when I made PRs against MEP22 I branched from your repo rather than the PR... I will look up how to do it.

@OceanWolf
Copy link
Owner

Ahh yes, it comes back to me, I did it in the reverse order (cloning from you and then later from matplotlib), but basically you have to add a new remote to your local repo.

From the command line I get:

$ git remote -v
master  https://github.com/matplotlib/matplotlib.git (fetch)
master  https://github.com/matplotlib/matplotlib.git (push)
origin  https://github.com/OceanWolf/matplotlib.git (fetch)
origin  https://github.com/OceanWolf/matplotlib.git (push)
upstream    https://github.com/fariza/matplotlib.git (fetch)
upstream    https://github.com/fariza/matplotlib.git (push)

If I had done it in the order you should do, then you would have upstream pointing to matplotlib (instead of mine pointing to yours), and then you can name the remote pointing to mine as oceanwolf, that way you sync your backend-refactor branch against my fork, rather than the PR on mpl. Make sense?

@OceanWolf
Copy link
Owner

Ofc when you push, you push to origin and then make a PR on github, but for fetching it should come from a remote pointing to my fork.

OceanWolf pushed a commit that referenced this pull request Jul 5, 2015
@OceanWolf OceanWolf force-pushed the backend-refactor branch 3 times, most recently from 620efb9 to d842ee8 Compare September 22, 2015 23:07
OceanWolf pushed a commit that referenced this pull request Jun 21, 2016
One too many assertions

Closes #1
@OceanWolf OceanWolf force-pushed the backend-refactor branch 2 times, most recently from e7290fe to 64f0c61 Compare August 4, 2016 00:03
OceanWolf pushed a commit that referenced this pull request Sep 30, 2016
DOC minor fixes on the documentation of errorbar
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.

8 participants