newsworthycharts 1.58.0__tar.gz → 1.59.0__tar.gz

{newsworthycharts-1.58.0/newsworthycharts.egg-info → newsworthycharts-1.59.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.58.0
+Version: 1.59.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.58.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.59.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -132,6 +132,7 @@ These settings are available for all chart types:
 - ylabel = None
 - caption = None
 - highlight = A position (typically a date, category label or index) to highlight. The semantics may differ somewhat between chart types.
+- highlight_annotation = True  # Print out values at highlighted point?
 - 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
@@ -229,6 +230,10 @@ Roadmap
 Changelog
 ---------
 
+- 1.59.0
+
+  - Added `.highlight_annotation` to enable turning off the textual annotation on the highlighted point
+
 - 1.58.0
 
   - Matplotlib==3.9

{newsworthycharts-1.58.0 → newsworthycharts-1.59.0}/README.rst

@@ -119,6 +119,7 @@ These settings are available for all chart types:
 - ylabel = None
 - caption = None
 - highlight = A position (typically a date, category label or index) to highlight. The semantics may differ somewhat between chart types.
+- highlight_annotation = True  # Print out values at highlighted point?
 - 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
@@ -216,6 +217,10 @@ Roadmap
 Changelog
 ---------
 
+- 1.59.0
+
+  - Added `.highlight_annotation` to enable turning off the textual annotation on the highlighted point
+
 - 1.58.0
 
   - Matplotlib==3.9

{newsworthycharts-1.58.0 → newsworthycharts-1.59.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.58.0 → newsworthycharts-1.59.0}/newsworthycharts/chart.py

@@ -61,6 +61,7 @@ class Chart(object):
         self.ylabel = None
         self.caption = None
         self.highlight = None
+        self.highlight_annotation = True
         self.decimals = None
         self.yline = None
         self.type = None
@@ -259,10 +260,15 @@ class Chart(object):
             hextent = (0, self._w)
         self._set_size(hextent[1] - hextent[0])
         x1 = hextent[0] / self._w
-        text = self._fig.text(x1, 0.01, caption,
-                              in_layout=True,
-                              color=self._nwc_style["neutral_color"], wrap=True,
-                              fontsize=self._nwc_style["caption.fontsize"])
+        text = self._fig.text(
+            x1,
+            0.01,
+            caption,
+            in_layout=True,
+            color=self._nwc_style["neutral_color"],
+            wrap=True,
+            fontsize=self._nwc_style["caption.fontsize"],
+        )
         self._fig.canvas.draw()
         wrapped_text = text._get_wrapped_text()
         text.set_text(wrapped_text)
@@ -272,11 +278,14 @@ class Chart(object):
 
     def _add_title(self, title_text):
         """Add a title."""
-        # y=1 wraps title heavily, hence .9999
-        text = self._fig.suptitle(title_text, wrap=True, x=0, y=0.985,
-                                  horizontalalignment="left",
-                                  multialignment="left",
-                                  fontproperties=self._title_font)
+        text = self._fig.suptitle(
+            title_text, wrap=True,
+            x=0,
+            y=0.985,  # default: 0.98
+            horizontalalignment="left",
+            multialignment="left",
+            fontproperties=self._title_font,
+        )
 
         self._title_elem = text
 

{newsworthycharts-1.58.0 → newsworthycharts-1.59.0}/newsworthycharts/serialchart.py

@@ -409,35 +409,36 @@ class SerialChart(Chart):
                 self.ax.legend(handles=patches)
 
         # Annotate highlighted points/bars
-        for hv in highlight_values:
-            value_label = a_formatter(hv)
-            xy = (highlight_date, hv)
-            if self.type[i] == "bars":
-                if hv >= self.baseline:
-                    dir = "up"
-                else:
-                    dir = "down"
-            if self.type[i] == "line":
-                if len(highlight_values) > 1:
-                    # When highlighting two values on the same point,
-                    # put them in opposite direction
-                    if hv == max(highlight_values):
+        if self.highlight_annotation:
+            for hv in highlight_values:
+                value_label = a_formatter(hv)
+                xy = (highlight_date, hv)
+                if self.type[i] == "bars":
+                    if hv >= self.baseline:
                         dir = "up"
-                    elif hv == min(highlight_values):
-                        dir = "down"
                     else:
-                        dir = "left"  # To the right we have diff annotation
-                else:
-                    # Otherwise, use what works best with the line shape
-                    if highlight_date in dates:
-                        i = dates.index(highlight_date)
-                        dir = self._get_annotation_direction(i, values)
+                        dir = "down"
+                if self.type[i] == "line":
+                    if len(highlight_values) > 1:
+                        # When highlighting two values on the same point,
+                        # put them in opposite direction
+                        if hv == max(highlight_values):
+                            dir = "up"
+                        elif hv == min(highlight_values):
+                            dir = "down"
+                        else:
+                            dir = "left"  # To the right we have diff annotation
                     else:
-                        # This highlight is probably out of range for this dataset
-                        # Could happen if we have two or more lines,
-                        # with different start and end points.
-                        continue
-            self._annotate_point(value_label, xy, direction=dir)
+                        # Otherwise, use what works best with the line shape
+                        if highlight_date in dates:
+                            i = dates.index(highlight_date)
+                            dir = self._get_annotation_direction(i, values)
+                        else:
+                            # This highlight is probably out of range for this dataset
+                            # Could happen if we have two or more lines,
+                            # with different start and end points.
+                            continue
+                self._annotate_point(value_label, xy, direction=dir)
 
         # Add background highlights
         for (x0, x1) in self.highlighted_x_ranges:

{newsworthycharts-1.58.0 → newsworthycharts-1.59.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.58.0
+Version: 1.59.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.58.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.59.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -132,6 +132,7 @@ These settings are available for all chart types:
 - ylabel = None
 - caption = None
 - highlight = A position (typically a date, category label or index) to highlight. The semantics may differ somewhat between chart types.
+- highlight_annotation = True  # Print out values at highlighted point?
 - 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
@@ -229,6 +230,10 @@ Roadmap
 Changelog
 ---------
 
+- 1.59.0
+
+  - Added `.highlight_annotation` to enable turning off the textual annotation on the highlighted point
+
 - 1.58.0
 
   - Matplotlib==3.9