newsworthycharts 1.71.3__tar.gz → 1.71.5__tar.gz

{newsworthycharts-1.71.3/newsworthycharts.egg-info → newsworthycharts-1.71.5}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.3
+Version: 1.71.5
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.3.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.5.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -179,6 +179,7 @@ _ Inherits from SerialChart _
 
 _ Inherits from SerialChart _
 
+- label_placement = "right"  # [left|right|both|outside|legend]
 - highlight = None  # The label value to of a line to highlight
 - line_marker = "o-"  # Matplotlib line marker type. 
 - line_marker_size = 5  # Matplotlib line marker size
@@ -270,6 +271,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.71.5
+
+  - zorder fixes in BumpChart
+  - Add `label_placement` = [left|right|both|outside|legend] to BumpChart. Default is 'right'
+  - Use alternating shades of gray in BumpChart
+
+- 1.71.4
+
+  - BumpChart: Use dual colors in line markers when rank is shared
+
 - 1.71.3
 
   - Revert 1.71.2 changes to rendering, to make file sizes predictable again

{newsworthycharts-1.71.3 → newsworthycharts-1.71.5}/README.rst

@@ -153,6 +153,7 @@ _ Inherits from SerialChart _
 
 _ Inherits from SerialChart _
 
+- label_placement = "right"  # [left|right|both|outside|legend]
 - highlight = None  # The label value to of a line to highlight
 - line_marker = "o-"  # Matplotlib line marker type. 
 - line_marker_size = 5  # Matplotlib line marker size
@@ -244,6 +245,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.71.5
+
+  - zorder fixes in BumpChart
+  - Add `label_placement` = [left|right|both|outside|legend] to BumpChart. Default is 'right'
+  - Use alternating shades of gray in BumpChart
+
+- 1.71.4
+
+  - BumpChart: Use dual colors in line markers when rank is shared
+
 - 1.71.3
 
   - Revert 1.71.2 changes to rendering, to make file sizes predictable again

{newsworthycharts-1.71.3 → newsworthycharts-1.71.5}/newsworthycharts/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.71.3"
+__version__ = "1.71.5"
 
 from .chart import Chart
 from .choroplethmap import ChoroplethMap

newsworthycharts-1.71.5/newsworthycharts/rankchart.py

@@ -0,0 +1,232 @@
+"""
+A chart showing ranking over time (like ”most popular baby names”)
+"""
+from .serialchart import SerialChart
+from .lib.utils import to_date
+import numpy as np
+
+
+class BumpChart(SerialChart):
+    """Plot a rank chart
+
+        Data should be a list of iterables of (rank, date string) tuples, eg:
+    `[ [("2010-01-01", 2), ("2011-01-01", 3)] ]`, combined with a list of
+    labels in the same order
+    """
+
+    def __init__(self, *args, **kwargs):
+        label_placement = kwargs.get("label_placement", None)
+        if label_placement not in ["legend", "outside"]:
+            self.label_placement = "none"
+
+        super(BumpChart, self).__init__(*args, **kwargs)
+
+        if self.line_width is None:
+            self.line_width = 0.9
+        if self.line_marker_size is None:
+            self.line_marker_size = 6
+        if not label_placement:
+            self.label_placement = 'right'
+        self.type = "line"
+        self.decimals = 0
+        self.revert_value_axis = True
+        self.ymin = 1
+        self.allow_broken_y_axis = False
+        self.grid = False
+        self.accentuate_baseline = False
+
+        self.line_marker = "o-"
+
+    def _get_line_colors(self, i, *args):
+        if not self.data:
+            # Don't waste time
+            return None
+        if self.highlight and self.highlight in self.labels and i == self.labels.index(self.highlight):
+            return self._nwc_style["strong_color"]
+        elif self.colors and i < len(self.colors):
+            return self.colors[i]
+        # alternate between dark gray and light gray
+        if i % 2 == 0:
+            return "darkgray"
+        else:
+            return "lightgray"
+
+    """
+    def _get_marker_fill(self, i):
+        pass
+    """
+
+    def _after_add_data(self):
+        # Print out every rank
+        if self.data.max_val < 30:
+            _range = list(range(1, int(self.data.max_val) + 1))
+            self.ax.yaxis.set_ticks(_range, _range)
+
+        # Recolor markers with more than one line passing through
+        # (MPL does not allow access to individual markers, so we'll overwrite them)
+        for date in self.data.x_points:
+            value_colors = {}
+            for i, serie in enumerate(self.data):
+                values = np.array(self.serie_values[i], dtype=np.float64)
+                dates = [x[0] for x in serie]
+                color = self._get_line_colors(i)
+                if date not in dates:
+                    continue
+                idx = dates.index(date)
+                if np.isnan(values[idx]):
+                    continue
+                val = int(values[idx])
+                if val not in value_colors:
+                    value_colors[val] = []
+                value_colors[val].append(color)
+            for val, colors in value_colors.items():
+                if len(colors) < 2:
+                    continue
+                elif len(colors) == 2:
+                    self.ax.plot(
+                        to_date(date),
+                        val,
+                        self.line_marker,
+                        markersize=self.line_marker_size,
+                        color="None",
+                        fillstyle="left",
+                        markeredgewidth=0,
+                        markerfacecolor=colors[0],
+                        markerfacecoloralt=colors[1],
+                        zorder=100,
+                    )
+                else:
+                    self.ax.plot(
+                        to_date(date),
+                        val,
+                        self.line_marker,
+                        markersize=self.line_marker_size,
+                        color=self._nwc_style["neutral_color"],
+                        markeredgewidth=0,
+                        zorder=100,
+                    )
+        # Add labels
+        slots_occupied_right = {
+            to_date(k): [] for k in self.data.x_points
+        }
+        slots_occupied_left = {
+            to_date(k): [] for k in self.data.x_points
+        }
+        # distance between rank ticks
+        # y1 = self.ax.transData.transform((0, 1))
+        # y2 = self.ax.transData.transform((0, 2))
+        # dist = abs(y1[1] - y2[1])
+        for i, serie in enumerate(self.data):
+            values = np.array(self.serie_values[i], dtype=np.float64)
+            dates = [to_date(x[0]) for x in serie]
+            color = self._get_line_colors(i)
+
+            endpoints = [
+                (d, values[idx])
+                for (idx, d) in enumerate(dates) if idx == len(dates) - 1 or np.isnan(values[idx + 1])
+            ]
+
+            startpoints = []
+            if self.label_placement == "both":
+                startpoints = [
+                    (d, values[idx])
+                    for (idx, d) in enumerate(dates)
+                    if (idx == 0 or np.isnan(values[idx - 1])  # only if 2 consecutive values come after
+                        and (idx < len(dates) - 2)
+                        and not np.isnan(values[idx + 1])
+                        and not np.isnan(values[idx + 2]))
+                ]
+            elif self.label_placement == "left":
+                startpoints = [
+                    (d, values[idx])
+                    for (idx, d) in enumerate(dates)
+                    if idx == 0 or np.isnan(values[idx - 1])
+                ]
+
+            if self.label_placement in ["left", "both"]:
+                # We need to move y spine to the left to make room for labels
+                # To save time we'll only measure the with of the longest text string
+                # There will be edge cases where shorter strings taker up more space
+                longest_sp_label = max([len(str(x[1])) for x in startpoints])
+                dummy_text = self.ax.text(0, 0, longest_sp_label, fontsize=self._nwc_style["annotation.fontsize"])
+                _bbox = dummy_text.get_window_extent(renderer=self._fig.canvas.get_renderer())
+                self.ax.spines['left'].set_position(('outward', _bbox.width * 1.15 + 15))  # Add a bit extra space
+                dummy_text.remove()
+
+            if self.label_placement in ["right", "both"]:
+                for ep in endpoints:
+                    position = ep[1]
+                    while position in slots_occupied_right[ep[0]]:
+                        position += 1
+                    # pos_diff = position - ep[1]
+                    slots_occupied_right[ep[0]].append(position)
+                    self._annotate_point(
+                        self.labels[i],
+                        # (ep[0], ep[1]),
+                        (ep[0], position),
+                        "right",
+                        offset=15,
+                        color=color,
+                        va="center",
+                        # xytext=(15, -abs(y1[1] - y2[1]) * pos_diff),
+                        # arrowprops=dict(arrowstyle="->", color=color) if pos_diff > 1 else None,
+                        zorder=99,
+                    )
+            if self.label_placement in ["left", "both"]:
+                for sp in startpoints:
+                    position = sp[1]
+                    while position in slots_occupied_left[sp[0]]:
+                        position += 1
+                    # pos_diff = position - sp[1]
+                    slots_occupied_left[sp[0]].append(position)
+                    self._annotate_point(
+                        self.labels[i],
+                        (sp[0], position),
+                        "left",
+                        offset=15,
+                        color=color,
+                        va="center",
+                        zorder=99,
+                    )
+        # Add space for labels on the left
+
+        """
+        labels = []
+        for i, serie in enumerate(self.data):
+            values = np.array(self.serie_values[i], dtype=np.float64)
+            dates = [to_date(x[0]) for x in serie]
+            color = self._get_line_colors(i)
+
+            endpoints = [
+                (d, values[idx])
+                for (idx, d) in enumerate(dates) if idx == len(dates) - 1 or np.isnan(values[idx + 1])
+            ]
+            for ep in endpoints:
+                lbl = self._annotate_point(
+                    self.labels[i],
+                    (ep[0], ep[1]),
+                    "right",
+                    offset=15,
+                    color=color,
+                    va="center",
+                    # arrowprops=dict(arrowstyle="->", color=color),
+                )
+                loops = 0
+                overlap = True if len(labels) > 0 else False
+                while overlap:
+                    for i, bb in enumerate(labels):
+                        if i == len(labels) - 1:
+                            overlap = False
+                            break
+                        bbox1 = lbl.get_window_extent()
+                        bbox2 = labels[i].get_window_extent()
+                        print(bbox1, bbox2)
+                        if bbox1.y1 < bbox2.y0 + 10 and bbox1.x1 > bbox2.x0 + 5:  # allow for some overlap
+                            xy1 = lbl.xyann
+                            lbl.xyann = (xy1[0], xy1[1] + 1)
+                            break
+                        loops += 1
+                    if loops > 500:
+                        break
+                labels.append(lbl)
+        """

{newsworthycharts-1.71.3 → newsworthycharts-1.71.5}/newsworthycharts/serialchart.py

@@ -52,7 +52,9 @@ class SerialChart(Chart):
         self.colors = None
 
         # Optional: where to place series label
-        self.label_placement = "legend"  # legend|inline|outside|line
+        # Could be set already by subclass
+        if not hasattr(self, "label_placement"):
+            self.label_placement = "legend"  # legend|inline|outside|line
 
         # Optional: annotate each point with a value label
         self.value_labels = False
@@ -254,6 +256,9 @@ class SerialChart(Chart):
                     color = self._nwc_style["strong_color"]
                 else:
                     color = self._nwc_style["neutral_color"]
+                marker_fill = None
+                if hasattr(self, "_get_marker_fill"):
+                    marker_fill = self._get_marker_fill(i)
 
                 line, = self.ax.plot(
                     dates,
@@ -261,6 +266,8 @@ class SerialChart(Chart):
                     self.line_marker,
                     markersize=self.line_marker_size,
                     color=color,
+                    markerfacecolor=marker_fill,
+                    markeredgewidth=0,
                     zorder=zo,
                     lw=lw,
                 )

{newsworthycharts-1.71.3 → newsworthycharts-1.71.5/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.3
+Version: 1.71.5
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.3.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.71.5.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -179,6 +179,7 @@ _ Inherits from SerialChart _
 
 _ Inherits from SerialChart _
 
+- label_placement = "right"  # [left|right|both|outside|legend]
 - highlight = None  # The label value to of a line to highlight
 - line_marker = "o-"  # Matplotlib line marker type. 
 - line_marker_size = 5  # Matplotlib line marker size
@@ -270,6 +271,16 @@ Roadmap
 Changelog
 ---------
 
+- 1.71.5
+
+  - zorder fixes in BumpChart
+  - Add `label_placement` = [left|right|both|outside|legend] to BumpChart. Default is 'right'
+  - Use alternating shades of gray in BumpChart
+
+- 1.71.4
+
+  - BumpChart: Use dual colors in line markers when rank is shared
+
 - 1.71.3
 
   - Revert 1.71.2 changes to rendering, to make file sizes predictable again

newsworthycharts-1.71.3/newsworthycharts/rankchart.py

@@ -1,115 +0,0 @@
-"""
-A chart showing ranking over time (like ”most popular baby names”)
-"""
-from .serialchart import SerialChart
-from .lib.utils import to_date
-import numpy as np
-
-
-class BumpChart(SerialChart):
-    """Plot a rank chart
-
-        Data should be a list of iterables of (rank, date string) tuples, eg:
-    `[ [("2010-01-01", 2), ("2011-01-01", 3)] ]`, combined with a list of
-    labels in the same order
-    """
-
-    def __init__(self, *args, **kwargs):
-        super(BumpChart, self).__init__(*args, **kwargs)
-
-        if self.line_width is None:
-            self.line_width = 0.9
-        self.label_placement = 'none'
-        self.type = "line"
-        self.decimals = 0
-        self.revert_value_axis = True
-        self.ymin = 1
-        self.allow_broken_y_axis = False
-        self.grid = False
-        self.accentuate_baseline = False
-
-        self.line_marker = "o-"
-        self.line_marker_size = 5
-
-    def _get_line_colors(self, i, *args):
-        if not self.data:
-            # Don't waste time
-            return None
-        if self.highlight and self.highlight in self.labels and i == self.labels.index(self.highlight):
-            return self._nwc_style["strong_color"]
-        elif self.colors and i < len(self.colors):
-            return self.colors[i]
-        return self._nwc_style["neutral_color"]
-
-    def _after_add_data(self):
-        # Print out every rank
-        if self.data.max_val < 30:
-            _range = list(range(1, int(self.data.max_val) + 1))
-            self.ax.yaxis.set_ticks(_range, _range)
-        # Add labels
-        slots_occupied = {
-            to_date(k): [] for k in self.data.x_points
-        }
-        for i, serie in enumerate(self.data):
-            values = np.array(self.serie_values[i], dtype=np.float64)
-            dates = [to_date(x[0]) for x in serie]
-            color = self._get_line_colors(i)
-
-            endpoints = [
-                (d, values[idx])
-                for (idx, d) in enumerate(dates) if idx == len(dates) - 1 or np.isnan(values[idx + 1])
-            ]
-            for ep in endpoints:
-                position = ep[1]
-                while position in slots_occupied[ep[0]]:
-                    position += 1
-                slots_occupied[ep[0]].append(position)
-                self._annotate_point(
-                    self.labels[i],
-                    (ep[0], position),
-                    "right",
-                    offset=15,
-                    color=color,
-                    va="center",
-                    # arrowprops=dict(arrowstyle="->", color=color),
-                )
-        """
-        labels = []
-        for i, serie in enumerate(self.data):
-            values = np.array(self.serie_values[i], dtype=np.float64)
-            dates = [to_date(x[0]) for x in serie]
-            color = self._get_line_colors(i)
-
-            endpoints = [
-                (d, values[idx])
-                for (idx, d) in enumerate(dates) if idx == len(dates) - 1 or np.isnan(values[idx + 1])
-            ]
-            for ep in endpoints:
-                lbl = self._annotate_point(
-                    self.labels[i],
-                    (ep[0], ep[1]),
-                    "right",
-                    offset=15,
-                    color=color,
-                    va="center",
-                    # arrowprops=dict(arrowstyle="->", color=color),
-                )
-                loops = 0
-                overlap = True if len(labels) > 0 else False
-                while overlap:
-                    for i, bb in enumerate(labels):
-                        if i == len(labels) - 1:
-                            overlap = False
-                            break
-                        bbox1 = lbl.get_window_extent()
-                        bbox2 = labels[i].get_window_extent()
-                        print(bbox1, bbox2)
-                        if bbox1.y1 < bbox2.y0 + 10 and bbox1.x1 > bbox2.x0 + 5:  # allow for some overlap
-                            xy1 = lbl.xyann
-                            lbl.xyann = (xy1[0], xy1[1] + 1)
-                            break
-                        loops += 1
-                    if loops > 500:
-                        break
-                labels.append(lbl)
-        """