From c3d976f6a66b1b3da0e2bfb7a87c8357ceb6ddb6 Mon Sep 17 00:00:00 2001
From: Andrew <nazarov_a@diakont.ru>
Date: Wed, 18 Dec 2024 13:52:05 +0300
Subject: [PATCH] =?UTF-8?q?dev:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=B0=D1=82=D1=8C?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=B4=D0=BE=D0=BF=D1=83=D1=81?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/gui/__pycache__/plotter.cpython-310.pyc   | Bin 9619 -> 9849 bytes
 src/gui/plotter.py                            |  15 +++++++++++++++
 .../base/__pycache__/base.cpython-310.pyc     | Bin 20004 -> 20032 bytes
 src/utils/base/base.py                        |   9 ++++++---
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc
index d6427a321a823af462887d7179c1ecf6b49759cf..523d4ef97560c63726d1fabb9f47dde52c43750d 100644
GIT binary patch
delta 700
zcmXX@&rcIU6rQ);LW{tzc3XDYLVs?zrGN<+_2fY=Mxu#=UbvJFZOV@lYdJvPq={hY
z(PW4ToZ196#tWtwPo6w^@!*XR4&F@s2RPxI;w1C!_uhQ_-uGtYqsxWSt&x!-MyvX9
zrMh|V%jnOjF-u{Xc7XOPOP7D6CHN{I$CluE?<DpF9wZ$078(zEQh05~Qx4;X!$k5w
zHywsan~4;T^AXC&G0si&Y-TZ$CLTi1V)Db77fE-a3&1eji8do^F&^iJyclzhl{R#2
zG|_D{)OkjR?1@&k-}4k>&2b#u18&-ET@yLXk&|}QJzy2!9?$KExIfSKU=M`fbkXH`
z<&ICh(HzQ(e0>;gt{mFRGr9ChQy`aljG%vqi3nPlr>})RH`W7G{XOQ<A9q=unu-Dz
zFuJbBKgEKGqAjN6H#^n(j;1KqgJ^apu-G5!7QeRqn}(Uh0F}2e+|_|moWLn8;s6@_
zhQqr0vL>d*3<f$$G}XT^XZw6waZ;y9JJZ$ZqKa$jPDVu)?Eq-tDPG(UD^(1&P8I|G
z#v1AvtOTC1!gR0cT)^Gk(aKh%yqYYP%iE1od8c}Oq}HeVXM-<RH+ZdHE$9uP$NqCg
zaLwk3$*1lCT*@<dA=uba@$L9A#CkvCRe;&v+++sAq0KE`tJGE-axpOvLLL#G$cw~c
zNYi0hGa=MVCzmxil&!RFwN!aSfvErqJo!1jcC&w=a%aJn?b-%+WiIn;;82O)$*asc
T?8@`(47`>@UL203?``}8@i@8#

delta 561
zcmX9*&ubGw6rQ)cX^c&>Ynxqn^P^3=$!?N19`&eTZiaeL5sD%y)1+<Ew5IW(ydj4~
z(u0U)K%{ush(|Ay|3L8U!J7yF0O>&x1i^!E<G}mguW!EhhWXQww~~j6#6?EOdAr>{
zzxpxx#nfw*#>iB%<FP8w%_bblP3s;cXYZ}sU@kfA74*|55ZGv7=7gcfSLGW!H_XpF
zyJ!v47##sOY}Qdk2}{JkG003<3wVLAjW2Mw&PFf-;SDmF;YEjWo#&n_4poKUi=)jA
zhY{)yvzhRSQ*xN_aT&d9Oe|vxeex;vxZY7o{UQ43r8BHYLq!?OXm-LScd;x?v_(a3
zI)x#kA*#Iy8bJ=LQvilb{Qt^l^q3V?Nj`<KsRoSlRjgnY7f|Pm4x4HZ6tONgPz~~E
zgm)ibnaAs4OzZ-2H>L_{R`=HeH_Tef1n9vY_s6l2WuX!jQJoJ~P{T+|y~8TynU?+z
zGM$~k5BV<Jh;2ph?{xWIuPuLN&mcN`nQH^oX1`ZlkZ%4aJd^Ew9bU)}`MWc_&`@fp
z^idV1UnjS<$eV-aqvPhmQFo`0RO#y>7$H0*u;i(`e`($bYu_T<PxiVzF5|_o3!zS5
b%In@``M3BPI`UJg21EI?l!eza;dTE35LlF%

diff --git a/src/gui/plotter.py b/src/gui/plotter.py
index 6abeaf2..23d5a5e 100644
--- a/src/gui/plotter.py
+++ b/src/gui/plotter.py
@@ -222,6 +222,21 @@ class PlotWidget(BasePlotWidget):
                     rect_item.setPen(pg.mkPen('black', width=3))
                     plot_widget.addItem(rect_item)
 
+                if settings["force accuracy"]:
+                    modifier = 0.05
+
+                    x1 = point_events["Welding"][0]
+                    dx = point_events["Welding"][1] - x1
+                    force = useful_p_data["force"]
+                    y1 = force*(1-modifier)
+                    dy = force*(2*modifier)
+
+                    rect_item = QGraphicsRectItem(x1, y1, dx, dy)
+                    rect_item.setZValue(-5)
+                    rect_item.setBrush(pg.mkBrush((0,255,0, 50)))
+                    rect_item.setPen(pg.mkPen('black', width=0))
+                    plot_widget.addItem(rect_item)
+
                 # Добавляем идеальные стадии и идеальные сигналы
                 if settings["ideals"]:
                     self._add_ideal_stage_regions(plot_widget, ideal_data, point_events, reg_items, 100)
diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc
index ae58136176090f5e5177b81b12f7c9dd40460b5a..a931dec68ffc26b70d69814c015e91d93fe50438 100644
GIT binary patch
delta 519
zcmZvYK}gd97{&KC=hm7_XIrQ&+}1>gx;a+Fz+q}@Zl$GU5sT7)7P3g3hM2~LEJ(q?
z2hw3Ph&1RH9|h8(JOvd>bWzH{3MC4pOGQESPdaqy`{3jKc;Dr{I~hF5z|xbKXVR!+
zyW4p#-FDxSEii3WQK!+MubdAGqI%<*Eg9pawN`KVBUoo``Ku<apJ8OW@W?jH*`Acr
zRobB_7gHU|pez>t0PgXb&6%r3&UdYu8@3YLy4Iz|zq{!;>?O8O|8?Sax9+3)vGm$g
zz>0j>@e){*heg!EBr!)T@I|sa7XXW#FAV@L-f~W%n0s8asN#w%0gr^-Cjmci?ixji
z4o@e-98qsQ-+Q_d;i0lV#ALo~2uQKE{51}<sA3pxoT?Z@JDuJcG|N-(7?6<G%Iko_
zH&tmQnW!GZ1)i>P^Jn#O^s4OUfUh0>T<{HIV3U*nqqxL*|1>VEpIMCXSIs+|kkx<(
zxJpB?ALASjcH@Su1&`@LhC{b8DyyOGId~*r!~1{@*;}^=d=q2+TOe1~8)g9qC-%>w
zlF`T&_~b=o32L~R=(HNHv1tMUzG@mr15d@0IKbzzX2e+>PohPx#nsa0Wcgqt3|;x=
Ie6Mx)ZyEfdEdT%j

delta 549
zcmZWm-Aj{k6n>xI`;M8LGG9wg=wo}`a6_97S7eB*mQ816>qCu#wTo;Fv{Z=Hh@ua(
z4}t?Bw0R-sMR$5Cl5X-JDC#N-BN9qv)J;(%%zk@s5;_N-hjX6i<~ip@8k1=h_ZAfu
zDzc_CiSAr%x;Rr(n4eWeLBEThltk1uX)6i6(d4jx(Bv^a3oBhKJ;a|&bHF5hT<45y
zIbjpf{s_w|{3#p-`Q3`PD4YWSI`1|Wi;2I5ef6Ye|94Y&nV~M(=lD)pAMkFb;x(|q
zZ`P9vE1%vF1HSU?#+QJNM>Yq5P4wJ(ALSHtO~FSw*9o}zm~j%QrN>oQv7L6f6WB><
ziA}WPPGS!wJ^k3n^PVA~m%6IoV?PDG!)T`&?<fvaqwgW2yx<!Jy11w2CJ?7zwU=;)
z&iV~{u%#0z8s2J9xxW)Va(4meXi4ILso$tOit{vIH;zH+%HSeZ20o#KmjiC#3K{hS
z7@@KHByO_^c35zajyFu;GA}o*)$ok<rd>dmkAz+U-??h{2S8;tJOxzJqrI~>uTYe}
zYWcfC4~3!?biMf$YIw2vEo9WW$heFeZ@CLUeQUXe5Dm4a5T-A!2N0oc(G=QvA}UY#
Qlz+5^VNE#f4xb+U3%muVlK=n!

diff --git a/src/utils/base/base.py b/src/utils/base/base.py
index cf016df..7b9a6a7 100644
--- a/src/utils/base/base.py
+++ b/src/utils/base/base.py
@@ -125,7 +125,8 @@ class BasePlotWidget:
                     "ideals": False,
                     "mirror ME": False,
                     "workpiece": False,
-                    "force compensation FE": False
+                    "force compensation FE": False,
+                    "force accuracy":True
                 },
                 "Real_signals": [
                     {
@@ -156,7 +157,8 @@ class BasePlotWidget:
                     "ideals": False, 
                     "mirror ME": True,
                     "workpiece": True, 
-                    "force compensation FE": True
+                    "force compensation FE": True,
+                    "force accuracy":False
                 },
                 "Real_signals": [
                     {
@@ -187,7 +189,8 @@ class BasePlotWidget:
                     "ideals": True, 
                     "mirror ME": False,
                     "workpiece": False, 
-                    "force compensation FE": False
+                    "force compensation FE": False,
+                    "force accuracy":False
                 },
                 "Real_signals": [
                     {