Skip to content

merge streamplot_demo_features streamplot_demo_masking streamplot_demo_start_points#8155

Closed
patniharshit wants to merge 1 commit into
matplotlib:masterfrom
patniharshit:streamplotMerge
Closed

merge streamplot_demo_features streamplot_demo_masking streamplot_demo_start_points#8155
patniharshit wants to merge 1 commit into
matplotlib:masterfrom
patniharshit:streamplotMerge

Conversation

@patniharshit

Copy link
Copy Markdown
Contributor

refs #7956

@QuLogic QuLogic left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Merging these three files does not just mean copy&paste together; redundant stuff needs to be removed and documentation needs to be made consistent.

@@ -31,3 +31,56 @@
ax2.streamplot(X, Y, U, V, density=0.6, color='k', linewidth=lw)

plt.show()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Remove; there's one at the end.


"""
================================
Streamplot function with masking

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You'll need to merge this docstring with the one at the beginning to make something coherent.

masked regions and NaN values.
"""
w = 3
Y, X = np.mgrid[-w:w:100j, -w:w:100j]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can X and Y be reused from above?

ax.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5,
interpolation='nearest', cmap=plt.cm.gray)

plt.show()

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Remove.


"""
========================================
Streamplot function with starting points

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Again, you need to merge this with the first docstring.

"""
Y, X = np.mgrid[-3:3:100j, -3:3:100j]
U = -1 - X**2 + Y
V = 1 + X - Y**2

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can any of these be reused from before?

@afvincent

Copy link
Copy Markdown
Contributor

Wouldn't this be a duplicate effort of #8082?

@patniharshit

patniharshit commented Mar 10, 2017

Copy link
Copy Markdown
Contributor Author

@afvincent @QuLogic Should I continue with the suggested changes in review?

@tacaswell

Copy link
Copy Markdown
Member

I suggest combining efforts with @tmcclintock . The comments between the two PRs are very similar. I suggest starting from the branch in #8082 , addressing both sets of comments and opening a new PR with the combined efforts.

@afvincent

Copy link
Copy Markdown
Contributor

@patniharshit I agree with @tacaswell on the idea of merging the two PRs. In the case where some review comments about English are overlapping between @QuLogic's ones and mine, just trust @QuLogic ;).

@QuLogic

QuLogic commented Mar 25, 2017

Copy link
Copy Markdown
Member

Replaced by #8336.

@QuLogic QuLogic closed this Mar 25, 2017
@patniharshit patniharshit deleted the streamplotMerge branch March 25, 2017 04:43
@patniharshit patniharshit restored the streamplotMerge branch May 22, 2017 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants