style: изменены параметры запуска
This commit is contained in:
parent
3c7040692e
commit
4c79aba8a4
Binary file not shown.
Binary file not shown.
@ -32,8 +32,8 @@ class MainWindow(BaseMainWindow):
|
|||||||
self.settings_button.setFixedWidth(160)
|
self.settings_button.setFixedWidth(160)
|
||||||
self.select_dir_button = QtWidgets.QPushButton("Open directory")
|
self.select_dir_button = QtWidgets.QPushButton("Open directory")
|
||||||
self.select_dir_button.setFixedWidth(175)
|
self.select_dir_button.setFixedWidth(175)
|
||||||
self.report_button = QtWidgets.QPushButton("Generate report")
|
self.report_button = QtWidgets.QPushButton("Customize view")
|
||||||
self.report_button.setFixedWidth(175)
|
self.report_button.setFixedWidth(185)
|
||||||
button_layout = QtWidgets.QHBoxLayout()
|
button_layout = QtWidgets.QHBoxLayout()
|
||||||
button_layout.setSpacing(2)
|
button_layout.setSpacing(2)
|
||||||
button_layout.addWidget(self.settings_button)
|
button_layout.addWidget(self.settings_button)
|
||||||
|
|||||||
@ -193,7 +193,7 @@ class PlotWidget(BasePlotWidget):
|
|||||||
|
|
||||||
# Итерация по точкам
|
# Итерация по точкам
|
||||||
for cur_point, point_data in enumerate(points_pocket):
|
for cur_point, point_data in enumerate(points_pocket):
|
||||||
# point_data структура: [point_timeframe, ideal_data, point_events]
|
# point_data структура: [point_timeframe, ideal_data, point_events, useful_p_data]
|
||||||
point_timeframe, ideal_dat, point_events, useful_p_data = point_data
|
point_timeframe, ideal_dat, point_events, useful_p_data = point_data
|
||||||
ideal_data = copy.deepcopy(ideal_dat)
|
ideal_data = copy.deepcopy(ideal_dat)
|
||||||
|
|
||||||
@ -214,7 +214,6 @@ class PlotWidget(BasePlotWidget):
|
|||||||
if settings["stages"]:
|
if settings["stages"]:
|
||||||
self._add_stage_regions(plot_item, point_events, dataframe_headers, reg_items, 75)
|
self._add_stage_regions(plot_item, point_events, dataframe_headers, reg_items, 75)
|
||||||
|
|
||||||
# TODO: подобрать не вырвеглазные цвета, возможно ограничить зону
|
|
||||||
if settings["workpiece"]:
|
if settings["workpiece"]:
|
||||||
x1 = point_timeframe[0]
|
x1 = point_timeframe[0]
|
||||||
dx = point_timeframe[1] - x1
|
dx = point_timeframe[1] - x1
|
||||||
@ -259,6 +258,7 @@ class PlotWidget(BasePlotWidget):
|
|||||||
TWC_time += TWC_delta
|
TWC_time += TWC_delta
|
||||||
ideal_time += ideal_delta
|
ideal_time += ideal_delta
|
||||||
curr_perf = ideal_delta/TWC_delta if TWC_delta != 0 else 1
|
curr_perf = ideal_delta/TWC_delta if TWC_delta != 0 else 1
|
||||||
|
|
||||||
if curr_perf < worst_perf:
|
if curr_perf < worst_perf:
|
||||||
worst_perf = curr_perf
|
worst_perf = curr_perf
|
||||||
worst_timeframe = point_timeframe
|
worst_timeframe = point_timeframe
|
||||||
@ -274,13 +274,13 @@ class PlotWidget(BasePlotWidget):
|
|||||||
if settings["performance"]:
|
if settings["performance"]:
|
||||||
self._add_performance_label(result_layout, TWC_time, ideal_time, tesla_time)
|
self._add_performance_label(result_layout, TWC_time, ideal_time, tesla_time)
|
||||||
|
|
||||||
navigator, ROI_region = self._create_navigator(worst_timeframe, main_plot)
|
|
||||||
|
|
||||||
plot_layout.addItem(plot_item, widget_num, 0)
|
plot_layout.addItem(plot_item, widget_num, 0)
|
||||||
|
|
||||||
plot_layout.addItem(navigator, widget_num+1, 0)
|
navigator, ROI_region = self._create_navigator(worst_timeframe, main_plot)
|
||||||
self._sync_main_plot_with_navigator(main_plot, ROI_region)
|
if navigator is not None:
|
||||||
main_plot.sigXRangeChanged.connect(lambda _, plot=main_plot, region=ROI_region: self._sync_navigator_with_main(main_plot=plot, region=region))
|
plot_layout.addItem(navigator, widget_num+1, 0)
|
||||||
|
self._sync_main_plot_with_navigator(main_plot, ROI_region)
|
||||||
|
main_plot.sigXRangeChanged.connect(lambda _, plot=main_plot, region=ROI_region: self._sync_navigator_with_main(main_plot=plot, region=region))
|
||||||
|
|
||||||
result_layout.addWidget(plot_layout)
|
result_layout.addWidget(plot_layout)
|
||||||
return result_widget, reg_items, curve_items
|
return result_widget, reg_items, curve_items
|
||||||
|
|||||||
Binary file not shown.
@ -387,6 +387,7 @@ class BaseMainWindow(QWidget):
|
|||||||
def __init__(self,
|
def __init__(self,
|
||||||
controller: Optional[BaseController] = None):
|
controller: Optional[BaseController] = None):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
self.resize(800,800)
|
||||||
self._controller = controller
|
self._controller = controller
|
||||||
...
|
...
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user