newsworthycharts 1.61.0__py3-none-any.whl → 1.61.2__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -667,7 +667,7 @@ class Chart(object):
                 'Creator': f"NWCharts {__version__}",
             }
             """
-        self._fig.savefig(buf, **args)
+        self._fig.savefig(buf, **args)  # , bbox_inches="tight")
         buf.seek(0)
         self._storage.save(key, buf, img_format, storage_options)
 
@@ -716,7 +716,7 @@ class Chart(object):
                     'Creator': f"NWCharts {__version__}",
                 }
                 """
-            self._fig.savefig(buf, **args)
+            self._fig.savefig(buf, **args)  # bbox_inches="tight")
             buf.seek(0)
             self._storage.save(key, buf, file_format, storage_options)
 

newsworthycharts/serialchart.py

@@ -46,7 +46,7 @@ class SerialChart(Chart):
         self.colors = None
 
         # Optional: where to place series label
-        self.label_placement = "legend"  # legend|inline|outside
+        self.label_placement = "legend"  # legend|inline|outside|line
 
         # Optional: annotate each point with a value label
         self.value_labels = False
@@ -194,6 +194,8 @@ class SerialChart(Chart):
         line_label_elems = []
         value_label_elems = []
 
+        bar_elems = []
+
         for i, serie in enumerate(series):
 
             values = np.array(serie_values[i], dtype=float)
@@ -352,13 +354,13 @@ class SerialChart(Chart):
                     width=bar_widths,
                     zorder=zo,
                 )
-                if len(dates) < 100:
-                    # FIXME: This complements the bar_width hack above
-                    # For some charts edges give better results (n_bars ~50?)
-                    # This should be better tested, and implemented in a
-                    # more robust way
-                    bar_kwargs["edgecolor"] = "white"
-                    bar_kwargs["linewidth"] = 1
+                # if len(dates) < 100:
+                #    # FIXME: This complements the bar_width hack above
+                #    # For some charts edges give better results (n_bars ~50?)
+                #    # This should be better tested, and implemented in a
+                #    # more robust way
+                #    bar_kwargs["edgecolor"] = "white"
+                #    bar_kwargs["linewidth"] = 0  # 1
 
                 if is_stacked and i > 0:
                     if self.baseline != 0:
@@ -378,6 +380,7 @@ class SerialChart(Chart):
                     bar_kwargs["bottom"] = self.baseline
 
                 bars = self.ax.bar(dates, values, **bar_kwargs)
+                bar_elems.append(bars)
 
                 if len(self.labels) > i:
                     bars.set_label(self.labels[i])
@@ -440,6 +443,16 @@ class SerialChart(Chart):
                             continue
                 self._annotate_point(value_label, xy, direction=dir)
 
+        # Add some padding around bars, but only left/right to avoid lines in stacked bars
+        if len(dates) < 100:
+            for bars in bar_elems:
+                # for container in self.ax.containers:
+                for bar in bars:
+                    x, y = bar.get_xy()
+                    w, h = bar.get_width(), bar.get_height()
+                    self.ax.plot([x + w, x + w], [y, y + h], color='white', lw=1, zorder=zo + 1)
+                    self.ax.plot([x, x], [y, y + h], color='white', lw=1, zorder=zo + 1)
+
         # Add background highlights
         for (x0, x1) in self.highlighted_x_ranges:
             x0 = to_date(x0)
@@ -549,7 +562,12 @@ class SerialChart(Chart):
                 _ = self.ax.legend(loc="best")
                 _.set(zorder=20)
             elif self.label_placement == "outside":
-                self.ax.legend(bbox_to_anchor=(0, 1, 1, 0), loc="lower right")
+                # mpl 3.7 has loc=outside, but it will lead to overlaps with titles
+                # also, has to be set on the figure, causing image size to change
+                _ = self.ax.legend(bbox_to_anchor=(1.04, 1), loc="upper left")
+                # self._fig.subplots_adjust(right=0.8)
+                # self._fig.tight_layout()
+                _.set(zorder=20)
             elif self.label_placement == "inline":
                 labelLines(self.ax.get_lines(), align=False, zorder=13, outline_width=4, fontweight="bold")
 

{newsworthycharts-1.61.0.dist-info → newsworthycharts-1.61.2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.61.0
+Version: 1.61.2
 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.61.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.61.2.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -150,6 +150,7 @@ These settings are available for all chart types:
 - decimals = None  # None means automatically chose the best number
 - logo = None  # Path to image that will be embedded in the caption area. Can also be set though a style property
 - color_fn = None  # Custom coloring function
+- legend_title = None  # Title for the legend
 
 **SerialChart**
 
@@ -167,7 +168,7 @@ These settings are available for all chart types:
 - value_labels = False  # Print out values at points on line?
 - highlighted_x_ranges = []  # List of tuples with start and end of highlighted areas
 - x_range_labels = []  # List of labels for highlighted areas
-- label_placement = "legend"  # legend|inline|outside
+- label_placement = "legend"  # legend|inline|outside|line
 - color_labels = None  # A dictionary of label/color, to override style colors
 
 **SeasonalChart**
@@ -252,6 +253,14 @@ Roadmap
 Changelog
 ---------
 
+- 1.61.2
+
+  - Remove horizontal line between bars in stacked bar charts
+
+- 1.61.1
+
+  - Improved handling of label_placement = "outside" in SerialChart
+
 - 1.61.0
 
   - Added non-binned color ramp support to ChoroplethMap, with `use_bins=False`

{newsworthycharts-1.61.0.dist-info → newsworthycharts-1.61.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-newsworthycharts/__init__.py,sha256=jnjdyPdjfQOT6rFgjHDof_FP6br3JVLWzdGN66o7x3c,1160
+newsworthycharts/__init__.py,sha256=YXG2imrthc_eFdVmTFvxb8cSu1CP7I0voNa6Ify1tPU,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=LwOZ3VbNy9vzvoK0s77AkbfMt4CXVDSAhnsnBInUIrE,14764
-newsworthycharts/chart.py,sha256=VXEJe_g_KahyiUXqXnM3vDS7SQoW1Ppktcj13-A2_oc,30631
+newsworthycharts/chart.py,sha256=bCUkNKjFfuGRN6_VRQ-yCHla5LIMZ9H9a16upWbeWmY,30681
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
 newsworthycharts/scatterplot.py,sha256=6iaMoiZx__Gc-2Hcdw-8Ga5dSonrFo3oexKNmSFuir4,4959
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=QjXfPepHVUpxeQvXP9S8BnZwUPY2mSc-5RvGIjZvZhU,26386
+newsworthycharts/serialchart.py,sha256=Nk1ctfzuySA7b0O6BpgRCWkpwNrJrRx5FcSS1xA10A0,27295
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/custom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,8 +28,8 @@ newsworthycharts/rc/newsworthy,sha256=X0btLNrmk2DRrfOsKj_WCSIgeD6btacEN2tRF_B4m8
 newsworthycharts/translations/datawrapper_regions.csv,sha256=fzZcQRX6RFMlNNP8mpgfYNdR3Y0QAlQxDXk8FXTaWWI,9214
 newsworthycharts/translations/regions.py,sha256=Nv1McQjggD4S3JRu82rDMTG3pqUVR13E5-FBpSYbm98,239
 newsworthycharts/translations/se_municipalities.csv,sha256=br_mm-IvzQtj_W55_ATREhJ97jWnCweBFlDAVY2EBxA,7098
-newsworthycharts-1.61.0.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.61.0.dist-info/METADATA,sha256=gyom0iFYdCZuYaLwa24Arkma11A1Qn5H0DdrZhVJkz0,28560
-newsworthycharts-1.61.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.61.0.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.61.0.dist-info/RECORD,,
+newsworthycharts-1.61.2.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.61.2.dist-info/METADATA,sha256=Us2_7v3jdscS_9Iz4h2rhwj-t22fp5QS73DP74U4heU,28763
+newsworthycharts-1.61.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.61.2.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.61.2.dist-info/RECORD,,