fix: allow line_color to be fixed if passed to plot for line plots

Author: singjc

pyopenms_viz/_bokeh/core.py

@@ -219,7 +219,7 @@ def plot(cls, fig, data, x, y, by: str | None = None, plot_3d=False, **kwargs):
         if by is None:
             source = ColumnDataSource(data)
             if color_gen is not None:
-                kwargs["line_color"] = next(color_gen)
+                kwargs["line_color"] = color_gen if isinstance(color_gen, str) else next(color_gen)
             line = fig.line(x=x, y=y, source=source, **kwargs)
 
             return fig, None
@@ -229,7 +229,7 @@ def plot(cls, fig, data, x, y, by: str | None = None, plot_3d=False, **kwargs):
             for group, df in data.groupby(by):
                 source = ColumnDataSource(df)
                 if color_gen is not None:
-                    kwargs["line_color"] = next(color_gen)
+                    kwargs["line_color"] = color_gen if isinstance(color_gen, str) else next(color_gen)
                 line = fig.line(x=x, y=y, source=source, **kwargs)
                 legend_items.append((group, [line]))
 

pyopenms_viz/_core.py

@@ -495,7 +495,11 @@ def plot(self, data, x, y, **kwargs):
         """
         Create the plot
         """
-        color_gen = ColorGenerator()
+        if 'line_color' not in kwargs:
+            color_gen = ColorGenerator()
+        else:
+            color_gen = kwargs['line_color']
+        
         tooltip_entries = {"retention time": x, "intensity": y}
         if "Annotation" in self.data.columns:
             tooltip_entries["annotation"] = "Annotation"

pyopenms_viz/_matplotlib/core.py

@@ -204,12 +204,12 @@ def plot(  # type: ignore[override]
         legend_labels = []
 
         if by is None:
-            (line,) = ax.plot(data[x], data[y], color=next(color_gen))
+            (line,) = ax.plot(data[x], data[y], color=color_gen if isinstance(color_gen, str) else next(color_gen))
 
             return ax, None
         else:
             for group, df in data.groupby(by):
-                (line,) = ax.plot(df[x], df[y], color=next(color_gen))
+                (line,) = ax.plot(df[x], df[y], color=color_gen if isinstance(color_gen, str) else next(color_gen))
                 legend_lines.append(line)
                 legend_labels.append(group)
             return ax, (legend_lines, legend_labels)

pyopenms_viz/_plotly/core.py

@@ -221,7 +221,7 @@ def plot(  # type: ignore[override]
         traces = []
         if by is None:
             trace = go.Scatter(
-                x=data[x], y=data[y], mode="lines", line=dict(color=next(color_gen))
+                x=data[x], y=data[y], mode="lines", line=dict(color=color_gen if isinstance(color_gen, str) else next(color_gen))
             )
             traces.append(trace)
         else:
@@ -231,7 +231,7 @@ def plot(  # type: ignore[override]
                     y=df[y],
                     mode="lines",
                     name=group,
-                    line=dict(color=next(color_gen)),
+                    line=dict(color=color_gen if isinstance(color_gen, str) else next(color_gen)),
                 )
                 traces.append(trace)