Merge pull request #1037 from wright-group/artists_parse_limits_null

Update _base.py
wright-group · Nov 3, 2021 · f1429ac · f1429ac
2 parents 1660485 + 15024c1
commit f1429ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Fixed
+- `artists._parse_limits` now recognizes channel `null` for signed data limits.
+
 ## [3.4.2]
 
 ### Added

diff --git a/WrightTools/artists/_base.py b/WrightTools/artists/_base.py
@@ -94,14 +94,15 @@ def _parse_limits(self, zi=None, data=None, channel_index=None, dynamic_range=Fa
                 vmax = np.nanmax(zi)
         elif data is not None:
             signed = data.channels[channel_index].signed
+            null = data.channels[channel_index].null
             if signed and dynamic_range:
-                vmin = -data.channels[channel_index].minor_extent
-                vmax = +data.channels[channel_index].minor_extent
+                vmin = -data.channels[channel_index].minor_extent + null
+                vmax = +data.channels[channel_index].minor_extent + null
             elif signed and not dynamic_range:
-                vmin = -data.channels[channel_index].major_extent
-                vmax = +data.channels[channel_index].major_extent
+                vmin = -data.channels[channel_index].major_extent + null
+                vmax = +data.channels[channel_index].major_extent + null
             else:
-                vmin = data.channels[channel_index].null
+                vmin = null
                 vmax = data.channels[channel_index].max()
         # don't overwrite
         if "vmin" not in kwargs.keys():