diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc index be10280..0447683 100644 Binary files a/src/controller/__pycache__/passportFormer.cpython-310.pyc and b/src/controller/__pycache__/passportFormer.cpython-310.pyc differ diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py index 80cab55..8eaa96b 100644 --- a/src/controller/passportFormer.py +++ b/src/controller/passportFormer.py @@ -45,7 +45,7 @@ class PassportFormer(BasePointPassportFormer): tesla_time = sum(self._params[0].get("Tesla summary time", [])) useful_data = {"tesla_time": tesla_time, "range_ME": system_settings["Range ME, mm"], - "k_prop": system_settings["k_prop"] + "k_hardness": system_settings["k_hardness_1"] } points_pocket = [] diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc index aa8edb5..8a61220 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 863a1d8..ab41eb5 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/plotter.py b/src/gui/plotter.py index 984eb2c..dc51106 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -227,7 +227,7 @@ class PlotWidget(BasePlotWidget): dataframe, points_pocket, useful_data = data tesla_time = useful_data["tesla_time"] range_ME = useful_data["range_ME"] - k_prop = useful_data["k_prop"] + k_hardness = useful_data["k_hardness"] dataframe_headers = dataframe.columns.tolist() for widget_num, (channel, description) in enumerate(self._plt_channels.items()): @@ -251,7 +251,7 @@ class PlotWidget(BasePlotWidget): # TODO: проверить корректность расчетов if settings["force compensation FE"]: 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 dataframe.loc[point_idxs] = self._shift_data("FE", description["Real_signals"], dataframe.loc[point_idxs], F_comp)