From 116e65e0e1649d73184d7c23ad8a51d2b5e5ee16 Mon Sep 17 00:00:00 2001 From: rasmusvt Date: Tue, 2 Aug 2022 13:24:55 +0200 Subject: [PATCH] Make 'which_cycles' work for summaries --- nafuma/electrochemistry/plot.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nafuma/electrochemistry/plot.py b/nafuma/electrochemistry/plot.py index 4a3a1ee..ee8284c 100644 --- a/nafuma/electrochemistry/plot.py +++ b/nafuma/electrochemistry/plot.py @@ -73,13 +73,21 @@ def plot_gc(data, options=None): elif options['summary']: + mask = [] + for i in range(data['cycles'][0].shape[0]): + if i+1 in options['which_cycles']: + mask.append(True) + else: + mask.append(False) + + # FIXME To begin, the default is that y-values correspond to x-values. This should probably be implemented in more logical and consistent manner in the future. if options['charge']: - data['cycles'][0].plot(x='cycle', y=options['x_vals'], ax=ax, color=colours[0][0], kind='scatter', marker="$\u25EF$", s=plt.rcParams['lines.markersize']) + data['cycles'][0].loc[mask].plot(x='cycle', y=options['x_vals'], ax=ax, color=colours[0][0], kind='scatter', marker="$\u25EF$", s=plt.rcParams['lines.markersize']) # if options['discharge']: - data['cycles'][1].plot(x='cycle', y=options['x_vals'], ax=ax, color=colours[0][1], kind='scatter', marker="$\u25EF$", s=plt.rcParams['lines.markersize']) + data['cycles'][1].loc[mask].plot(x='cycle', y=options['x_vals'], ax=ax, color=colours[0][1], kind='scatter', marker="$\u25EF$", s=plt.rcParams['lines.markersize']) if options['interactive_session_active']: