From 2294869130f594fea4f780c4396a34f42877fd1c Mon Sep 17 00:00:00 2001
From: Andrew <navpdb@gmail.com>
Date: Mon, 16 Dec 2024 15:09:45 +0300
Subject: [PATCH] =?UTF-8?q?dev:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D1=83=D1=87=D0=B5=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B5=D0=BD=D1=81=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B3=D0=B8=D0=B1=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B2=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=B8=20FE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 params/operator_params.json                   |   2 +-
 params/system_params.json                     |   4 +--
 .../passportFormer.cpython-310.pyc            | Bin 4241 -> 4286 bytes
 src/controller/passportFormer.py              |  11 +++++---
 src/gui/__pycache__/plotter.cpython-310.pyc   | Bin 11626 -> 12144 bytes
 src/gui/plotter.py                            |  25 +++++++++++++++++-
 .../base/__pycache__/base.cpython-310.pyc     | Bin 16378 -> 16413 bytes
 src/utils/base/base.py                        |   9 ++++---
 8 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/params/operator_params.json b/params/operator_params.json
index f6437ab..16046d2 100644
--- a/params/operator_params.json
+++ b/params/operator_params.json
@@ -80,7 +80,7 @@
         0.02
     ],
     "distance_l_2": [
-        0.04,
+        0.0275,
         0.03,
         0.033,
         0.033,
diff --git a/params/system_params.json b/params/system_params.json
index c455ac2..7e69d3c 100644
--- a/params/system_params.json
+++ b/params/system_params.json
@@ -55,8 +55,8 @@
     ],
     "UML_time_scaler": [
         1000.0
-    ], 
+    ],
     "Range ME, mm": [
-        250
+        115.0
     ]
 }
\ No newline at end of file
diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc
index 5d8dba83f4dfd9e68c8586ca4ded23274d50b3ca..be102801b2bc2980f6a6ffd3b6ccd3cfa273f513 100644
GIT binary patch
delta 650
zcmXw0zl#$=6n-<ioBjPGKkm-O<__f`r-B%;xl=(B8!v^XmKZXdy)z~`Crc2W#Ug@d
zVR4L=SY++Q%74IK5k#=s%E~`Oe7nIJ-Z#8?-+bSjnX{cQJKoH7Ex_@!_As`B&z@&`
zHB5C31!Mj}?wR{95=Fox!e|I9l~rQM=#r$G(1gnL5D<+JnE75wv6kwBFoH}igH<I1
z2U0^A{D+{Zp))H4<f76##*}xNJtfRZ&BPGOlC<H$;x)X25n(P<UmAF7wzj4jv;mDR
zVF@*+sV!h-3OggIBOIhz3*gU-RX8D}ZelZUNeD~>+;b9F*vx-JQ&+fa&H*4JC>X-z
zXQ#llEtry1NIiMaIzL=Ds^Rs#5YWvpTdI~V(bfN60%5Tlax7Lav4I!cz=x;`edP%s
zy#i5<)eK#p^aK&QsEm{zFz7*ZQ+~C+$;_^|o;mji(>U7hb}nyECV6GtKjE{JrjlDp
zG=DtkC&!a0H+aG6cRTzB{*3%?KP3mU<9uq|#+17Scm?bu+?A@kx0^eo86QUdWWeJn
zK{+!yIv$Rv(R`lM!)v)#mgOz?Evd<0Zj17pGVnfLDg{fetEjb$F~5V*AO=y%Il4(H
zsTA|Cs>$EpMXyXSZKxJe|47GglD53=x7<TK)ui0Pg}3Fxzd(BOoj)Lv><3%29&C^+
IvKbux18CHj`2YX_

delta 643
zcmY*WziSjx5T1Frd$+%L?+5C37ZCMA3h^vF5(`NJ3W-G`76FN8-reOA@5J3zG|ZCX
z1kXY+JS(xdEyc>l(pJ#Q_BuQN3UPKLf)8efnfHD3eZ2Q&;bg&k<hmB{xoX`XT=PG9
zp6S)Ot#Fh$;&*D%Ts|gEmP1JOq(pFlQiL$mWMu%Em|$9_GU?KIFH)YQ2BAd0*E5)v
zGjJd^$&9{}U}i;{A%u|gPvcNT8`2u1v{NfFs5HSfxEH^Im(WM)NbQAD=pE;RB7-$x
zIh$<K1|oF`W+piqrY^Y*vz|h9lvi@us+ZW(ogl(E;F*)S<Vf$eNImjSF)P3bKSz)i
zy_tg4&%zj|koteEvgWDHDfC15&%e&S9|D^Q3a3HgRQ$78C0kY*W6K(^sPoIz$e4K)
zuy~bf11)3O$6JJCP^Dkm1_|5HYN#L9w~n*b9S?fV&Gn_`XmnJ&(~BQ=oAHy;s2e?R
zCc{y$CFWL=Pj~ZfZbUhLcXM6+w4Y%|?KmGBH~8lwH&0%kmO0&2p}SaRu9@r)_YTLs
zIG&4*D{APz#k%_Kw#^;AP>!yvw)f#;v7%sKX7&Y+c!g5~4b<?QFz^gos0mf^&l@#t
u2yT9<j^Dynwdc3pTa0aq$l(&Ls*|9uKKlXQR$u)tK2WV-2`{O;!TukE+LT}b

diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py
index b8bec94..80cab55 100644
--- a/src/controller/passportFormer.py
+++ b/src/controller/passportFormer.py
@@ -41,9 +41,12 @@ class PassportFormer(BasePointPassportFormer):
             return []
         
         system_settings = {key: value[0] for key, value in self._params[1].items()}
-        Range = system_settings["Range ME, mm"]
+
         tesla_time = sum(self._params[0].get("Tesla summary time", []))
-        useful_data = {"tesla_time": tesla_time, "range_ME": Range}
+        useful_data = {"tesla_time": tesla_time,
+                        "range_ME": system_settings["Range ME, mm"],
+                        "k_prop": system_settings["k_prop"]
+                        }
 
         points_pocket = []
 
@@ -70,7 +73,9 @@ class PassportFormer(BasePointPassportFormer):
                 idx = i+1 if idx_shift else i
                 point_timeframe = [events[self._stages[0]][0][i], events[self._stages[-1]][1][idx]]
                 point_events = {key: [value[0][i], value[1][i]] for key, value in events.items()}
-                useful_p_data = {"thickness": operator_settings["object_thickness"], "L2": operator_settings["distance_l_2"]}
+                useful_p_data = {"thickness": operator_settings["object_thickness"],
+                                    "L2": operator_settings["distance_l_2"],
+                                    "force": operator_settings["force_target"]}
 
                 points_pocket.append([point_timeframe, ideal_data, point_events, useful_p_data])
             return dataframe, points_pocket, useful_data
diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc
index 07f1b6ff177212dbafaad412e93ebc6c324d56d4..47c95e85e0984d67a8ccfad8d3d2ac8f0ef5f600 100644
GIT binary patch
delta 1722
zcmYjRTZ~gh7@nDPPVe{awmrMO-}c7Ecwq%s0RtpP0w()F(tx$@bfMj)EvHB1GLwA(
zr6{Z5Xw)e2)I<#rqGWl(SK_0_2V=6v_+;WGF$P|IK=Gf`f}Cdl`TpyC|IBoLul)6V
zpzZg25PYuD7Y={C<60m?a7%0=`|x(b$vb$57*QU<JH=_GAeze8!lS0=x6s+MY9&h_
zue<9$9Z{{GTU6;*x(%#(O6pqELA@aTV10tlfwf@A+R-weX2A0#eF{89nwdvaPp_R;
zKa1nrqL93RuZS;`S-{^VXM<OWaTv%|v|6XLeDaEjr>66-fx!rYSdUbXHVmU}RJ%tS
zi)NM9%-T(`-xdq0&8Y<q;JwcYzyU*nVe}9Z$CDE~8S0@pnny-KT7y!Ym%?7aR^=+j
zB#0j*cpb#4$>)~a=79!1TsJp~Ka#0A<AU_9N@3^xPtW@RuWzOQO<5rJV1aX~bZ`c&
zZWxkVx1xyashJfARdmGNOl=ZN=_Bqj)gEqYmZOi(;9ck<K6K<D;a(U%?gx*P`KY>z
zK@adC^HUA7L)5{;Fe22+M_7oubYwi+!<LJ>A;P00rZQJw<*KPNZCKR_6{37}g^eCm
zd5p);Bc3qbmWRdrnCno)3q>xm1ch_wV{FWem^+H7e;n~~D5uf@l#S7#j+V6hS_m|}
z1L>&g<w+pmqv3l5ntqmqjPX9?N<4>PjflR2jH^S&S9{0`^wBPKD8y6u*^fYy&Qc(u
z1BvF)vCEJV1$s9iD#!vo#5{DguVPs;2KHM6Vmu8qP-5u>;u&Zq4p-72MLY{QF~BQ4
zXNFjsWm$&h&Zs=k@>bZ4SR+*L<35Ixc`Is0nxk}#I_dZ-v26h>#_~3jJ-{IuZlDrp
z0jBp5O-d@DCk8s~05mbA2aQ1V0TwlNc@%Udlt4>_7gzzzo6WIvXc5yi&75`7>@K(g
zXD~0CV@#(x;2Wg*SBMT)UTXP<z1c?q{S_gm07q3~VOE?)Jj^1j1apKHX>dt_>U&v<
z6~|Ev(-1GSG8<U}Dl5RH43{RxCywn0&f~yY9iCax=In)Z0_jZ_;FB$l1*{~S9QHow
zrU!W`roh4x<{b8(W)p1kUZuVYmu-qqGsViVfXqEswDDAbD=3hjh2ZHvf$g4b=B&Kb
z7Rfmbdr_pNvu=AiVilM&K=6>1g_XVQT6Zi}J4U-BKFV#`a%yz3Z7kHY3+<zwdaGMA
z8|_wh&+c{2HXBL!*BRqdU@1%x6|!fy_&&Emt&qJBi)j8+oDyH<f5Y3vCxuyD6h9Rn
zE4=}6>*_+gb8_89>-CO}v_^~8PZ$@aPg!m+h;s3QYsQ$6g)fO4#aYK&5(;sv_+jF0
zfECA{s^nGiblQ!US#8i0U9nnvclJkcc3%bI&|KI<Tv+}*I7vb<t3<^rc9AHKC_dr=
z<iY`5##tivmy=$P62eg|rDN@Qxrw#+q0aWTUnVw_jh_RYA_j%2;+5}ZwOc#dS*{x&
zfMxK0*>B!^pw5e()BB2-0IfS;wjaFiAi|EdA7Jgpmm16T8L>9~C@zU#r@t7J`(kf^
zK_rsv8FGE&ns{hq+-rmZ%hc}Q;+vVDHxe(w<gSB|e^rJ2LsW7{RXulNz8Fn=?AWPr
W#nGv?Xsv5p7dJOd;mhLB4eUQ}6RQUR

delta 1238
zcmX|AOKclO7@nD3JASRbj-MO9Ur9{eR8WYaq|igfLq+9)xL7G7FixmbQfIv=D*Z=3
zB&belMAa#rDzw`}D^3XIf`r5c#DP;$B@VeDAtW9r4hSwt@Q-a+Y5w{Df4=X3&Ft^5
z{nm+IHjEI#@2AM?8-K5S7A-OQf?Q(f>1iq0hx8el&`#24<yEaFd)hbWmb<}j#3J0+
zEwAgm&7a)UI~C5lzMh|lQ5xudil0Jnl`HHRt?;~rCr|SgJgM>0E2Mem(9`c{=s>=h
zzd@Vw`+OPozw+%^li3?sP{+5{?_avol&1@i(2;zrpw9OTC!|+Q#1;?`#HHaH{KDi{
z#bZOg$6U=LBIxKN+Vi=7kL=R3<R-mva+Qe?uCR#U$qa<Kc0kcKL=+-iw}^;wpD=O7
zxnImejL%raettyV01qG{Xc5pM;ORnlbnvOD7ak%%A(D_>)kR9A_sLLXoS++mv`0l2
zLxeEI&NS4{h`3>oAk7rk|6#)zHVYO?46U>kvb~NBoUgr$s0bJ%0zqzgIwk0jqW=p>
z@fa37hr5Z)xhxSm$ndx|Bz!hWL>`R<4qWL4$ACG=Lk<eNx+p@?jXE*c<VlZu6hju>
zxD)Hm@)Y;;^Z^_D3^xJAu{LSpJ1is#24qKsXH+3*rzSQ|23wdGmmOL-YP$#tC#^=r
z%`Dkuq68)TPbYJYtW$3BxxE0-oyBX}rK0R)Aj|VuYK#}&V-|WvWh*l6YuqLFRz^$_
z`>lWp<u(x}#G!(F9LhYlsbR(hRG^$ATSH7Ks!)a5%}F6uyvdZPZJ)!6vske{y~*gf
z;t<jq(jNsw)VF+KxE9o>eP_q5yo|g#&@gcvW~QCzpa%8-B6&K#frgj|&CP@HoFZ?R
z$3{cxNG~9G-eWlGdavk~l(o*TQJh7Im-m9>bj(H0M8m(LA}iH@<YH}E-mbM0HpTaC
zJ19ErrN`_%D)Q^vJsOgm^<U|Ne6`W06?xEjBDs%8NBWzW`&W(vyxZ+7P5#`t5m>O*
zzhYmPSLfUGefjzP9r^acN5>wZbMP(-zb`;TEI?7xJTr0EnND>YU`c9f5f-BI)M7py
z&`g@7A(Z;z+G3CTZX&mJ_@H@$(Yv==+2k#iC8mU_#0MzO$X4ro{W@w#GdmagM%Nik
z5M!)@9r@mP=i(*4EI)2NPV4ev>(i8K#AZs|RYIk)@5wvIEA&VC<?$af=}3CD7_#H&
ZZ^k?R{@NB_8`z)7Z<m_%w)|rW{sn&EGm!uQ

diff --git a/src/gui/plotter.py b/src/gui/plotter.py
index 756df6a..984eb2c 100644
--- a/src/gui/plotter.py
+++ b/src/gui/plotter.py
@@ -204,6 +204,17 @@ class PlotWidget(BasePlotWidget):
                 dataframe[signal["name"]] = dataframe[signal["name"]].apply(lambda x: shift-x)
         return dataframe
     
+    def _shift_data(self,
+                    valid_str: str,
+                    signals: list[dict],
+                    dataframe: pd.DataFrame, 
+                    shift: float) -> pd.DataFrame:
+        keys = dataframe.keys()
+        for signal in signals:
+            if valid_str in signal["name"] and signal["name"] in keys:
+                dataframe[signal["name"]] = dataframe[signal["name"]].apply(lambda x: x + shift)
+        return dataframe
+    
 
     def _build_widget(self, data: list[Any]) -> QWidget:
         """
@@ -216,6 +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"]
         dataframe_headers = dataframe.columns.tolist()
 
         for widget_num, (channel, description) in enumerate(self._plt_channels.items()):
@@ -226,14 +238,23 @@ class PlotWidget(BasePlotWidget):
             ideal_time = 0.0
             worst_perf = 2
             
+            # TODO: рассчитать корректный параметр range 
             if settings["mirror ME"]:
                 dataframe = self._mirror_shift_data("ME", description["Real_signals"], dataframe, range_ME)
-            
+
             # Итерация по точкам
             for cur_point, point_data in enumerate(points_pocket):
                 # point_data структура: [point_timeframe, ideal_data, point_events]
                 point_timeframe, ideal_dat, point_events, useful_p_data = point_data
                 ideal_data = copy.deepcopy(ideal_dat)
+                
+                # TODO: проверить корректность расчетов
+                if settings["force compensation FE"]:
+                    force = useful_p_data["force"]
+                    F_comp = - force*k_prop/1000
+                    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)
 
                 # Модифицируем данные для отображения гарфика
                 if settings["ideals"] and settings["mirror ME"]:
@@ -244,11 +265,13 @@ class PlotWidget(BasePlotWidget):
                 if settings["stages"]:
                     self._add_stage_regions(plot_widget, point_events, dataframe_headers, 75)
 
+                # TODO: подобрать не вырвеглазные цвета, возможно ограничить зону
                 if settings["workpiece"]:
                     x1 = point_timeframe[0]
                     dx = point_timeframe[1] - x1
                     y1 = useful_p_data["L2"]*1000
                     dy = useful_p_data["thickness"]*1000
+
                     rect_item = QGraphicsRectItem(x1, y1, dx, dy)
                     rect_item.setBrush(pg.mkBrush('blue'))
                     rect_item.setPen(pg.mkPen('red', width=2))
diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc
index d04ddfbb422ac1f70481748ddca5b550720c7f94..579ebe5a9a34aad62c9e21d3b286ff735ca6d9f7 100644
GIT binary patch
delta 966
zcmZ{hYe-XJ7{`6iZaST8+T5Jl=9bFToI~f#sohj0(jW-yTd6CSxyjK!WT8PsMj*jM
z7?j$@sOW>l@k>RiWp@A24a7^AStcq&GP+2#-sdc|4|NXw&U60%|MR}*Jnv#_=V4I!
zR4Qc{yUNu&_w-#?ozy7lRT35kjb^;8DU&H`BhD&tUgMI5i&a)k#UHIDW)2is7wgjQ
z_VG1tQ;n~_!R>9_)#UMcO=YD*PwXN<4|Z#fxg1D;aFL9^IN4wP#;L<e3reTCWDb^Z
zN@GBq5Igq|-4JJy%tQ?e>*9ET2^4f*m_oC@8fNe)V*sc19{7w~;~U{C4#$sx54#Qb
z;U~Hi4nYw83CCbj*qhh}AQKjnP60&Wabqj2KuES=rfECqP-U^;6;>ITb^wy_Afrk2
z_2zA0L9e+BQdz1Kta#1h2Z_+WDg_`5`%;=97p<ut$QLlRN(O~En{feF3+<V;5*Wn=
zTQAgJyqFF0el}))0I%9h;It61Zv@?4QtmNW!}&+-F)G>T_VPnmo|B;!(~rd#!UMuX
zY|F`mb3%X4j!?5z&fg^C7U3n~8QL5=d8iLJI}+v3NqvD{hYfm#E=N7U7)CksVHiuD
zH{dk}okt=^fMwEIusIFwg?iyqeh0v9EGn?UB-R%+<bI?@;u)+Q@1*(;VT!PZu##XT
z%rJbS<z`XiGJ+rNE)U!BjOzr<VOn8b^gNj*6pd!UWU~Q-E+tC!Ny;x|xtQ9F>!o^>
z6m4q#zLcij`7I3WpT*gT-!VXHHzAKO$iQZ~?2ChVLe>CbIr)^5a{j;mEAqLj%1Ra*
zqt<ak2O*6hZa2XyHW9IYOSLqVc)yg`5K{dlOfIP(&{CXbq!SMv+9*|T2=53Lga9@a
YXG1lfFCK>>Y+1Ws5v`6;r^h&c1Lfla@c;k-

delta 925
zcmZvaZAepL6vub=R(HDcs@t4SH(f5Kl2e;+OT$_Ql76z+FKM-Es8jFehb*uUK|%z|
zLHd$L1r;QOTnG%)bY(9}lu_BT@-1SSL`75*(R1#opt=`+&pGG+KhM4QJh%HOEVXGH
zwOWmgUB2j=1Mz*@4qn5tOd*qj--H+Was_u<jURcJwC2WEO6#%Mcc8}RIF}fV`wGy5
z13I%(xg^)%j4p`}%Pn&FbxYNi`XqkwpK6KTs#u5)ihK0}KnR~0d@zTb6869wyu`SG
zQARJk#}=a>K4I863H3OVcniK^d(sj3jw;h}_#&P(wFAgSeM%PqhrQ-D;4#Z`7~;`k
zwc?m%2N+mx#m%YPAQ5{~4?(h&yVACT1v}Gvz{;H6V8i>?S&)f+tI`27@o9Pha&U{y
z3r_K>ZMzDJa7ETR$PoLo_9<W&>K#|0_WY;=)PrnX!Vr$<xS>nrb2oxvm?|R-_T|DI
zwuBV*9-k1zy1Y!C<i0Dl5Jm~N@p4{1bc?fjJ7Fy~+torp3D*b{gmH$DqQUD6shR|@
zFJR|{WU5DY!bYb_{ebd^*y+rMUUAsjKqJjAD1;y$Ea;D#0H$UzOREj19SP_ztcAzo
zg~EP-0jw#`hH305ZmOQAO^gh7xllmyb;4^x5g~<OCWIO0Y16kXu**Z-exb3|<MVq0
zA(c1aY4Ed;kX~^Ht6g50#6i~y2xG;%I&P8L+^h|M7|JytD08u_70Z+fXe+6J&)8g|
zYm-JLy~Gexg)@YF!VLyC+CRE9g?l9Z<s2iYIx?mI>5oX4S5+}jh}xeMP7zki${3}`
zO-ZIm{E}j2#4=4j$+00)ouR_)@9G?um##6>4-h%SXB534ydqQ*77<Gwup4idPO*bJ
PyS`;vR16oB5$pU3PpbXm

diff --git a/src/utils/base/base.py b/src/utils/base/base.py
index de3d8f9..fdb3c5a 100644
--- a/src/utils/base/base.py
+++ b/src/utils/base/base.py
@@ -127,7 +127,8 @@ class BasePlotWidget:
                     "performance": True,
                     "ideals": True,
                     "mirror ME": False,
-                    "workpiece": False
+                    "workpiece": False,
+                    "force compensation FE": False
                 },
                 "Real_signals": [
                     {
@@ -157,7 +158,8 @@ class BasePlotWidget:
                     "performance": False,
                     "ideals": True, 
                     "mirror ME": True,
-                    "workpiece": True
+                    "workpiece": True, 
+                    "force compensation FE": True
                 },
                 "Real_signals": [
                     {
@@ -187,7 +189,8 @@ class BasePlotWidget:
                     "performance": False,
                     "ideals": True, 
                     "mirror ME": False,
-                    "workpiece": False
+                    "workpiece": False, 
+                    "force compensation FE": False
                 },
                 "Real_signals": [
                     {