Update the time series label to inherit the line color only if it's not in the legend

Author: NicholasMamo

examples/.ipynb_checkpoints/0. Styles-checkpoint.ipynb

@@ -59,7 +59,22 @@ def test_label_style_legend(self):
 	@MultiplexTest.temporary_plot
 	def test_label_style_line(self):
 		"""
-		Test that when drawing a time series legend at the end of the line, the label style is used.
+		Test that when drawing a time series label at the end of the line, the line color is used by default.
+		"""
+
+		viz = drawable.Drawable(plt.figure(figsize=(10, 10)))
+		line_style = { 'color': '#FF0000' }
+		line, label = viz.draw_time_series([ 1 ] * 5, [ 1 ] * 5, label='A',
+										   **line_style, with_legend=False)
+
+		self.assertEqual(0, len(viz.legend.lines[0]))
+		self.assertEqual('A', str(label))
+		self.assertEqual(line_style['color'], label.lines[0][0].get_color())
+
+	@MultiplexTest.temporary_plot
+	def test_label_style_line_override(self):
+		"""
+		Test that when drawing a time series label at the end of the line, the line style can override the color.
 		"""
 
 		viz = drawable.Drawable(plt.figure(figsize=(10, 10)))
@@ -71,6 +86,22 @@ def test_label_style_line(self):
 		self.assertEqual('A', str(label))
 		self.assertEqual(label_style['color'], label.lines[0][0].get_color())
 
+	@MultiplexTest.temporary_plot
+	def test_label_style_legend(self):
+		"""
+		Test that when drawing a time series label as a legend, the line color is not used.
+		"""
+
+		viz = drawable.Drawable(plt.figure(figsize=(10, 10)))
+		line_style = { 'color': '#FF0000' }
+		line, label = viz.draw_time_series([ 1 ] * 5, [ 1 ] * 5, label='A',
+										   **line_style, with_legend=True)
+
+		self.assertEqual(1, len(viz.legend.lines[0]))
+		line, label = viz.legend.lines[0][0]
+		self.assertEqual('A', str(label))
+		self.assertFalse(line_style['color'] == label.lines[0][0].get_color())
+
 	@MultiplexTest.temporary_plot
 	def test_line_series(self):
 		"""

examples/.ipynb_checkpoints/3. Time series-checkpoint.ipynb

@@ -103,15 +103,16 @@ def draw(self, x, y, label=None, label_style=None, with_legend=False, *args, **k
 		line = axis.plot(x, y, *args, **kwargs)[0]
 
 		"""
-		Draw the label at the end of the line.
+		Draw the label.
+		If the label is drawn at the end of the line, by default it inherits the line's color.
 		"""
 		if label is not None and len(x) and len(y):
-			default_label_style = { 'color': line.get_color() }
-			default_label_style.update(label_style or { })
 			if with_legend:
-				self.drawable.legend.draw_line(label, label_style=default_label_style,
+				self.drawable.legend.draw_line(label, label_style=label_style,
 											   *args, **kwargs)
 			else:
+				default_label_style = { 'color': line.get_color() }
+				default_label_style.update(label_style or { })
 				label = self.draw_label(label, x[-1], y[-1], **default_label_style)
 
 		return (line, label)