diff --git a/visualizer/plotting.py b/visualizer/plotting.py index ec1e44a38392703def0e43d30a57619dbf001df5..3cd01e544efc23f6acf8d90b4275a235d3fae20b 100644 --- a/visualizer/plotting.py +++ b/visualizer/plotting.py @@ -90,14 +90,14 @@ class TimeSeries(Plotter): maximum = max(data, key=lambda row: row[meas.field]) minimum = min(data, key=lambda row: row[meas.field]) axes.set_title( - (f'Max {meas.title} ({meas.units}): {maximum[meas.field]}, ' - f'Date: ({maximum[0]}). ' - f'Min {meas.title} ({meas.units}): {minimum[meas.field]}, ' - f'Date: ({minimum[0]}).'), + (f'Max {meas.title}: {maximum[meas.field]} {meas.units} ' + f'on {maximum[0]:%F at %R} / ' + f'Min {meas.title}: {minimum[meas.field]} {meas.units} ' + f'on {minimum[0]:%F at %R}'), fontsize='small', ) name = station['name'] - plt.suptitle(f'{meas.title.capitalize()} ({meas.units}) measurements, ' + plt.suptitle(f'{meas.title.capitalize()} measurements, ' f'{name} Station, {data[0, 0].year}') return savefig_response(fig, filename=( f'{cls.name}.{station_id}.{year}.{meas.slug}.png' @@ -179,16 +179,18 @@ class Overlay(Plotter): axes.grid(True) axes.set_title( - (f'Max {meas.title} ({meas.units}): {max_dset.max[meas.field]}, ' - f'{max_dset.name} Station, Date: ({max_dset.max[0]}). ' - f'Min {meas.title} ({meas.units}): {min_dset.min[meas.field]}, ' - f'{min_dset.name} Station, Date: ({min_dset.min[0]}).'), + (f'Max {meas.title}: {max_dset.name} Station, ' + f'{max_dset.max[meas.field]} {meas.units} ' + f'on {max_dset.max[0]:%F at %R} / ' + f'Min {meas.title}: {min_dset.name} Station, ' + f'{min_dset.min[meas.field]} {meas.units} ' + f'on {min_dset.min[0]:%F at %R}'), fontsize='small') axes.legend() axes.tick_params(labelbottom=False) title_dsets = ' / '.join(f'{dset.name} Station, {dset.data[0, 0].year}' for dset in datasets) - plt.suptitle(f'{meas.title.capitalize()} ({meas.units}) measurements, ' + plt.suptitle(f'{meas.title.capitalize()} measurements, ' f'{title_dsets}') filename_dsets = '.'.join(f'{dset.station_id}.{dset.year}' for dset in datasets) @@ -261,14 +263,14 @@ class Boxplot(Plotter): axes.set_ylabel(f'{meas.title.title()} ({meas.units})') axes.grid(True) axes.set_title( - (f'Max {meas.title} ({meas.units}): {maximum[meas.field]}, ' - f'Date: ({maximum[0]}). ' - f'Min {meas.title} ({meas.units}): {minimum[meas.field]}, ' - f'Date: ({minimum[0]}).'), + (f'Max {meas.title}: {maximum[meas.field]} {meas.units} ' + f'on {maximum[0]:%F at %R} / ' + f'Min {meas.title}: {minimum[meas.field]} {meas.units} ' + f'on {minimum[0]:%F at %R}'), fontsize='small', ) name = station['name'] - plt.suptitle(f'{meas.title.capitalize()} ({meas.units}) measurements, ' + plt.suptitle(f'{meas.title.capitalize()} measurements, ' f'{name} Station, {start_year} - {end_year}.') return savefig_response(fig, filename=( f'{cls.name}.{station_id}.{year1}.{year2}.{meas.slug}.png'