From cdbba2ffaf331f6750150da51dd9a100a4a36caf Mon Sep 17 00:00:00 2001 From: Matt Terry Date: Fri, 28 Jun 2013 17:27:24 -0500 Subject: [PATCH 1/3] forward keyword args though table --- lib/matplotlib/table.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py index 7d3a6813dee2..226ce5993d21 100644 --- a/lib/matplotlib/table.py +++ b/lib/matplotlib/table.py @@ -177,7 +177,7 @@ class Table(Artist): FONTSIZE = 10 AXESPAD = 0.02 # the border between the axes and table edge - def __init__(self, ax, loc=None, bbox=None): + def __init__(self, ax, loc=None, bbox=None, **kwargs): Artist.__init__(self) @@ -201,6 +201,7 @@ def __init__(self, ax, loc=None, bbox=None): self._autoRows = [] self._autoColumns = [] self._autoFontsize = True + self.update(kwargs) self.set_clip_on(False) @@ -453,7 +454,8 @@ def table(ax, cellLoc='right', colWidths=None, rowLabels=None, rowColours=None, rowLoc='left', colLabels=None, colColours=None, colLoc='center', - loc='bottom', bbox=None): + loc='bottom', bbox=None, + **kwargs): """ TABLE(cellText=None, cellColours=None, cellLoc='right', colWidths=None, @@ -517,7 +519,7 @@ def table(ax, cellColours = ['w' * cols] * rows # Now create the table - table = Table(ax, loc, bbox) + table = Table(ax, loc, bbox, **kwargs) height = table._approx_text_height() # Add the cells From 20e05d1b3c84a7851e4634701d46f57b919816c0 Mon Sep 17 00:00:00 2001 From: Matt Terry Date: Sat, 29 Jun 2013 10:16:56 -0500 Subject: [PATCH 2/3] added test for table zorder --- lib/matplotlib/__init__.py | 1 + .../test_table/table_zorder.png | Bin 0 -> 36925 bytes lib/matplotlib/tests/test_table.py | 37 ++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 lib/matplotlib/tests/baseline_images/test_table/table_zorder.png create mode 100644 lib/matplotlib/tests/test_table.py diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 6db9f897315e..ab7ffe4ee7b1 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1230,6 +1230,7 @@ def tk_window_focus(): 'matplotlib.tests.test_spines', 'matplotlib.tests.test_streamplot', 'matplotlib.tests.test_subplots', + 'matplotlib.tests.test_table', 'matplotlib.tests.test_text', 'matplotlib.tests.test_ticker', 'matplotlib.tests.test_tightlayout', diff --git a/lib/matplotlib/tests/baseline_images/test_table/table_zorder.png b/lib/matplotlib/tests/baseline_images/test_table/table_zorder.png new file mode 100644 index 0000000000000000000000000000000000000000..21d4537c18fc37e900364ec7bccc6143f85d4318 GIT binary patch literal 36925 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 literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/test_table.py b/lib/matplotlib/tests/test_table.py new file mode 100644 index 000000000000..6a8e41460d7a --- /dev/null +++ b/lib/matplotlib/tests/test_table.py @@ -0,0 +1,37 @@ +import matplotlib.pyplot as plt +import numpy as np +from matplotlib.testing.decorators import image_comparison + + +@image_comparison(baseline_images=['table_zorder'], extensions=['png']) +def test_zorder(): + data = [[ 66386, 174296,], + [ 58230, 381139,]] + + colLabels = ('Freeze', 'Wind') + rowLabels = ['%d year' % x for x in (100, 50)] + + + cellText = [] + yoff = np.array([0.0] * len(colLabels)) + for row in reversed(data): + yoff += row + cellText.append(['%1.1f' % (x/1000.0) for x in yoff]) + + t = np.linspace(0, 2*np.pi, 100) + plt.plot(t, np.cos(t), lw=4, zorder=2) + + plt.table(cellText=cellText, + rowLabels=rowLabels, + colLabels=colLabels, + loc='center', + zorder=-2, + ) + + plt.table(cellText=cellText, + rowLabels=rowLabels, + colLabels=colLabels, + loc='upper center', + zorder=4, + ) + plt.yticks([]) From 341dadb89bcc714f7309b0119dafed24d0eb3890 Mon Sep 17 00:00:00 2001 From: Matt Terry Date: Sat, 29 Jun 2013 15:04:20 -0500 Subject: [PATCH 3/3] remove_text=True to test to testing issues --- lib/matplotlib/tests/test_table.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_table.py b/lib/matplotlib/tests/test_table.py index 6a8e41460d7a..6c173e8087ef 100644 --- a/lib/matplotlib/tests/test_table.py +++ b/lib/matplotlib/tests/test_table.py @@ -3,7 +3,9 @@ from matplotlib.testing.decorators import image_comparison -@image_comparison(baseline_images=['table_zorder'], extensions=['png']) +@image_comparison(baseline_images=['table_zorder'], + extensions=['png'], + remove_text=True) def test_zorder(): data = [[ 66386, 174296,], [ 58230, 381139,]]