Consistent markers (#34)

* extracted marker and line styles

* figure uses styles from draw module

* added more linestyles

* updated changelog

CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog
 =========
 
+Version 0.2.1
+---------------
+- Fixed bug to allow legend with non-unique labels
+- Moved line and marker styles options into drawing module
+
 Version 0.2.0
 ---------------
 - Added object-orientated figure API, entailed major refactor of plotting code

src/shellplot/drawing.py

@@ -7,25 +7,20 @@
 from collections import namedtuple
 from typing import List
 
+MARKER_STYLES = {1: "+", 2: "*", 3: "o", 4: "x", 5: "@", 6: "■"}
+
+LINE_STYLES = {10: "·", 11: ":", 12: "÷", 13: "×"}
+
 PALETTE = {
     # empty space
     0: " ",
-    # scatter points
-    1: "+",
-    2: "*",
-    3: "o",
-    4: "x",
-    5: "@",
-    6: "■",
-    # line drawing
-    10: "·",
-    11: ":",
-    # bar drawing
     20: "|",
     21: "_",
     22: "-",
     23: "┐",
 }
+PALETTE.update(MARKER_STYLES)
+PALETTE.update(LINE_STYLES)
 
 LegendItem = namedtuple("LegendItem", ["symbol", "name"])
 

src/shellplot/figure.py

@@ -8,7 +8,7 @@
 from shellplot._config import _global_config as config
 from shellplot._plotting import PlotCall, Plotter, _barh, _boxplot, _hist, _plot
 from shellplot.axis import Axis
-from shellplot.drawing import draw
+from shellplot.drawing import LINE_STYLES, MARKER_STYLES, draw
 from shellplot.utils import get_index, numpy_1d, numpy_2d, remove_any_nan
 
 
@@ -68,8 +68,8 @@ def clear(self):
     def _init_figure_elements(self):
         self.canvas = np.zeros(shape=(self.figsize[0], self.figsize[1]), dtype=int)
         self.legend = list()
-        self.markers = cycle([1, 2, 3, 4, 5, 6])
-        self.lines = cycle([10, 11])
+        self.markers = cycle(MARKER_STYLES.keys())
+        self.lines = cycle(LINE_STYLES.keys())
 
     def plot(self, x, y, color=None, **kwargs):
         """Plot x versus y as scatter.