From 6e8b43d360b6fb93dfc3213e5eea16ab22c67008 Mon Sep 17 00:00:00 2001 From: Owen Graham <ohgraham1@madisoncollege.edu> Date: Mon, 25 Jul 2022 14:07:33 -0500 Subject: [PATCH] Fix overlay plot colors --- visualizer/plotting.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/visualizer/plotting.py b/visualizer/plotting.py index 0b5afe7..c86a44c 100644 --- a/visualizer/plotting.py +++ b/visualizer/plotting.py @@ -80,11 +80,7 @@ class TimeSeries(Plotter): fig.set_figwidth(12) axes.plot(data[:, 0], data[:, meas.field]) avg = np.nanmean(data[:, meas.field], dtype='float32') - axes.hlines(y=avg, - xmin=data[0, 0], - xmax=data[-1, 0], - linestyle='-', - alpha=0.7) + axes.hlines(y=avg, xmin=data[0, 0], xmax=data[-1, 0]) axes.set_ylabel(f'{meas.title.title()} ({meas.units})') axes.grid(True) maximum = max(data, key=lambda row: row[meas.field]) @@ -152,22 +148,21 @@ class Overlay(Plotter): for dset in datasets: raw_data = read_data(dset.station, dset.year) dset.data = np.array(ignore_feb_29(raw_data)) + dset.avg = np.nanmean(dset.data[:, meas.field], dtype='float32') fig, axes = plt.subplots() fig.set_figheight(6) fig.set_figwidth(12) for i, dset in enumerate(datasets): - alpha_kw = {'alpha': 0.6} if i else {} axes.plot(datasets[0].data[:, 0], dset.data[:, meas.field], - **alpha_kw, - label=f'{dset.name} {dset.data[0, 0].year}') - for dset in datasets: - dset.avg = np.nanmean(dset.data[:, meas.field], dtype='float32') + alpha=0.875 if i else 1.0, + label=f'{dset.name}, {dset.data[0, 0].year}') axes.hlines(y=dset.avg, xmin=datasets[0].data[0, 0], xmax=datasets[0].data[-1, 0], - alpha=0.7) + colors=f'C{i}', + alpha=0.875 if i else 1.0) axes.set_ylabel(f'{meas.title.title()} ({meas.units})') for dset in datasets: -- GitLab