diff --git a/src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc b/src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc index accac86..8b08778 100644 Binary files a/src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc and b/src/OptAlgorithm/__pycache__/AutoConfigClass.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc b/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc index 0c2a312..6cc3eab 100644 Binary files a/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc and b/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc b/src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc index 7b03fe1..8f016f6 100644 Binary files a/src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc and b/src/OptAlgorithm/__pycache__/OptAlgorithm.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc b/src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc index cc1f652..8dd4c0b 100644 Binary files a/src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc and b/src/OptAlgorithm/__pycache__/OptTimeCalculator.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc b/src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc index 990f3c7..086747e 100644 Binary files a/src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc and b/src/OptAlgorithm/__pycache__/PhaseCalc.cpython-310.pyc differ diff --git a/src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc b/src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc index a0c6fbc..7af8d68 100644 Binary files a/src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc and b/src/OptAlgorithm/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/base/__pycache__/base.cpython-310.pyc b/src/base/__pycache__/base.cpython-310.pyc index bbb4e20..bb910bc 100644 Binary files a/src/base/__pycache__/base.cpython-310.pyc and b/src/base/__pycache__/base.cpython-310.pyc differ diff --git a/src/controller/__pycache__/controller.cpython-310.pyc b/src/controller/__pycache__/controller.cpython-310.pyc index 1238a76..ca7421a 100644 Binary files a/src/controller/__pycache__/controller.cpython-310.pyc and b/src/controller/__pycache__/controller.cpython-310.pyc differ diff --git a/src/controller/__pycache__/converter.cpython-310.pyc b/src/controller/__pycache__/converter.cpython-310.pyc index fb00798..5299bbe 100644 Binary files a/src/controller/__pycache__/converter.cpython-310.pyc and b/src/controller/__pycache__/converter.cpython-310.pyc differ diff --git a/src/controller/__pycache__/file_manager.cpython-310.pyc b/src/controller/__pycache__/file_manager.cpython-310.pyc index 66c2a28..bcf7f53 100644 Binary files a/src/controller/__pycache__/file_manager.cpython-310.pyc and b/src/controller/__pycache__/file_manager.cpython-310.pyc differ diff --git a/src/controller/__pycache__/mediator.cpython-310.pyc b/src/controller/__pycache__/mediator.cpython-310.pyc index 80d20f0..4d77d2b 100644 Binary files a/src/controller/__pycache__/mediator.cpython-310.pyc and b/src/controller/__pycache__/mediator.cpython-310.pyc differ diff --git a/src/controller/__pycache__/passport_former.cpython-310.pyc b/src/controller/__pycache__/passport_former.cpython-310.pyc new file mode 100644 index 0000000..c0be034 Binary files /dev/null and b/src/controller/__pycache__/passport_former.cpython-310.pyc differ diff --git a/src/gui/__pycache__/__init__.cpython-310.pyc b/src/gui/__pycache__/__init__.cpython-310.pyc index 70d8253..edbc25b 100644 Binary files a/src/gui/__pycache__/__init__.cpython-310.pyc and b/src/gui/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/gui/__pycache__/main_gui.cpython-310.pyc b/src/gui/__pycache__/main_gui.cpython-310.pyc index baefbd3..754693b 100644 Binary files a/src/gui/__pycache__/main_gui.cpython-310.pyc and b/src/gui/__pycache__/main_gui.cpython-310.pyc differ diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index 16455a4..0934e51 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/__pycache__/report_gui.cpython-310.pyc b/src/gui/__pycache__/report_gui.cpython-310.pyc index a34c32e..8db5903 100644 Binary files a/src/gui/__pycache__/report_gui.cpython-310.pyc and b/src/gui/__pycache__/report_gui.cpython-310.pyc differ diff --git a/src/gui/__pycache__/settings_window.cpython-310.pyc b/src/gui/__pycache__/settings_window.cpython-310.pyc index e12bcec..368083c 100644 Binary files a/src/gui/__pycache__/settings_window.cpython-310.pyc and b/src/gui/__pycache__/settings_window.cpython-310.pyc differ diff --git a/src/gui/__pycache__/start_widget.cpython-310.pyc b/src/gui/__pycache__/start_widget.cpython-310.pyc index ba9185e..cc61382 100644 Binary files a/src/gui/__pycache__/start_widget.cpython-310.pyc and b/src/gui/__pycache__/start_widget.cpython-310.pyc differ diff --git a/src/gui/plotter.py b/src/gui/plotter.py index 9b9975a..5a9add2 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -27,6 +27,8 @@ class ChannelTimings(): TWC_time: float = 0.0 ideal_time: float = 0.0 client_time: float = 0.0 + TWC_start: float = 0.0 + TWC_end: float = 0.0 worst_performance: float = 2 worst_timeframe: list = field(default_factory=lambda: [0, 0]) @@ -151,7 +153,9 @@ class CustomPlotLayout(pg.GraphicsLayoutWidget): self.addItem(plot_item, widget_num, 0) - navigator = NavigatorPlot(plot_timings.worst_timeframe, main_plot) + timings = ChannelTimings() + if self.property('performance'):timings:ChannelTimings = self.property('performance') + navigator = NavigatorPlot(timings.worst_timeframe, main_plot) if navigator is not None: self.addItem(navigator, widget_num+1, 0) @@ -210,6 +214,7 @@ class PlotItemGenerator: point_data: PointPassport = data ideal_data = copy.deepcopy(point_data.ideal_data) is_last = (cur_point == len(points_pocket) - 1) + is_first = (cur_point == 0) if self._ideal_mode: timings, point_data.events, point_data.timeframe = self._generate_synthetic_events(timings, ideal_data) @@ -239,14 +244,13 @@ class PlotItemGenerator: self._add_ideal_signals(plot_item, legend, ideal_data, point_data.events, description["Ideal_signals"], pyqt_container.curves, is_last) if settings["performance"]: - timings = self._calc_performance(timings, point_data, ideal_data, is_last) + timings = self._calc_performance(timings, point_data, ideal_data, is_first, is_last) self._parent._update_status(widget_steps, point_steps, widget_num, cur_point) # Добавляем реальные сигналы if not self._ideal_mode: self._add_real_signals(plot_item, dataframe, description["Real_signals"], legend, pyqt_container.curves) - return (plot_item, timings) @staticmethod @@ -415,24 +419,26 @@ class PlotItemGenerator: def _calc_performance(self, timings:ChannelTimings, point_data: PointPassport, - ideal_data:dict, + ideal_data:dict, + is_first:bool, is_last:bool) -> ChannelTimings: - if is_last: + if is_first: if not self._ideal_mode: - TWC_delta = sum([point_data.events[stage][1] - point_data.events[stage][0] - for stage in ["Closing", "Squeeze", "Welding"]]) - else: TWC_delta = 0 + timings.TWC_start = point_data.events["Closing"][0] + ideal_delta = ideal_data["Ideal cycle"] + elif is_last: + if not self._ideal_mode: + timings.TWC_end = point_data.events["Relief"][1] + timings.TWC_time = timings.TWC_end - timings.TWC_start + timings.worst_timeframe = [timings.TWC_start, timings.TWC_end] ideal_delta = sum(ideal_data["Ideal timings"][0:3]) else: - if not self._ideal_mode: TWC_delta = point_data.timeframe[1] - point_data.timeframe[0] - else: TWC_delta = 0 ideal_delta = ideal_data["Ideal cycle"] - timings.TWC_time += TWC_delta timings.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 < timings.worst_performance: + if False: #curr_perf < timings.worst_performance: timings.worst_performance = curr_perf timings.worst_timeframe = point_data.timeframe return timings @@ -509,6 +515,7 @@ class NavigatorPlot(pg.PlotItem): """ Связывает изменения навигатора и других графиков друг с другом """ + self._sync_main_plot_with_navigator(main_plot, self.ROI_region) self.ROI_region.sigRegionChanged.connect( lambda: self._sync_main_plot_with_navigator(main_plot, self.ROI_region) ) @@ -533,8 +540,10 @@ class NavigatorPlot(pg.PlotItem): x_downsampled, y_downsampled = self._downsample_data(x, y, max_points=1000) self.plot(x_downsampled, y_downsampled, pen=signal_pen, name=curve_name) - self.ROI_region = pg.LinearRegionItem(values=time_region, movable=True, brush=pg.mkBrush(0, 0, 255, 100), pen=pg.mkPen(width=4)) + self.ROI_region = pg.LinearRegionItem(movable=True, brush=pg.mkBrush(0, 0, 255, 100), pen=pg.mkPen(width=4)) + self.ROI_region.setBounds([0, x[-1]]) + self.ROI_region.setRegion(time_region) self.addItem(self.ROI_region) self.getViewBox().setLimits(xMin=0, xMax=x[-1]) diff --git a/src/utils/__pycache__/__init__.cpython-310.pyc b/src/utils/__pycache__/__init__.cpython-310.pyc index a4bdb2a..78b7dc9 100644 Binary files a/src/utils/__pycache__/__init__.cpython-310.pyc and b/src/utils/__pycache__/__init__.cpython-310.pyc differ diff --git a/src/utils/__pycache__/diagram_parser.cpython-310.pyc b/src/utils/__pycache__/diagram_parser.cpython-310.pyc index c4db8c1..3b2b1ac 100644 Binary files a/src/utils/__pycache__/diagram_parser.cpython-310.pyc and b/src/utils/__pycache__/diagram_parser.cpython-310.pyc differ diff --git a/src/utils/__pycache__/json_tools.cpython-310.pyc b/src/utils/__pycache__/json_tools.cpython-310.pyc index 052e62f..2f9d5f2 100644 Binary files a/src/utils/__pycache__/json_tools.cpython-310.pyc and b/src/utils/__pycache__/json_tools.cpython-310.pyc differ diff --git a/src/utils/__pycache__/qt_settings.cpython-310.pyc b/src/utils/__pycache__/qt_settings.cpython-310.pyc index 55e5b8f..437a443 100644 Binary files a/src/utils/__pycache__/qt_settings.cpython-310.pyc and b/src/utils/__pycache__/qt_settings.cpython-310.pyc differ