Skip to content

Add date conversion to bounds plots #2260

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

Closed
djkirkham wants to merge 2 commits into from
Closed

Add date conversion to bounds plots #2260

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0e973e
Add date conversion to bounds plots
djkirkham Dec 7, 2016
0b9241c
Refactor result array construction and assignment in _fixup_dates
djkirkham Dec 12, 2016
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
11 changes: 7 additions & 4 deletions lib/iris/plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,9 @@ def _draw_2d_from_bounds(draw_method_name, cube, *args, **kwargs):
values = np.arange(data.shape[data_dim] + 1) - 0.5
else:
values = coord.contiguous_bounds()
values = _fixup_dates(coord, values)
if (isinstance(values.ravel()[0], datetime.datetime)):
values = mpl_dates.date2num(values)
Copy link
Member

@corinnebosley corinnebosley May 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have you removed this bit? Does it still work without this? What happens when the values are datetimes?

Copy link
Contributor Author

@djkirkham djkirkham May 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is code I've added.

Copy link
Member

@corinnebosley corinnebosley May 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes of course it is, sorry, it's green.

In which case, I approve, just need to work out where we are with the image hashing stuff now.


plot_arrays.append(values)

Expand Down Expand Up @@ -402,11 +405,11 @@ def _draw_2d_from_points(draw_method_name, arg_func, cube, *args, **kwargs):


def _fixup_dates(coord, values):
if coord.units.calendar is not None and values.ndim == 1:
if coord.units.calendar is not None:
# Convert coordinate values into tuples of
# (year, month, day, hour, min, sec)
dates = [coord.units.num2date(val).timetuple()[0:6]
for val in values]
for val in values.flat]
if coord.units.calendar == 'gregorian':
r = [datetime.datetime(*date) for date in dates]
else:
Expand All @@ -423,8 +426,8 @@ def _fixup_dates(coord, values):
r = [nc_time_axis.CalendarDateTime(
netcdftime.datetime(*date), coord.units.calendar)
for date in dates]
values = np.empty(len(r), dtype=object)
values[:] = r
values = np.empty_like(values, dtype=object)
values.flat = r
return values


Expand Down