newsworthycharts 1.71.3__tar.gz → 1.71.4__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.3
+Version: 1.71.4
 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.4.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -270,6 +270,10 @@ Roadmap
 Changelog
 ---------
 
+- 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.4}/README.rst

@@ -244,6 +244,10 @@ Roadmap
 Changelog
 ---------
 
+- 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.4}/newsworthycharts/__init__.py

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

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

@@ -19,6 +19,8 @@ class BumpChart(SerialChart):
 
         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'
         self.type = "line"
         self.decimals = 0
@@ -29,7 +31,6 @@ class BumpChart(SerialChart):
         self.accentuate_baseline = False
 
         self.line_marker = "o-"
-        self.line_marker_size = 5
 
     def _get_line_colors(self, i, *args):
         if not self.data:
@@ -41,15 +42,69 @@ class BumpChart(SerialChart):
             return self.colors[i]
         return self._nwc_style["neutral_color"]
 
+    """
+    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 = {
             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]
@@ -63,15 +118,18 @@ class BumpChart(SerialChart):
                 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",
-                    # arrowprops=dict(arrowstyle="->", color=color),
+                    # xytext=(15, -abs(y1[1] - y2[1]) * pos_diff),
+                    # arrowprops=dict(arrowstyle="->", color=color) if pos_diff > 1 else None,
                 )
         """
         labels = []

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

@@ -254,6 +254,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 +264,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.4/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.71.3
+Version: 1.71.4
 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.4.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -270,6 +270,10 @@ Roadmap
 Changelog
 ---------
 
+- 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