More matrix visualization API tweaking.

sandialabs · Sep 2, 2015 · a7349cb · a7349cb
1 parent 86f6390
commit a7349cb
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/design/matrix-labelling.ipynb b/design/matrix-labelling.ipynb
diff --git a/toyplot/__init__.py b/toyplot/__init__.py
@@ -158,10 +158,10 @@ def matrix(
         rlabel=None,
         blabel=None,
         step=1,
-        tshow=True,
-        lshow=True,
-        rshow=False,
-        bshow=False,
+        tshow=None,
+        lshow=None,
+        rshow=None,
+        bshow=None,
         tlocator=None,
         llocator=None,
         rlocator=None,

diff --git a/toyplot/canvas.py b/toyplot/canvas.py
@@ -391,10 +391,10 @@ def matrix(
             rlabel=None,
             blabel=None,
             step=1,
-            tshow=True,
-            lshow=True,
-            rshow=False,
-            bshow=False,
+            tshow=None,
+            lshow=None,
+            rshow=None,
+            bshow=None,
             tlocator=None,
             llocator=None,
             rlocator=None,
@@ -470,27 +470,35 @@ def matrix(
             cell = table.bottom.row(1).merge()
             cell.data = blabel
 
+        if tshow is None:
+            tshow = True
         if tshow:
             if tlocator is None:
                 tlocator = toyplot.locator.Integer(step=step)
             for j, label, title in zip(*tlocator.ticks(0, matrix.shape[1] - 1)):
                 table.top.cell(1, j).data = label
                 #table.top.cell(1, j).title = title
 
+        if lshow is None:
+            lshow = True
         if lshow:
             if llocator is None:
                 llocator = toyplot.locator.Integer(step=step)
             for i, label, title in zip(*llocator.ticks(0, matrix.shape[0] - 1)):
                 table.left.cell(i, 1).data = label
                 #table.left.cell(i, 1).title = title
 
+        if rshow is None and rlocator is not None:
+            rshow = True
         if rshow:
             if rlocator is None:
                 rlocator = toyplot.locator.Integer(step=step)
             for i, label, title in zip(*rlocator.ticks(0, matrix.shape[0] - 1)):
                 table.right.cell(i, 0).data = label
                 #table.right.cell(i, 0).title = title
 
+        if bshow is None and blocator is not None:
+            bshow = True
         if bshow:
             if blocator is None:
                 blocator = toyplot.locator.Integer(step=step)