8000 Now working with rebased master. · matplotlib/matplotlib@a81545c · GitHub
[go: up one dir, main page]
Skip to content

Commit a81545c

Browse files
pelsonpelson
committed
Now working with rebased master.
1 parent c898bdf commit a81545c

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

‎lib/matplotlib/backends/backend_svg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,9 @@ def draw_gouraud_triangle(self, gc, points, colors, trans):
657657

658658
writer.start(u'defs')
659659
for i in range(3):
660-
x1, y1 = points[i]
661-
x2, y2 = points[(i + 1) % 3]
662-
x3, y3 = points[(i + 2) % 3]
660+
x1, y1 = tpoints[i]
661+
x2, y2 = tpoints[(i + 1) % 3]
662+
x3, y3 = tpoints[(i + 2) % 3]
663663
c = colors[i][:]
664664

665665
if x2 == x3:

‎lib/matplotlib/collections.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@ def draw(self, renderer):
242242
self._set_gc_clip(gc)
243243
gc.set_snap(self.get_snap())
244244

245+
8000 if self._hatch:
246+
gc.set_hatch(self._hatch)
247+
245248
renderer.draw_path_collection(
246249
gc, transform.frozen(), paths, self.get_transforms(),
247250
offsets, transOffset, self.get_facecolor(), self.get_edgecolor(),

‎lib/matplotlib/tests/baseline_images/test_axes/scatter.png

-6.46 KB
Loading

‎lib/matplotlib/tests/test_axes.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,6 @@ def test_marker_edges():
650650
ax.set_xticks([])
651651
ax.set_yticks([])
652652

653-
<<<<<<< HEAD
654653
@image_comparison(baseline_images=['hist_log'])
655654
def test_hist_log():
656655
data0 = np.linspace(0,1,200)**3

‎lib/matplotlib/tests/test_figure.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ def test_figure_label():
1010
plt.close('all')
1111
plt.figure('today')
1212
plt.figure(3)
13-
plt.figure('tomorow')
13+
plt.figure('tomorrow')
1414
plt.figure()
1515
plt.figure(0)
1616
plt.figure(1)
1717
plt.figure(3)
1818
assert_equal(plt.get_fignums(), [0, 1, 3, 4, 5])
19-
assert_equal(plt.get_figlabels(), ['', 'today', '', 'tomorow', ''])
19+
assert_equal(plt.get_figlabels(), ['', 'today', '', 'tomorrow', ''])
2020
plt.close(10)
2121
plt.close()
2222
plt.close(5)
23-
plt.close('tomorow')
23+
plt.close('tomorrow')
2424
assert_equal(plt.get_fignums(), [0, 1])
2525
assert_equal(plt.get_figlabels(), ['', 'today'])
2626

@@ -33,7 +33,8 @@ def test_figure():
3333
ax.set_title(fig.get_label())
3434
ax.plot(range(5))
3535
# plot red line in a different figure.
36-
plt.figure('tomorow')
36+
plt.figure('tomorrow')
3737
plt.plot([0, 1], [1,0], 'r')
3838
# Return to the original; make sure the red line is not there.
3939
plt.figure('today')
40+
plt.close('tomorrow')

0 commit comments

Comments
 (0)
0