newsworthycharts 1.65.4__tar.gz → 1.67.0__tar.gz

{newsworthycharts-1.65.4/newsworthycharts.egg-info → newsworthycharts-1.67.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.65.4
+Version: 1.67.0
 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.65.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.67.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -259,6 +259,18 @@ Roadmap
 Changelog
 ---------
 
+- 1.67.0
+
+  - Fixed label margins in pie charts
+  - Trim all titles and subtitles of leading and trailing whitespace
+  - Improved piechart annotation
+  - Support `label_placement` (legend|outside|inline) in categorical charts ('legend' is still buggy in pie charts)
+
+- 1.66.0
+
+  - Support multiple data series in pie charts (displayed as small multiples)
+
+
 - 1.65.4
 
   - Revert some of the title margin changes

{newsworthycharts-1.65.4 → newsworthycharts-1.67.0}/README.rst

@@ -232,6 +232,18 @@ Roadmap
 Changelog
 ---------
 
+- 1.67.0
+
+  - Fixed label margins in pie charts
+  - Trim all titles and subtitles of leading and trailing whitespace
+  - Improved piechart annotation
+  - Support `label_placement` (legend|outside|inline) in categorical charts ('legend' is still buggy in pie charts)
+
+- 1.66.0
+
+  - Support multiple data series in pie charts (displayed as small multiples)
+
+
 - 1.65.4
 
   - Revert some of the title margin changes

{newsworthycharts-1.65.4 → newsworthycharts-1.67.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.65.4 → newsworthycharts-1.67.0}/newsworthycharts/categoricalchart.py

@@ -1,6 +1,6 @@
 from .chart import Chart
 from .lib.utils import to_float
-
+from adjustText import adjust_text
 import numpy as np
 
 
@@ -16,6 +16,7 @@ class CategoricalChart(Chart):
         self.stacked = False
         self.legend = True
         self.type = "bars"
+        self.label_placement = None  # legend|inline|outside  # defaults will vary
 
         # Optional: specify a list of colors (for multiple datasets)
         self.colors = None
@@ -25,32 +26,49 @@ class CategoricalChart(Chart):
         return self.stacked
 
     def _add_pie_data(self):
-        if len(self.data) > 1:
-            raise ValueError("Pie chart takes one data series only.")
-        self.legend = False
         self.show_ticks = False
 
-        data = self.data[0]
-        values = [to_float(x[1]) for x in data]
-        labels = [x[0] for x in data]
-
-        if self.colors is not None:
-            colors = self.colors
-        else:
-            colors = [self._nwc_style["qualitative_colors"][i] for i in range(len(values))]
-
-        explode = [0.1 if x == self.highlight else 0 for x in labels]
+        if len(self.data) > 1:
+            subaxes = self._fig.subplots(1, len(self.data))
+        patches = []
+        for idx, serie in enumerate(self.data):
+            if len(self.data) == 1:
+                subax = self.ax
+            else:
+                subax = subaxes[idx]
 
-        self.ax.pie(
-            values,
-            labels=labels,
-            startangle=90,
-            colors=colors,
-            explode=explode
-        )
-        self.ax.axis('equal')
+            values = [to_float(x[1]) for x in serie]
+            labels = [x[0] for x in serie]
 
-        self._setup_legend()
+            if self.colors is not None:
+                colors = self.colors
+            else:
+                colors = [self._nwc_style["qualitative_colors"][i] for i in range(len(values))]
+
+            explode = [0.1 if x == self.highlight else 0 for x in labels]
+            legend_placement = self.label_placement or "inline"
+            _pie = subax.pie(
+                values,
+                labels=labels if legend_placement == "inline" else None,
+                startangle=90,
+                colors=colors,
+                explode=explode
+            )
+            if idx == 0:
+                patches += _pie[0]
+            subax.axis('equal')
+            # `labels` in pie charts are used to label the series, not the values
+            if self.labels:
+                subax.set_title(self.labels[idx], loc='center', y=0)
+        if legend_placement == "inline":
+            self.legend = False
+        elif legend_placement == "legend":
+            self.ax.legend(patches, labels, loc='best', frameon=True, fancybox=True).set_zorder(100)
+        elif legend_placement == "outside":
+            _ = self.ax.legend(patches, labels, bbox_to_anchor=(1.04, 1), loc="upper left")
+            _.set(zorder=20)
+
+        self.ax.axis('off')
 
     def _add_data(self):
         if self.type == "pie":
@@ -84,7 +102,7 @@ class CategoricalChart(Chart):
             serie_values.append(_values)
 
         cum_values = np.cumsum(serie_values, axis=0).tolist()
-
+        self._bars = []
         for i, data in enumerate(self.data):
 
             # Replace None values with 0's to be able to plot bars
@@ -160,6 +178,7 @@ class CategoricalChart(Chart):
                 bar_pos = [x + i * bar_width
                            for x in np.arange(len(values))]
 
+            _bar = None
             if self.bar_orientation == "horizontal":
                 kwargs = dict(align='center', height=bar_width,
                               color=colors, zorder=2)
@@ -167,7 +186,7 @@ class CategoricalChart(Chart):
                     # To make stacked bars we need to set bottom value
                     kwargs["left"] = cum_values[i - 1]
 
-                self.ax.barh(bar_pos, values, **kwargs)
+                _bar = self.ax.barh(bar_pos, values, **kwargs)
 
             elif self.bar_orientation == "vertical":
                 kwargs = dict(
@@ -178,7 +197,8 @@ class CategoricalChart(Chart):
                 if self.stacked and i > 0:
                     # To make stacked bars we need to set bottom value
                     kwargs["bottom"] = cum_values[i - 1]
-                self.ax.bar(bar_pos, values, **kwargs)
+                _bar = self.ax.bar(bar_pos, values, **kwargs)
+            self._bars.append(_bar)
 
         if self.bar_orientation == "horizontal":
             margin = 0.02  # above and below first/last bar on horizontal
@@ -200,9 +220,6 @@ class CategoricalChart(Chart):
             self.ax.set_xticklabels(categories)
             self.ax.xaxis.set_ticks_position('none')
 
-        if len(self.data) > 1:
-            self.ax.legend(self.labels, loc='best')
-
         self._setup_legend()
 
     def _setup_legend(self):
@@ -211,6 +228,31 @@ class CategoricalChart(Chart):
             legend = self.ax.get_legend()
             if legend:
                 legend.remove()
+        else:
+            if len(self.data) == 0 and self.type != "pie":
+                return
+            placement = self.label_placement or "legend"
+            if placement == "legend":
+                self.ax.legend(self.labels, loc='best')
+            elif placement == "outside":
+                _ = self.ax.legend(self.labels, bbox_to_anchor=(1.04, 1), loc="upper left")
+                _.set(zorder=20)
+            elif placement == "inline":
+                texts = []
+                for idx, _bar in enumerate(self._bars):
+                    _texts = self.ax.bar_label(
+                        _bar,
+                        labels=[self.labels[idx]] * self.data.num_categories,
+                        label_type="center",
+                        backgroundcolor="#f0f0f099",
+                    )
+                    if idx > 0:
+                        texts += [*_texts]
+                adjust_text(
+                    texts,
+                    ax=self.ax,
+                    autoalign="x" if self.bar_orientation == "horizontal" else "y",
+                )
 
 
 class CategoricalChartWithReference(CategoricalChart):
@@ -236,6 +278,7 @@ class CategoricalChartWithReference(CategoricalChart):
         self.value_axis.grid(True)
 
         bar_width = 0.8 / len(self.data)
+        self._bars = []
         for i, data in enumerate(self.data):
 
             # Replace None values with 0's to be able to plot bars
@@ -263,18 +306,30 @@ class CategoricalChartWithReference(CategoricalChart):
 
             zorder = len(self.data) - i
             if self.bar_orientation == "horizontal":
-                self.ax.barh(bar_pos, values, height=bar_width, align='center',
-                             color=color, zorder=zorder)
+                bar = self.ax.barh(
+                    bar_pos,
+                    values,
+                    height=bar_width,
+                    align='center',
+                    color=color,
+                    zorder=zorder,
+                )
                 self.ax.set_yticks(tick_pos)
                 self.ax.set_yticklabels(categories)
                 # self.ax.invert_yaxis()
 
             elif self.bar_orientation == "vertical":
-                self.ax.bar(bar_pos, values, width=bar_width, color=color,
-                            zorder=zorder)
+                bar = self.ax.bar(
+                    bar_pos,
+                    values,
+                    width=bar_width,
+                    color=color,
+                    zorder=zorder,
+                )
                 self.ax.set_xticks(tick_pos)
                 self.ax.set_xticklabels(categories)
                 self.ax.xaxis.set_ticks_position('none')
+            self._bars.append(bar)
 
         # Make sure labels are not cropped
         yaxis_bbox = self.ax.yaxis.get_tightbbox(self._fig.canvas.get_renderer())
@@ -282,9 +337,6 @@ class CategoricalChartWithReference(CategoricalChart):
         margin -= yaxis_bbox.min[0] / float(self._w)
         self._fig.subplots_adjust(left=margin)
 
-        if self.labels:
-            self.ax.legend(self.labels, loc='best')
-
         self._setup_legend()
 
 
@@ -339,7 +391,7 @@ class ProgressChart(CategoricalChart):
 
             # rect.set_linewidth(1)
             # rect.set_edgecolor(color_progress)
-        
+
         # LABELING: Target
         if self.target_label:
             offset = 25

{newsworthycharts-1.65.4 → newsworthycharts-1.67.0}/newsworthycharts/chart.py

@@ -285,7 +285,7 @@ class Chart(object):
     def _add_title(self, title_text):
         """Add a title."""
         text = self._fig.suptitle(
-            title_text, wrap=True,
+            title_text.strip(), wrap=True,
             x=0,
             y=0.985,  # default: 0.98
             horizontalalignment="left",
@@ -300,7 +300,7 @@ class Chart(object):
         text = self._fig.text(
             0,
             y_pos,
-            subtitle_text,
+            subtitle_text.strip(),
             wrap=True,
             verticalalignment="top",
             linespacing=1.4,

{newsworthycharts-1.65.4 → newsworthycharts-1.67.0}/newsworthycharts/lib/datalist.py

@@ -196,6 +196,11 @@ class DataSet(MutableSequence):
         values = array(self.values, dtype=float)
         return np.nansum(values, axis=0).tolist()
 
+    @property
+    def num_categories(self):
+        categories = set([x[0] for s in self.list for x in s])
+        return len(categories)
+
     def __len__(self):
         return len(self.list)
 

{newsworthycharts-1.65.4 → newsworthycharts-1.67.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.65.4
+Version: 1.67.0
 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.65.4.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.67.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -259,6 +259,18 @@ Roadmap
 Changelog
 ---------
 
+- 1.67.0
+
+  - Fixed label margins in pie charts
+  - Trim all titles and subtitles of leading and trailing whitespace
+  - Improved piechart annotation
+  - Support `label_placement` (legend|outside|inline) in categorical charts ('legend' is still buggy in pie charts)
+
+- 1.66.0
+
+  - Support multiple data series in pie charts (displayed as small multiples)
+
+
 - 1.65.4
 
   - Revert some of the title margin changes