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

fix: Положение детали и переход к детали

Browse Source
This commit is contained in:
Леонид Титов 2024-12-28 17:28:15 +03:00
parent 7902738290
commit e9b92a87c5
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
params/operator_params.json
View File

@ -80,20 +80,20 @@
0.01 0.01
], ],
"distance_l_2": [ "distance_l_2": [
0.0325, 0.045,
0.0325, 0.045,
0.0325, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02, 0.045,
0.02 0.045
], ],
"distance_h_end1": [ "distance_h_end1": [
0.003, 0.003,

12
src/controller/passportFormer.py
View File

@ -76,15 +76,15 @@ class PassportFormer(BasePointPassportFormer):
next_i = i + 1 next_i = i + 1
P1 = operator_settings["object_position"] + 0.5 * operator_settings["object_thickness"]
P2 = operator_settings["object_position"] - 0.5 * operator_settings["object_thickness"]
if next_i < point_quantity: if next_i < point_quantity:
next_operator_settings = { next_operator_settings = {
key: (value[next_i] if i < len(value) else value[0]) key: (value[next_i] if i < len(value) else value[0])
for key, value in self._params[0].items() for key, value in self._params[0].items()
} }
P1 = operator_settings["object_position"] + 0.5*operator_settings["object_thickness"]
P2 = operator_settings["object_position"] - 0.5*operator_settings["object_thickness"]
next_P1 = next_operator_settings["object_position"] + 0.5*next_operator_settings["object_thickness"] next_P1 = next_operator_settings["object_position"] + 0.5*next_operator_settings["object_thickness"]
next_P2 = next_operator_settings["object_position"] - 0.5*next_operator_settings["object_thickness"] next_P2 = next_operator_settings["object_position"] - 0.5*next_operator_settings["object_thickness"]
@ -94,6 +94,12 @@ class PassportFormer(BasePointPassportFormer):
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
LFEAbs = operator_settings["distance_l_1"]
LMEAbs = operator_settings["distance_l_2"]
operator_settings["distance_l_1"] = P2 - LFEAbs
operator_settings["distance_l_2"] = LMEAbs - P1
params_list = [operator_settings, system_settings] params_list = [operator_settings, system_settings]
cache_key = self._generate_cache_key(params_list) cache_key = self._generate_cache_key(params_list)
if cache_key in self._ideal_data_cashe and False: if cache_key in self._ideal_data_cashe and False: