diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc index a259d12..bfa39d1 100644 Binary files a/src/controller/__pycache__/passportFormer.cpython-310.pyc and b/src/controller/__pycache__/passportFormer.cpython-310.pyc differ diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index e3db155..38f4ade 100644 Binary files a/src/gui/__pycache__/plotter.cpython-310.pyc and b/src/gui/__pycache__/plotter.cpython-310.pyc differ diff --git a/src/gui/plotter.py b/src/gui/plotter.py index 235a451..14b1885 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -24,7 +24,6 @@ class PlotWidget(BasePlotWidget): """ navigator = pg.PlotWidget(title="Navigator") navigator.setFixedHeight(100) - navigator.setBackground('d') for signal in real_signals: if signal["name"] in dataframe.columns: @@ -34,7 +33,7 @@ class PlotWidget(BasePlotWidget): x_downsampled, y_downsampled = self._downsample_data(x, y, max_points=1000) navigator.plot(x_downsampled, y_downsampled, pen=signal["pen"], name=signal["name"]) - ROI_region = pg.LinearRegionItem(values=time_region, movable=True, brush=pg.mkBrush(0, 0, 255, 50)) + ROI_region = pg.LinearRegionItem(values=time_region, movable=True, brush=pg.mkBrush(0, 0, 255, 100)) navigator.addItem(ROI_region) # Связываем изменение региона навигатора с обновлением области просмотра основного графика @@ -189,6 +188,7 @@ class PlotWidget(BasePlotWidget): f"Сокращение длительности: фактическое = {tesla_TWC} %, " f"идеальное = {tesla_ideal} %; КДИП = {TWC_ideal}%" ) + self.set_style(performance_label) layout.addWidget(performance_label) performance_label.update() @@ -218,11 +218,11 @@ class PlotWidget(BasePlotWidget): # Добавляем реальные стадии if settings["stages"]: - self._add_stage_regions(plot_widget, point_events, dataframe_headers, transparency=75) + self._add_stage_regions(plot_widget, point_events, dataframe_headers, 75) # Добавляем идеальные стадии и идеальные сигналы if settings["ideals"]: - self._add_ideal_stage_regions(plot_widget, ideal_data, point_events) + self._add_ideal_stage_regions(plot_widget, ideal_data, point_events, 100) self._add_ideal_signals(plot_widget, ideal_data, point_events, description["Ideal_signals"]) # Подсчёт производительности diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc index 8c98d92..ca99e60 100644 Binary files a/src/utils/base/__pycache__/base.cpython-310.pyc and b/src/utils/base/__pycache__/base.cpython-310.pyc differ diff --git a/src/utils/base/base.py b/src/utils/base/base.py index b8fe5af..de07623 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -114,12 +114,12 @@ class BasePlotWidget: self._stage_colors = { - "Closing": [208, 28, 31, 100], - "Squeeze": [45, 51, 89, 150], - "Welding": [64, 64, 64, 100], - "Relief": [0, 134, 88, 100], - "Oncomming": [0, 79, 0, 100] - } + "Closing": [220, 20, 60, 100], # Crimson + "Squeeze": [30, 144, 255, 100], # Dodger Blue + "Welding": [128, 128, 128, 100], # Gray + "Relief": [34, 139, 34, 100], # Forest Green + "Oncomming": [255, 165, 0, 100] # Orange + } self._plt_channels = { "Electrode Force, N & Welding Current, kA": { "Settings": { @@ -210,6 +210,14 @@ class BasePlotWidget: ] }, } + def set_style(self, object: Union[QTabWidget, QWidget]) -> None: + object.setStyleSheet( + """QLabel { + color: #ffffff; + font-size: 26px; + font-weight: bold; + font-family: "Segoe UI", sans-serif; + }""") @property def mediator(self) -> BaseMediator: