diff --git a/src/base/base.py b/src/base/base.py index a19cf85..d687920 100644 --- a/src/base/base.py +++ b/src/base/base.py @@ -94,38 +94,53 @@ class BasePlotWidget: super().__init__() self._mediator = mediator - # "Electrode Position": ["Rotor Position, mm ME", "Rotor Position, mm FE"], - # "Electrode Speed": ["Rotor Speed, mm/s ME", "Rotor Speed, mm/s FE"] + self._stages = [ + "Relief", + "Closing", + "Squeeze", + "Welding" + ] self._plot_channels = { - "Electrode Force": [ + "Electrode Force, N & Welding Current, kA": [ { "name": "Electrode Force, N ME", - "pen": 'r' + "pen": 'r', + "zoom": False }, { "name":"Electrode Force, N FE", - "pen": 'w' - }, - ], - "Electrode Position": [ - { - "name": "Rotor Position, mm ME", - "pen": 'r' + "pen": 'w', + "zoom": False }, { - "name": "Rotor Position, mm FE", - "pen": 'w' + "name": "Welding Current ME", + "pen": "y", + "zoom": False + } + ], + "Electrode Force, N": [ + { + "name": "Electrode Force, N ME", + "pen": 'r', + "zoom": True + }, + { + "name": "Electrode Force, N FE", + "pen": 'w', + "zoom": True }, ], - "Electrode Speed": [ + "Electrode Speed, mm/s": [ { "name": "Rotor Speed, mm/s ME", - "pen": 'r' + "pen": 'r', + "zoom": False }, { "name": "Rotor Speed, mm/s FE", - "pen": 'w' + "pen": 'w', + "zoom": False }, ] } diff --git a/src/gui/widgets/plot.py b/src/gui/widgets/plot.py index cb9a489..0b2a22a 100644 --- a/src/gui/widgets/plot.py +++ b/src/gui/widgets/plot.py @@ -21,6 +21,10 @@ class PlotWidget(BasePlotWidget): for signal in signals: plot = plot_widget.plot(time_axis, dataframe[signal["name"]], pen=signal["pen"]) + if signal["zoom"]: + max_value = max(dataframe[signal["name"]]) + plot_widget.setYRange(max_value - 150, max_value) + plot_widget.setInteractive(False) legend.addItem(plot, signal["name"]) layout.addWidget(plot_widget)