From b2458bec15b2041a3f64ca3153b60e9f885453b0 Mon Sep 17 00:00:00 2001 From: andrei Date: Thu, 14 Nov 2024 16:56:45 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B7=D0=B8=D1=86=D0=B8=D0=B9=20=D0=BD=D0=B0=20=D1=83=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8=D1=87=D0=B5=D0=BD=D0=BD=D0=BE=D0=B5=20=D1=83?= =?UTF-8?q?=D1=81=D0=B8=D0=BB=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/base.py | 47 +++++++++++++++++++++++++++-------------- src/gui/widgets/plot.py | 4 ++++ 2 files changed, 35 insertions(+), 16 deletions(-) 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)