dev: Внедрение склейки этапов по позиции

This commit is contained in:
Леонид Титов 2024-12-27 20:20:46 +03:00
parent e16efb0c74
commit c7be46b7e3
4 changed files with 12 additions and 8 deletions

View File

@ -44,7 +44,7 @@
0.0 0.0
], ],
"time_robot_movement": [ "time_robot_movement": [
0.314, 0.14,
0.331 0.331
], ],
"object_thickness": [ "object_thickness": [

View File

@ -12,10 +12,10 @@
0.25 0.25
], ],
"a_max_2": [ "a_max_2": [
10.0 50.0
], ],
"v_max_2": [ "v_max_2": [
0.25 1.0
], ],
"mass_1": [ "mass_1": [
270.0 270.0

View File

@ -82,10 +82,10 @@ class PassportFormer(BasePointPassportFormer):
for key, value in self._params[0].items() for key, value in self._params[0].items()
} }
displacement_me = -0.005 displacement_me = -0.01
displacement_fe = -0.005 displacement_fe = -0.01
operator_settings["distance_h_end1"] += displacement_fe operator_settings["distance_h_end1"] -= displacement_fe
operator_settings["distance_h_end2"] += displacement_me operator_settings["distance_h_end2"] += displacement_me
params_list = [operator_settings, system_settings] params_list = [operator_settings, system_settings]

View File

@ -268,8 +268,12 @@ class PlotWidget(BasePlotWidget):
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)
if settings["workpiece"]: if settings["workpiece"]:
x1 = point_timeframe[0] #x1 = point_timeframe[0]
dx = point_timeframe[1] - x1 #dx = point_timeframe[1] - x1
x1 = point_events["Closing"][0]
dx = point_events["Relief"][1] - x1
y1 = useful_p_data["position"]*1000 y1 = useful_p_data["position"]*1000
dy = useful_p_data["thickness"]*1000 dy = useful_p_data["thickness"]*1000