newsworthycharts 1.71.4__tar.gz → 1.71.5__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.4
+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.4.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,12 @@ 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

{newsworthycharts-1.71.4 → 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,12 @@ 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

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

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

{newsworthycharts-1.71.4 → newsworthycharts-1.71.5}/newsworthycharts/rankchart.py

@@ -15,13 +15,18 @@ class BumpChart(SerialChart):
     """
 
     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
-        self.label_placement = 'none'
+        if not label_placement:
+            self.label_placement = 'right'
         self.type = "line"
         self.decimals = 0
         self.revert_value_axis = True
@@ -40,7 +45,11 @@ class BumpChart(SerialChart):
             return self._nwc_style["strong_color"]
         elif self.colors and i < len(self.colors):
             return self.colors[i]
-        return self._nwc_style["neutral_color"]
+        # alternate between dark gray and light gray
+        if i % 2 == 0:
+            return "darkgray"
+        else:
+            return "lightgray"
 
     """
     def _get_marker_fill(self, i):
@@ -55,7 +64,6 @@ class BumpChart(SerialChart):
 
         # 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):
@@ -98,7 +106,10 @@ class BumpChart(SerialChart):
                         zorder=100,
                     )
         # Add labels
-        slots_occupied = {
+        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
@@ -114,23 +125,71 @@ class BumpChart(SerialChart):
                 (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
-                # pos_diff = position - ep[1]
-                slots_occupied[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,
-                )
+
+            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):

{newsworthycharts-1.71.4 → 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

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.4
+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.4.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,12 @@ 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