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

fix: починил компенсацию gun flection

Browse Source
This commit is contained in:
Andrew 2024-12-16 16:49:01 +03:00
parent d8f7b865b9
commit 45b28f2e15
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/controller/__pycache__/passportFormer.cpython-310.pyc
View File

Binary file not shown.

2
src/controller/passportFormer.py
View File

@ -45,7 +45,7 @@ class PassportFormer(BasePointPassportFormer):
tesla_time = sum(self._params[0].get("Tesla summary time", [])) tesla_time = sum(self._params[0].get("Tesla summary time", []))
useful_data = {"tesla_time": tesla_time, useful_data = {"tesla_time": tesla_time,
"range_ME": system_settings["Range ME, mm"], "range_ME": system_settings["Range ME, mm"],
"k_prop": system_settings["k_prop"] "k_hardness": system_settings["k_hardness_1"]
} }
points_pocket = [] points_pocket = []

BIN
src/gui/__pycache__/mainGui.cpython-310.pyc
View File

Binary file not shown.

BIN
src/gui/__pycache__/plotter.cpython-310.pyc
View File

Binary file not shown.

4
src/gui/plotter.py
View File

@ -227,7 +227,7 @@ class PlotWidget(BasePlotWidget):
dataframe, points_pocket, useful_data = data dataframe, points_pocket, useful_data = data
tesla_time = useful_data["tesla_time"] tesla_time = useful_data["tesla_time"]
range_ME = useful_data["range_ME"] range_ME = useful_data["range_ME"]
k_prop = useful_data["k_prop"] k_hardness = useful_data["k_hardness"]
dataframe_headers = dataframe.columns.tolist() dataframe_headers = dataframe.columns.tolist()
for widget_num, (channel, description) in enumerate(self._plt_channels.items()): for widget_num, (channel, description) in enumerate(self._plt_channels.items()):
@ -251,7 +251,7 @@ class PlotWidget(BasePlotWidget):
# TODO: проверить корректность расчетов # TODO: проверить корректность расчетов
if settings["force compensation FE"]: if settings["force compensation FE"]:
force = useful_p_data["force"] force = useful_p_data["force"]
F_comp = - force*k_prop/1000 F_comp = - force/k_hardness
point_idxs = dataframe[(dataframe["time"] >= point_timeframe[0]) & (dataframe["time"] <= point_timeframe[1])].index point_idxs = dataframe[(dataframe["time"] >= point_timeframe[0]) & (dataframe["time"] <= point_timeframe[1])].index
dataframe.loc[point_idxs] = self._shift_data("FE", description["Real_signals"], dataframe.loc[point_idxs], F_comp) dataframe.loc[point_idxs] = self._shift_data("FE", description["Real_signals"], dataframe.loc[point_idxs], F_comp)