Skip to content

have ArrayDataSource.get_data return empty(shape=0,)), not 0.0 if _data is None #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronayres35 merged 4 commits into from
Apr 13, 2021
Merged

have ArrayDataSource.get_data return empty(shape=0,)), not 0.0 if _data is None #578

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8489507
have get_data return empty 1d array of length 0, not 0.0 if _data is …
aaronayres35 Mar 18, 2021
09fedad
remove unneeded try except in _compute_bounds
aaronayres35 Mar 18, 2021
f7c6aa4
Merge branch 'master' into ArrayDataSource-empty-arr-default
aaronayres35 Apr 13, 2021
9a731d6
remove commented out code
aaronayres35 Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions chaco/array_data_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
""" Defines the ArrayDataSource class."""

# Major library imports
from numpy import array, isfinite, ones, ndarray
from numpy import array, empty, isfinite, ones, ndarray
import numpy as np

# Enthought library imports
Expand Down Expand Up @@ -147,7 +147,7 @@ def get_data(self):
if self._data is not None:
return self._data
else:
return 0.0
return empty(shape=(0,))

def get_data_mask(self):
"""get_data_mask() -> (data_array, mask_array)
Expand Down Expand Up @@ -238,17 +238,10 @@ def _compute_bounds(self, data=None):
# version of the dataset?

if data is None:
# Several sources weren't setting the _data attribute, so we
# go through the interface. This seems like the correct thing
# to do anyway... right?
# data = self._data
data = self.get_data()

data_len = 0
try:
data_len = len(data)
except Exception:
pass
data_len = len(data)

if data_len == 0:
self._min_index = 0
self._max_index = 0
Expand Down