diff --git a/params/operator_params.json b/params/operator_params.json index 76d9da0..5a96d09 100644 --- a/params/operator_params.json +++ b/params/operator_params.json @@ -8,7 +8,7 @@ "dist_close_end_1": 0.005, "dist_close_end_2": 0.005, "time_wielding": 1, - "time_command": 0.06, + "time_command": 0.0, "time_robot_movement": 0.2, "object_thickness": 0.0045, "force_target": 5000, diff --git a/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc b/src/OptAlgorithm/__pycache__/ConstantCalculator.cpython-310.pyc index 22ef919..0f5d90b 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 4983639..a43688a 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 05c8dd5..131d1b9 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/__pycache__/main.cpython-310.pyc b/src/__pycache__/main.cpython-310.pyc index 3c948a8..443fd68 100644 Binary files a/src/__pycache__/main.cpython-310.pyc and b/src/__pycache__/main.cpython-310.pyc differ diff --git a/src/controller/__pycache__/controller.cpython-310.pyc b/src/controller/__pycache__/controller.cpython-310.pyc index f010284..b973576 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 05a9938..2f47d79 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__/mediator.cpython-310.pyc b/src/controller/__pycache__/mediator.cpython-310.pyc index 53ed495..5725fb2 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__/monitor.cpython-310.pyc b/src/controller/__pycache__/monitor.cpython-310.pyc index 5987012..77287fb 100644 Binary files a/src/controller/__pycache__/monitor.cpython-310.pyc and b/src/controller/__pycache__/monitor.cpython-310.pyc differ diff --git a/src/gui/__pycache__/__init__.cpython-310.pyc b/src/gui/__pycache__/__init__.cpython-310.pyc index 4d2a802..8f86e2f 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__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc index 2fcd016..d52d6d0 100644 Binary files a/src/gui/__pycache__/mainGui.cpython-310.pyc and b/src/gui/__pycache__/mainGui.cpython-310.pyc differ diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index 296bd55..8d2e0c6 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__/settings_window.cpython-310.pyc b/src/gui/__pycache__/settings_window.cpython-310.pyc index e425957..5434731 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/plotter.py b/src/gui/plotter.py index 15edf27..3d2d6ae 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -19,7 +19,7 @@ class idealDataBuilder(BaseIdealDataBuilder): def get_openingDF(self) -> pd.DataFrame: return self._get_data(self.getMarkOpen(), self.calcPhaseOpen) - def get_tmovementDF(self) -> pd.DataFrame: + def get_oncomingDF(self) -> pd.DataFrame: return self._get_data(self.Ts['tmovement'], self.calcPhaseMovement) def get_weldingDF(self) -> pd.DataFrame: @@ -31,7 +31,7 @@ class idealDataBuilder(BaseIdealDataBuilder): def get_ideal_timings(self) -> list[float, float, float, float]: data = self.Ts - ideal_timings = [data['tclose'], data['tgrow'], self.welding_time, self.getMarkOpen()] + ideal_timings = [data['tclose'], data['tgrow'], self.welding_time, self.getMarkOpen()] # TODO: add data['tmovement'], Oncoming не учитывается в производительности return ideal_timings @@ -127,7 +127,17 @@ class PlotWidget(BasePlotWidget): ideal_plot = self._create_curve_ideal(stage, signal, start_timestamp, finish_timestamp) if ideal_plot: plot_widget.addItem(ideal_plot) - + + end_timestamp = time_axis[len(time_axis) - 1] + region = self._create_stage_region("Oncoming", finish_timestamp, end_timestamp) + if region: + plot_widget.addItem(region) + + for signal in description["Ideal_signals"]: + ideal_plot = self._create_curve_ideal("Oncoming", signal, finish_timestamp, end_timestamp) + if ideal_plot: + plot_widget.addItem(ideal_plot) + if settings["performance"] and all([stage in dataframe_headers for stage in self._stages]): delta_timestamp = 0 for stage in self._stages: diff --git a/src/utils/__pycache__/diagram_parser.cpython-310.pyc b/src/utils/__pycache__/diagram_parser.cpython-310.pyc index 098b2f8..51784ae 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/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc index 6d8394a..7c04d46 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 e1de8b9..ee0fd86 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -104,17 +104,18 @@ class BasePlotWidget: self._mediator = mediator self._stages = [ - "Relief", "Closing", "Squeeze", - "Welding" + "Welding", + "Relief" ] self._stage_colors = { "Closing": [208, 28, 31, 100], "Squeeze": [45, 51, 89, 150], "Welding": [247, 183, 24, 100], - "Relief": [0, 134, 88, 100] + "Relief": [0, 134, 88, 100], + "Oncoming": [222, 184, 135, 100] } self._plt_channels = { "Electrode Force, N & Welding Current, kA": { @@ -208,7 +209,8 @@ class BasePlotWidget: "Closing": self._opt.get_closingDF(), "Squeeze": self._opt.get_compressionDF(), "Welding": self._opt.get_weldingDF(), - "Relief": self._opt.get_openingDF() + "Relief": self._opt.get_openingDF(), + "Oncoming": self._opt.get_oncomingDF() } @property def mediator(self) -> BaseMediator: @@ -271,6 +273,9 @@ class BaseIdealDataBuilder(OptAlgorithm): def get_weldingDF(self) -> pd.DataFrame: ... + + def get_oncomingDF(self) -> pd.DataFrame: + ... def get_ideal_timings(self) -> list[float, float, float, float]: ...