Merge pull request #503 from GavinHuttley/develop

ENH: Drawable now honours layout titles

src/cogent3/draw/drawable.py

@@ -165,8 +165,16 @@ def figure(self):
 
         traces = self.traces if self.traces else [{}]
 
-        xtitle = self.xtitle if not self.xtitle else dict(text=self.xtitle)
-        ytitle = self.ytitle if not self.ytitle else dict(text=self.ytitle)
+        if self.xtitle:
+            xtitle = self.xtitle
+        else:
+            xtitle = self.layout.xaxis.get("title", None)
+
+        if self.ytitle:
+            ytitle = self.ytitle
+        else:
+            ytitle = self.layout.yaxis.get("title", None)
+
         self.layout.xaxis.title = xtitle
         self.layout.yaxis.title = ytitle
         return UnionDict(data=traces, layout=self.layout)

tests/test_draw/test_draw_integration.py

@@ -64,6 +64,18 @@ def test_one_trace(self):
         f = d.figure
         self.assertEqual(f.data, [trace])
 
+    def test_layout_with_titles(self):
+        """if provided layout has axis titles, keep them"""
+        layout = dict(xaxis=dict(title="X"), yaxis=dict(title="Y"))
+        d = Drawable(layout=layout)
+        fig = d.figure
+        self.assertEqual(fig.layout.xaxis.title, "X")
+        self.assertEqual(fig.layout.yaxis.title, "Y")
+        d = Drawable()
+        fig = d.figure
+        self.assertEqual(fig.layout.xaxis.title, None)
+        self.assertEqual(fig.layout.yaxis.title, None)
+
 
 class AlignmentDrawablesTests(BaseDrawablesTests):
     """methods on SequenceCollection produce Drawables"""