From 511325071bc47404f58564c59ffaf9bb6f48e304 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 16 Dec 2024 14:24:26 +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=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B7=D0=B0=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D1=83=20=D0=BA=D0=B0=D0=BA=20=D0=BF=D1=80=D1=8F?= =?UTF-8?q?=D0=BC=D0=BE=D1=83=D0=B3=D0=BE=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- params/operator_params.json | 6 +++--- .../passportFormer.cpython-310.pyc | Bin 4155 -> 4241 bytes src/controller/passportFormer.py | 3 ++- src/gui/__pycache__/plotter.cpython-310.pyc | Bin 11323 -> 11626 bytes src/gui/plotter.py | 17 +++++++++++++---- .../base/__pycache__/base.cpython-310.pyc | Bin 16355 -> 16378 bytes src/utils/base/base.py | 9 ++++++--- 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/params/operator_params.json b/params/operator_params.json index db173a2..f6437ab 100644 --- a/params/operator_params.json +++ b/params/operator_params.json @@ -80,8 +80,8 @@ 0.02 ], "distance_l_2": [ - 0.033, - 0.033, + 0.04, + 0.03, 0.033, 0.033, 0.033, @@ -176,7 +176,7 @@ 0.5 ], "object_thickness": [ - 0.0, + 0.0045, 0.0045, 0.0045, 0.0045, diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc index 32ed97ca2c3596d1a579f6ac1c4d99f84d5cf31e..5d8dba83f4dfd9e68c8586ca4ded23274d50b3ca 100644 GIT binary patch delta 225 zcmdn3Fj0{&pO=@50SHXE64EXBH}dgu@(BaE>_E&6#Kp5FYjM^vo}Rp%Q=74P@@3A0 z^4uwck_JSmyQC5d^-sqs1SMw(2wI1y4zK1P#&@l0V9p4`uSf&Uh7X>n>= zX-<4Wd`ewO5Er*i*5a&TJUDqdr#55edNMQ(O&=lN!lFOB8vOVthH-v9sr diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py index f89e7e5..b8bec94 100644 --- a/src/controller/passportFormer.py +++ b/src/controller/passportFormer.py @@ -70,8 +70,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"]} - points_pocket.append([point_timeframe, ideal_data, point_events]) + points_pocket.append([point_timeframe, ideal_data, point_events, useful_p_data]) return dataframe, points_pocket, useful_data def update_settings(self, params: list[dict, dict]): diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index b1df31e7796d6bb76de8b1d95f8a789f937f1778..07f1b6ff177212dbafaad412e93ebc6c324d56d4 100644 GIT binary patch delta 3281 zcmZuzO>h*)6`r1*ot^!kMJw%(q-9rHgcbn?jKQ%L%7q04hZuw@j3>Z)*dB>R`$x|# zNbyXRvT%U>RDgC4`KgqYN~OZZhwLE-E=lE>OH#f~QY20#RVJt8l1i#_$a_8fD8$;* z*RNl{pMJ03>*)vQ{$`}Q$z)7|zrQ5jUHs4N-P9QA+?^R;ZL5Y#Bq~wTiWm_wYDN^s zP%GAs8}W9+NQiZ%m29Vs6p@ZeG)&bS5>?k^BMq|%)nKMsskM-yQ}UKni#|e6Z`Kq) zGXHjyE?SNspFexJyL`f2>GmC8oj+k-vRZy-UO&dn-sNV)K5aFejrJ5=nu-!bFo|t_BIg!Bn7f|Dw;o~^P z;QVl-+k%vA@`T(h-$-ZqYWg6_^IxRjo5%t4jIZ=8bEzi#irII%zS8be3r;hLk)P40 zRg8{h`1|@hp!Wy85FCrJt>4SclM92>nQxJaNfblwec6|H?_s#P`-EM3!e;utq4THT z#OWS@S}cg+0y0blA&D{gs_mGImMu*95tuNi?)YJ=L+g$RFo?`TEq(CO&{?vyhR1UhsZ~VREPZy(+H8v_at67`7ju7I6%{6G4Xf(RmR z&s69<=r%m6(n{Y#t4qLr1kiQG$&oq zy}~WBu2IcR(0D;|^KJo9+fb02m98#;Mgla}_}$XbY6_?a?l4UkB(Dgg4zk6(NTx~#RxL7y$t!p zJ~k#+9rz3{bu8QVl}oL@<%gI>;o};<-lWcD@hLFkJ&P@LS=;P1EdJ4Sk$+g3*(306diG#TclW_?fP259l8L1xMHCbG(BY7LZR~p^kimy@2>LJBM=eBS;jBo;> zhVTLaT=JH4%If&x_7V)@GGh!^uOYmOA|boqW-CZ(Abjpbv$Mo*;OgfP-bbkNA5D(z z*oQJvkO^Kpwe3MD-$1qs*@Wj16IWT5Kb$Pb@g&(d5iap)b*gv)NxU)*^b?$CaOv^m z)x-OZWZ$+H`mK7ePT~6=e9!S#_vPiizD$>Wc?HK6Bg)`SRd2!rfPc3-w<^;7A{w7U zz_WpCU7V9hH9k-LWc^aV*`oDeo4*B?jaya28i~pH`ihY;S%*=P6`~ML&JsP8kYk9X zM6?jBfm}lTQbZ?N&_HgsOkyx7WCVV?Fr@(%1CB!EuVq8A!NRtkr1l!_0+V+-c&Z(S z`Q~pFPVWHh96XqsmiLP&2>UT`AQ%dR5y!ODZL{5LS?nIlKP^M{9hknxbG73&5wbXv zND!+XhzSLeim=GU0e-tyS$zfV6VXO6v~gBt_?%{Ogam*ecKYDa4==R3rW2G_2KjQ2 z8c}?T9c3oG2fD~pXtUu!MLCQ`(7a^&m4?)h4_ExSsi}<1sUZJY9(u4ab2qnTlnHfH!fgFn>po`D) e?Q65}?CZCzLwKp!xC>3nL&;$oCFGQx4gVKk;L@i6 delta 2951 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 E0a-|-DgXcg delta 1722 zcmZ{ke^69a6vsKs?sFGoVFB4+EDO6ExPUA>2qcS;Mg37kGgzbj;h53pAitc)_6In^ zl$8*v=}Dw8%&-(Aom_2nEJbIqv>CISX>2P~?1v^%jpHz*jdZ_v8DgyV&3@kZopbKF z_uX^ez1eZO!`K`j9~UEjwe;l5U5h?2_L?Y_cbh6>4cm46hiQSl=O;ZZ@9jxrq~rSJ z{P3=1BPk7HoZ85TQ+}@M6*5kvkfIfTdFgLy;xrV!w6`<{4QX#{bTc@iNz}tOsr^;s zoEgdEbL~J}mZ#_^ zeo^o$U$Ho-n-lFReAbv8-z5eNYE%a@bh9ZdS=TM(Z(L(-p+EVQHCK@{JkJwW=aSB7 zFd|fFuU2(KZvcvcjj+yEbD{Hqc|ZoR9;g9qz+ymV+Qf}EKds^&wr8{$&udfdJegoN zc&FCITxrjs2@cwyrmb>~UJ-VaN9{RgMjDKY&VQd!VpUt&o#vs}IA3w-EW&hySEUV6 zCz~Au)Wb&|B@`3B?$FcRH5l0nv;%8_)dF56qElBitqiJVFul%hrz`ml$n5~$Izn~o zTfEd+K(n~Z*+B_RnQqR@SV~D8?{@PZq2>r%D_MArpk4YcuE!~zn_T^rDWd9WKexL5 z{?b-Z#UJabDwpR$(_+cwEYUq&pz?-Jzh4 zw_|vdC!IRO`#d@#FCV-+L_YRrRVg1L@Q~PZb7CP0S&8SVjz9}lyY(7%U3fSvUZ=bO z-%GMSsC5Zn%k|Mgw&!IjuZm}{fj1=DW}6Wui@zT8>%!uBE^o}UN>#hrWDSqxJxjEM z1Nk?om;Jsow2lAry-Uk^pkOie^F+ar@-ea;<3WEVad_N+KP?%C<%ED&uYMwKk=TY{ zlX?RLkT+ZZ5sN*`^1ne$Uvj{zgVDef#RroQm;!Y9Z) zEG(ilhv7H^d;xsMz9O>{9miEgY0BrYp5vw>AMNG-qIII>3{uS!mn9TT`i`Q z+Z{oY=}$2_-M2C*s=tTUMk9Veto$se4xWoJT$;9yLTv`N@Vs)57mXS1n)6WK0T%#N tQyl~33E9nU9WnPo^cB<3U){SEr5qu&4k diff --git a/src/utils/base/base.py b/src/utils/base/base.py index adb572f..de3d8f9 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -126,7 +126,8 @@ class BasePlotWidget: "stages": True, "performance": True, "ideals": True, - "mirror ME": False + "mirror ME": False, + "workpiece": False }, "Real_signals": [ { @@ -155,7 +156,8 @@ class BasePlotWidget: "stages": True, "performance": False, "ideals": True, - "mirror ME": True + "mirror ME": True, + "workpiece": True }, "Real_signals": [ { @@ -184,7 +186,8 @@ class BasePlotWidget: "stages": True, "performance": False, "ideals": True, - "mirror ME": False + "mirror ME": False, + "workpiece": False }, "Real_signals": [ {