fix merge

Author: TomDonoghue

fooof/plts/error.py

@@ -40,7 +40,7 @@ def plot_spectral_error(freqs, error, shade=None, log_freqs=False, ax=None, **pl
 
     plt_freqs = np.log10(freqs) if log_freqs else freqs
 
-    plot_spectrum(plt_freqs, error, ax=ax, linewidth=3)
+    plot_spectra(plt_freqs, error, ax=ax, linewidth=3)
 
     if np.any(shade):
         ax.fill_between(plt_freqs, error-shade, error+shade, alpha=0.25)

fooof/plts/spectra.py

@@ -12,7 +12,7 @@
 from fooof.core.modutils import safe_import, check_dependency
 from fooof.plts.settings import PLT_FIGSIZES
 from fooof.plts.style import style_spectrum_plot, style_plot
-from fooof.plts.utils import check_ax, add_shades, savefig
+from fooof.plts.utils import check_ax, add_shades, savefig, check_plot_kwargs
 
 plt = safe_import('.pyplot', 'matplotlib')
 
@@ -36,10 +36,10 @@ def plot_spectra(freqs, power_spectra, log_freqs=False, log_powers=False,
         Whether to plot the frequency axis in log spacing.
     log_powers : bool, optional, default: False
         Whether to plot the power axis in log spacing.
-    labels : list of str, optional, default: None
-        Legend labels for the spectra.
     colors : list of str, optional, default: None
         Line colors of the spectra.
+    labels : list of str, optional, default: None
+        Legend labels for the spectra.
     ax : matplotlib.Axes, optional
         Figure axes upon which to plot.
     **plot_kwargs
@@ -64,15 +64,17 @@ def plot_spectra(freqs, power_spectra, log_freqs=False, log_powers=False,
     # Plot
     for freqs, powers, color, label in zip(plt_freqs, plt_powers, colors, labels):
 
-        # Set plot data, logging if requested
+        # Set plot data, logging if requested, and collect color, if absent
         freqs = np.log10(freqs) if log_freqs else freqs
         powers = np.log10(powers) if log_powers else powers
+        if color:
+            plot_kwargs['color'] = color
 
-        ax.plot(freqs, powers, color=color, label=label, **plot_kwargs)
+        ax.plot(freqs, powers, label=label, **plot_kwargs)
 
     style_spectrum_plot(ax, log_freqs, log_powers)
 
-    
+
 @savefig
 @check_dependency(plt, 'matplotlib')
 def plot_spectra_shading(freqs, power_spectra, shades, shade_colors='r',

fooof/tests/plts/test_spectra.py

@@ -12,9 +12,9 @@
 
 @plot_test
 def test_plot_spectra(tfm, tfg, skip_if_no_mpl):
-  
+
     # Test with 1d inputs - 1d freq array and list of 1d power spectra
-    plot_spectra(tfm.freqs, tfm.power_spectrum, 
+    plot_spectra(tfm.freqs, tfm.power_spectrum,
                  save_fig=True, file_path=TEST_PLOTS_PATH, file_name='test_plot_spectra_1d.png')
 
     # Test with 1d inputs - 1d freq array and list of 1d power spectra
@@ -37,10 +37,10 @@ def test_plot_spectra(tfm, tfg, skip_if_no_mpl):
 
 @plot_test
 def test_plot_spectra_shading(tfm, tfg, skip_if_no_mpl):
-  
-    plot_spectrum_shading(tfm.freqs, tfm.power_spectrum, shades=[8, 12], add_center=True,
-                          save_fig=True, file_path=TEST_PLOTS_PATH,
-                          file_name='test_plot_spectrum_shading1.png')
+
+    plot_spectra_shading(tfm.freqs, tfm.power_spectrum, shades=[8, 12], add_center=True,
+                         save_fig=True, file_path=TEST_PLOTS_PATH,
+                         file_name='test_plot_spectrum_shading1.png')
 
     plot_spectra_shading(tfg.freqs, [tfg.power_spectra[0, :], tfg.power_spectra[1, :]],
                          shades=[8, 12], add_center=True, save_fig=True, file_path=TEST_PLOTS_PATH,