diff --git a/pydm/widgets/archiver_time_plot.py b/pydm/widgets/archiver_time_plot.py index 2fd61d749..242156244 100644 --- a/pydm/widgets/archiver_time_plot.py +++ b/pydm/widgets/archiver_time_plot.py @@ -2,7 +2,7 @@ import time import numpy as np from collections import OrderedDict -from typing import List, Optional, Union +from typing import List, Optional from pyqtgraph import DateAxisItem, ErrorBarItem from pydm.widgets.channel import PyDMChannel from pydm.widgets.timeplot import TimePlotCurveItem @@ -332,26 +332,9 @@ def getArchiveBufferSize(self) -> int: return DEFAULT_ARCHIVE_BUFFER_SIZE return self._curves[0].getArchiveBufferSize() - def createCurveItem( - self, - y_channel: str, - plot_by_timestamps: bool, - name: str, - color: Union[QColor, str], - yAxisName: str, - useArchiveData: bool, - **plot_opts - ) -> ArchivePlotCurveItem: + def createCurveItem(self, *args, **kwargs) -> ArchivePlotCurveItem: """Create and return a curve item to be plotted""" - curve_item = ArchivePlotCurveItem( - y_channel, - use_archive_data=useArchiveData, - plot_by_timestamps=plot_by_timestamps, - name=name, - color=color, - yAxisName=yAxisName, - **plot_opts - ) + curve_item = ArchivePlotCurveItem(*args, **kwargs) curve_item.archive_data_received_signal.connect(self.archive_data_received) return curve_item diff --git a/pydm/widgets/eventplot.py b/pydm/widgets/eventplot.py index 15d9b91ed..c09157151 100644 --- a/pydm/widgets/eventplot.py +++ b/pydm/widgets/eventplot.py @@ -359,17 +359,8 @@ def addChannel( self.addCurve(curve, curve_color=color, y_axis_name=yAxisName) curve.data_changed.connect(self.set_needs_redraw) - def createCurveItem(self, channel, y_idx, x_idx, name, color, yAxisName, bufferSizeChannelAddress, **plot_opts): - return EventPlotCurveItem( - addr=channel, - y_idx=y_idx, - x_idx=x_idx, - name=name, - color=color, - yAxisName=yAxisName, - bufferSizeChannelAddress=bufferSizeChannelAddress, - **plot_opts - ) + def createCurveItem(self, *args, **kwargs): + return EventPlotCurveItem(*args, *kwargs) def removeChannel(self, curve): """ diff --git a/pydm/widgets/scatterplot.py b/pydm/widgets/scatterplot.py index 6b5762846..bce7cbae7 100644 --- a/pydm/widgets/scatterplot.py +++ b/pydm/widgets/scatterplot.py @@ -448,16 +448,8 @@ def addChannel( self.addCurve(curve, curve_color=color, y_axis_name=yAxisName) curve.data_changed.connect(self.set_needs_redraw) - def createCurveItem(self, y_addr, x_addr, name, color, yAxisName, bufferSizeChannelAddress, **plot_opts): - return ScatterPlotCurveItem( - y_addr, - x_addr, - name=name, - color=color, - yAxisName=yAxisName, - bufferSizeChannelAddress=bufferSizeChannelAddress, - **plot_opts - ) + def createCurveItem(self, *args, **kwargs): + return ScatterPlotCurveItem(*args, **kwargs) def removeChannel(self, curve): """ diff --git a/pydm/widgets/timeplot.py b/pydm/widgets/timeplot.py index a4f7eccb9..2169217db 100644 --- a/pydm/widgets/timeplot.py +++ b/pydm/widgets/timeplot.py @@ -547,18 +547,8 @@ def addYChannel( return new_curve - def createCurveItem( - self, y_channel, plot_by_timestamps, plot_style, name, color, yAxisName, useArchiveData, **plot_opts - ): - return TimePlotCurveItem( - y_channel, - plot_by_timestamps=plot_by_timestamps, - plot_style=plot_style, - name=name, - color=color, - yAxisName=yAxisName, - **plot_opts - ) + def createCurveItem(self, *args, **kwargs): + return TimePlotCurveItem(*args, **kwargs) def removeYChannel(self, curve): """ diff --git a/pydm/widgets/waveformplot.py b/pydm/widgets/waveformplot.py index 8b7a14c79..81f057dd5 100644 --- a/pydm/widgets/waveformplot.py +++ b/pydm/widgets/waveformplot.py @@ -457,10 +457,8 @@ def addChannel( curve.getViewBox().addItem(curve.bar_graph_item) curve.data_changed.connect(self.set_needs_redraw) - def createCurveItem(self, y_addr, x_addr, plot_style, name, color, yAxisName, **plot_opts): - return WaveformCurveItem( - y_addr, x_addr, plot_style=plot_style, name=name, color=color, yAxisName=yAxisName, **plot_opts - ) + def createCurveItem(self, *args, **kwargs): + return WaveformCurveItem(*args, **kwargs) def removeChannel(self, curve): """