-
Notifications
You must be signed in to change notification settings - Fork 541
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
Improved CM commands #2013
Improved CM commands #2013
Changes from 22 commits
ae6025c
6b567a7
8ad2884
469a3bc
41bded9
6df318e
1a2f391
a313db7
5b9b622
5f5acec
5bd1f3e
3d868ad
3060b71
2a0fe9b
9cb4e92
9076e4f
ed02ab7
c91f2e6
6bc50d8
e00758b
a82a587
fdb343c
d839f9f
d8a0cde
e2061f7
4c88038
4de7eed
686c8a3
225f81f
cb95879
3ffb5df
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -317,7 +317,17 @@ def showAnns(self, anns): | |
v = kp[2::3] | ||
for sk in sks: | ||
if np.all(v[sk] > 0): | ||
|
||
|
||
<< << << < HEAD | ||
plt.plot(x[sk], y[sk], linewidth=3, color=c) | ||
== == == = | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here? |
||
plt.plot( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi @sahilavaran , is there a particular reason we need to duplicate line 320 and 321? |
||
x[sk], | ||
y[sk], | ||
linewidth=3, | ||
color=c) | ||
>>>>>> > 6bc50d8f7c0ee1c553aabe2d40c9534e7529b620 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here? |
||
plt.plot( | ||
x[v > 0], | ||
y[v > 0], | ||
|
@@ -336,6 +346,7 @@ def showAnns(self, anns): | |
markeredgecolor=c, | ||
markeredgewidth=2, | ||
) | ||
|
||
p = PatchCollection( | ||
polygons, | ||
facecolor=color, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Came while resolving merge conflict?