Welding/WeldingSpotPerformance
9
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 2 Wiki Activity

style: увеличен шрифт производительности, изменены цвета областей графиков

Browse Source
This commit is contained in:
Andrew 2024-12-09 19:54:08 +03:00
parent dcd04e21b6
commit 2d98c1c5b7
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/controller/__pycache__/passportFormer.cpython-310.pyc
View File

Binary file not shown.

BIN
src/gui/__pycache__/plotter.cpython-310.pyc
View File

Binary file not shown.

8
src/gui/plotter.py
View File

@ -24,7 +24,6 @@ class PlotWidget(BasePlotWidget):
""" """
navigator = pg.PlotWidget(title="Navigator") navigator = pg.PlotWidget(title="Navigator")
navigator.setFixedHeight(100) navigator.setFixedHeight(100)
navigator.setBackground('d')
for signal in real_signals: for signal in real_signals:
if signal["name"] in dataframe.columns: 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) x_downsampled, y_downsampled = self._downsample_data(x, y, max_points=1000)
navigator.plot(x_downsampled, y_downsampled, pen=signal["pen"], name=signal["name"]) 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) navigator.addItem(ROI_region)
# Связываем изменение региона навигатора с обновлением области просмотра основного графика # Связываем изменение региона навигатора с обновлением области просмотра основного графика
@ -189,6 +188,7 @@ class PlotWidget(BasePlotWidget):
f"Сокращение длительности: фактическое = {tesla_TWC} %, " f"Сокращение длительности: фактическое = {tesla_TWC} %, "
f"идеальное = {tesla_ideal} %; КДИП = {TWC_ideal}%" f"идеальное = {tesla_ideal} %; КДИП = {TWC_ideal}%"
) )
self.set_style(performance_label)
layout.addWidget(performance_label) layout.addWidget(performance_label)
performance_label.update() performance_label.update()
@ -218,11 +218,11 @@ class PlotWidget(BasePlotWidget):
# Добавляем реальные стадии # Добавляем реальные стадии
if settings["stages"]: 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"]: 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"]) self._add_ideal_signals(plot_widget, ideal_data, point_events, description["Ideal_signals"])
# Подсчёт производительности # Подсчёт производительности

BIN
src/utils/base/__pycache__/base.cpython-310.pyc
View File

Binary file not shown.

18
src/utils/base/base.py
View File

@ -114,11 +114,11 @@ class BasePlotWidget:
self._stage_colors = { self._stage_colors = {
"Closing": [208, 28, 31, 100], "Closing": [220, 20, 60, 100], # Crimson
"Squeeze": [45, 51, 89, 150], "Squeeze": [30, 144, 255, 100], # Dodger Blue
"Welding": [64, 64, 64, 100], "Welding": [128, 128, 128, 100], # Gray
"Relief": [0, 134, 88, 100], "Relief": [34, 139, 34, 100], # Forest Green
"Oncomming": [0, 79, 0, 100] "Oncomming": [255, 165, 0, 100] # Orange
} }
self._plt_channels = { self._plt_channels = {
"Electrode Force, N & Welding Current, kA": { "Electrode Force, N & Welding Current, kA": {
@ -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 @property
def mediator(self) -> BaseMediator: def mediator(self) -> BaseMediator: