From 45b28f2e15b68e8bbb22e90e26f55bb9e5aba5e1 Mon Sep 17 00:00:00 2001
From: Andrew <nazarov_a@diakont.ru>
Date: Mon, 16 Dec 2024 16:49:01 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B5=D0=BD=D1=81=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8E=20gun=20flection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passportFormer.cpython-310.pyc            | Bin 4286 -> 4299 bytes
 src/controller/passportFormer.py              |   2 +-
 src/gui/__pycache__/mainGui.cpython-310.pyc   | Bin 3434 -> 3434 bytes
 src/gui/__pycache__/plotter.cpython-310.pyc   | Bin 12144 -> 12144 bytes
 src/gui/plotter.py                            |   4 ++--
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc
index be102801b2bc2980f6a6ffd3b6ccd3cfa273f513..0447683b6666d3c7d318100469c6622a3696f5df 100644
GIT binary patch
delta 124
zcmdm|cv_J+pO=@50SFlN6VgRC@^0WZ<jIcDNGwXpOD!&rH`HXl#Z{78oRb(|l9`)&
zi=!wpFFiHh*Yy?`Le=Jn+$xNW&YRhIuK}sacllZwT_-2=8}s@C&DCTo;sH`cu9GJU
Q2v6R|U&NR;SyNyt09;xn`2YX_

delta 107
zcmX@DxKEKcpO=@50SGP%C8Tq0<lVrn!j>IhP?TSw$$X2eB(*pvF}@@-H}w`rQDR<t
zYP_#&ku6a5=6BpGjEqj3g?X<5smZVSS{Yp?7w{YN`T!+0nTmLTRFTW%4g9T)sgunF
GrUC%B;2#nI

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 aa8edb5b0e75e216c2c16b5032f02e69e63b3407..8a61220f019628105144e1390b75d7f30cab7975 100644
GIT binary patch
delta 26
gcmaDQ^-78>pO=@50SJC5Y~<R-!nl6(QI@3~0B9!&5C8xG

delta 26
gcmaDQ^-78>pO=@50SJD}Z{*s=!nkzvQI@3~0B8mX2mk;8

diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc
index 863a1d81bae573dde17803359a8842c47db7ac47..ab41eb5bcba0a31c60319a019b4590d1c22dc528 100644
GIT binary patch
delta 459
zcmX|8Jx>Bb5S_)lfWR#v2)BG4=c%C~R#uv5)JhXN>_kmgK`%iC%h{MnG<2G5X#>3$
z1`BIr>rXMEvvmOD7BllEZ{ED!9o0v5>%y|aK&QHL)cAh2-imBre-x|iR41GoGj+r9
zHXhKHQ2{E8*$Cil4pa^eG^8Z}(~=AD&3_al#5O^|c|_%VtRIze{pA#H5(3)K7?+`O
z?m?dqU<VH3sz98OoJC8{k($5)#n8YQSL<-~L=#Dxcqdj2c@HowQv-tm_2;QSn(kLc
z%Cs4aHYkVOrUl4M3RH<|dtB?Y()J#Ccx3G$X=RY3=z+|SwFui&JazG>Pfmzk!_>7v
zv&&@620x%Y^r&0WKP4x_<-%P+K$oedR`kySy@#&2Zh`wV#M{LsT+Bg>rqwboW73~!
zYTtET?gxm`M6Sv$6L~+6<pG=AY`Xb=_~Kr(NZ3DY9=B!dq|?!5ucmLkEwi1c9~*vp
Mmj(+DSIcX`U;jjOGynhq

delta 440
zcmX|8F;Buk6n=-r7Njjo#U9v}S~WO1Iq6^mqj57NCZNM9#wLn{@m(Cy*iFsNCNR2a
z3{H;5#XsU~`~^PLc*DK#eR=QuzTADbK3nFgX=Z^=!`*LxJekiv+f}drHak+&!4A_^
zJBVtx=!zT%S;Ep3V8#JqmO++LLrqv5uqbQ}ar(c@Q^z)e!|{}yPuL(Qrqz4kozHOS
zK44xL<C?(08bTeKdFj!NAu?!+0;zHI=r)Gh7;V7W9c?(Y@j_EJS_xoQ%nmgM#21PG
z`t_GSRdPn(1sPD{IZinpkQKu27^{OyO{WYutea7f6|YHde>&tyYy+Jh$8?{GybEzk
zMi>#h+ACebArrm`E(}qrL!b4TT<n#Qi;#3}v2dB<#LA_U++PNI5w#MAo*hq+!WJ&!
zVi`_IS1#i+7UCZ_)eb}5j#D&otgb`OlF@zGWBO#g*Xf>iR5jYs=ILt`Mzzsf)X|tV
ITC1+>-#N=|2><{9

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)