Skip to content

Commit e41ffc6

Browse files
author
O-Sven
committed
now sends np arrays to pyplot because of future warnings discontinuing plots of multidim pandas data
1 parent 6d44368 commit e41ffc6

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

ledsa/analysis/plot_functions.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@ def plot_z_fitpar(fig: plt.figure, fit_par: str, img_id: int, channel: int,
3939

4040
fit_parameters = calc.read_hdf(channel)
4141
fit_parameters = calc.include_column_if_nonexistent(fit_parameters, fit_par, channel)
42-
print(fit_parameters)
4342
fit_parameters = fit_parameters.loc[img_id, :]
4443

4544
ax = fig.gca(xlabel=fit_par, ylabel='height/m')
4645
for line in led_arrays:
47-
plot, = ax.plot(fit_parameters[fit_parameters['line'] == line][fit_par],
48-
fit_parameters[fit_parameters['line'] == line]['height'])
46+
plot, = ax.plot(np.array(fit_parameters[fit_parameters['line'] == line][fit_par]),
47+
np.array(fit_parameters[fit_parameters['line'] == line]['height']))
4948
plot.set_label(f'LED_Array{line}, C{channel}')
5049
ax.legend()
5150
plt.title(f'Plot of fit parameter {fit_par} against the height.\n'
@@ -65,7 +64,7 @@ def plot_z_fitpar_from_average(fig, fit_par, img_id, channel, led_arrays, window
6564

6665
ax = fig.gca(xlabel=fit_par, ylabel='height/m')
6766
for line in led_arrays:
68-
plot, = ax.plot(mean[mean['line'] == line][fit_par], mean[mean['line'] == line]['height'])
67+
plot, = ax.plot(np.array(mean[mean['line'] == line][fit_par]), np.array(mean[mean['line'] == line]['height']))
6968
plot.set_label(f'LED_Array{line}, C{channel}')
7069
ax.legend()
7170
plt.title(f'Plot of averaged fit parameter {fit_par} over time against the height.\n'
@@ -77,7 +76,7 @@ def plot_t_fitpar(fig, led_id, fit_par, channel, image_id_start, image_id_finish
7776
plot_info = _calc_t_fitpar_plot_info(led_id, fit_par, channel, image_id_start, image_id_finish)
7877

7978
ax = fig.gca(xlabel='time[s]', ylabel=fit_par)
80-
plot, = ax.plot(plot_info['experiment_time'], plot_info[fit_par])
79+
plot, = ax.plot(np.array(plot_info['experiment_time']), np.array(plot_info[fit_par]))
8180
plot.set_label(f'LED{led_id}, C{channel}')
8281
ax.legend()
8382
plt.title(f'Time plot of Fit Parameter {fit_par}')
@@ -92,7 +91,7 @@ def plot_t_fitpar_with_moving_average(fig, led_id, fit_par, channel, image_id_st
9291
ax = fig.gca(xlabel='time[s]', ylabel=fit_par)
9392
plot, = ax.plot(plot_info['experiment_time'], plot_info[fit_par], alpha=0.2)
9493
plot.set_label(f'LED{led_id}, C{channel}')
95-
plot, = ax.plot(plot_info['experiment_time'], average, c=plot.get_color())
94+
plot, = ax.plot(np.array(plot_info['experiment_time']), average, c=plot.get_color())
9695
plot.set_label(f'average')
9796
ax.legend()
9897
plt.title(f'Time plot of Fit Parameter {fit_par}')

0 commit comments

Comments
 (0)