From 64ced613dd0de4e0273eeb975366ced08d2436c8 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 26 Dec 2024 13:47:26 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=B5=D0=B3=D0=B5=D0=BD=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=B4=D0=B5=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/__pycache__/main.cpython-310.pyc | Bin 1117 -> 1518 bytes src/gui/__pycache__/mainGui.cpython-310.pyc | Bin 10545 -> 10545 bytes src/gui/__pycache__/plotter.cpython-310.pyc | Bin 11673 -> 11785 bytes src/gui/plotter.py | 12 ++++++++---- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/__pycache__/main.cpython-310.pyc b/src/__pycache__/main.cpython-310.pyc index 0ed1f0b036fa79cf515654cce7f4b8cdf0e8fd5e..2d7228aab5d18fe89fc2a060728e2e1e72b39626 100644 GIT binary patch delta 878 zcmY+C%Wl&^6ozNUmpF;zI7v$jl-mX=?@+M-0h_7?!D==m6Hi^c<4ZjgL?uUAlr2bA zULe`!F?bCs!6UF?51dS#sQAdg|L^GcoMXv9oL_A(?{r!SuHS#oqosB29ZbIhg($=V z(e)Ek0!)OFn$*Oro*}H%rndH`XrvBxw6{bvZPAwYwrHm=b+vDZPU=xldq;FrpZeN2 zMKA5sKKNGH{*35=?}QEaoRly5;Ci{7-oPpfB{*Ca`9d&KWNs)ku@-oOlzoLJST#V2 zazG8$1T|F))KcxryuuS(xfQNRWmN{SHEC4#yt6G>%^l32lxgKPh`d3G8{CxwdhOwPXJi>WW;C<_FWDo|tjJSb^@T!ew* ztSIxSH*y=@o6nx-2y>CD~~#_>}IA#!}@e z8_ACh&MkwHVtFPmX}>LU)}>&AjV!$9%?#6b?M;1amE3!8uc0Z^ar AaR2}S delta 474 zcmYk1%}xR_5XU>+ZnrG^1>B7B&fOz1@dY%-TQ3`u-5_fV%9dLRCa8D93oIwkzJafy zhF98pk2Q!Cr1gpWZq-UB03#NCAq-{Yn*RDk<#QQ=Vp$ zIcCb&Tyn?03bc^IF;^`e%FuD3+B%YvW1(W5$i#6=r8<)ta#*yViR_f!BD$xu%d)dt zzrQV?umwXJFtqZvupox5$O4RyN)1Q#On}OaK=n<_vK1`22`yM^ee0q37lGwXdrN>= zRz*#0d6jIzxfEScWzO*?+n+JC=~&Wqw*<2x{`Hph;i});RP^yIt;eIuP~~-L%y=@Y zW&AL&?+$kJ?ad+H+_1rUjD6Q9C=u{u2*^M{LK6_QOJ^x=e~CQT!|^1~vBHjhTpyB? lp)T`$wtwfJB<{*UPm8%KF94k@BCt$EaUMf>q89@D{R1cGWsCp- diff --git a/src/gui/__pycache__/mainGui.cpython-310.pyc b/src/gui/__pycache__/mainGui.cpython-310.pyc index c6bb37f64f65fe6f69ff573639e6b5f25e8df4c9..de6e7c3d0867fc1de8f2c038d237e51a3c22646a 100644 GIT binary patch delta 19 ZcmdlOv@wV)pO=@50SML@Zsbze1OPOQ1dIRx delta 19 ZcmdlOv@wV)pO=@50SIo3Zsbze1OPP}1fKu^ diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index 5c7727a29e4291fc9c54904471a8556c71960d5d..e4d6dff65500eedeb0ecd31d27c9b6cf24f19d35 100644 GIT binary patch delta 1408 zcmZvc%Wqp%5QpzM_xce#cAYd%{HpD|{YcX~Ns|DAqCSKW2_n1{(grulxk;SZaeA*E z)bxZxX+?`#6fp~$O=_#EDjq=~1405M#0D1p1zB`a*daDyLmHsW*n&mHwdV8O-#m`a zjOC3}S5Le1E|){Wr_!IBTY2g;_nX||!Ph6z%zLoGFR~#BsY7fSuBq+tni{eMbjQMe zm{1Q~2|D!8h$Lo&M33$r(JgqWML#gBiG!jSqCH_cdMZ4{&cV_iDeMzJ<1w99WeW456 zwv3t1PML)nJ5J=^$B9lI+Ho}VON6wXP$pkqvrDa{loj-kuhmJV#H3xSvd*tajVRcE z9uBOmtvRH_ct$!(T&QKn6v;}ebW}a7(ELhCo0fKgm&qt)j^V0UQz$6w=Ke>ggG!cK zo3nOlGsY#Sw!&JgY^m0q<-&&7wioB&6ITSh9^JlbeOl;K*(j`f+73I7cD$DH1mP6H zM>s|}O_(ISN@yW;!uOs&TL-#!XFcqBf>s~nZ)iJ}K*I+tGD9hXaFkH3rP0-D=iy#s zC%as+??1y?x{~oq=3SuZA|Xr25tiV7^DXv1Y_=EHfD{1tu(9#Ofe!GqvXOHlU9zM!&%=dBIM0U2DZ*28Eh!XAel@+4dj z`Pn$!2|dQHR(=kRGM0l>ILOj48unS2>2`To4FAT?z$=jnls}IgV!iN7WQ<*e!RQ>D zhs|ia>m`Oa=9ukPRuk}Crw{6*^{^8?W}T%LbMR>EyNPLZw^g&4+jggm%VMgar_I7t zp=cTzir7uPFg}u5S~SkVPV4io0*dkB+O}6=tZl$qUC$CVoPqVWsIxl!^Ykv^>$ak` zwiXy{f1Rzt7wrXh84?{wt>0pXc^C2>8x{|1WPysa^LNfR;X${r>20cRB6tax5VMes zrC1&&V~M&nzCRmx8SlV)Y@V&cZmhSVT0+^|mg!<9D<)t#{vx{p*W+7_lpoiO5`Gys z33p&55%7FO?#F~J!VOqSoU{PC%kW*|gs;`uM>74p84ZYSO=M;Y#%%~C&nLIF>3lwG z(D15rGU(T3oFmY{jZMOb1b}ant?Wm*n>523=YKm?{+Cxr{Zq4QwjAND_3NB{r; delta 1293 zcmZXTTWlLu5QcZoUhFurbF*VRUMG%ovz<%Hr39%GK_o<#C`Bm|pr#?0o^|Rt33S&{ zOMB9U6i}!{l`s$~RVlWrN?epkmBj;n0r7-{5RX(5FT5fZ5by#mg)h%h-#D>7?t9Ve^(gZCqGEn_X5^;t73T5E>0{EI+qliv;2@gn06dIi>L8A*=1RR4 zuvAO4^fU`AVTDI5mFwJ}uHYt*zN#G$@hZzRSHl}DW6s4J|C1e)vD$ytH1W8s3G-&F zp0`+T-YTt4TKj`l6Fez1B0MEm(!=thON#V{jt`-0k0eMxpOP=L;=<0V*YQ?WysgY`mix6IC4>l%6UGTA z2(5%5R#f*U;?k`sbAtv94DiTXyQdj6`XL1Mz*gC>+Mnm52$jL&O7#XbPE+v=VUSQ- zka}bX32E%EZH2YsSnU*piQ>lr0fAE#$PnfTS;9Py1h2!}_9Q#~rf~`tU2sLwLsw z!%=ia55Y=tDEbsY7B?FrFo8P_A!CtFvVdPU+<_PHlg8sx_QwuD3WsB(u!>u;SxDpk zSTl@byva5=rCWHV>2hjHx_hd#w6N!!TzZL5=d4L5H=SE@>{*Jq9V_?zk<4P&K7+^N z$Go-_laK7b)w6gr-d|p7`@EFxY5XZ3D=#(mWtyMENb{1h-)`J$z5wSj(2|3Tc&TO3 zxFs{3Z}IDvZM6pKiVLm3Fu01-iID#_s`V2Bgf)p7d^6Dl3;1awRW>2#N0VNA9e+-o zg0ncD?5-}AQ1+favy_?V&*GKj7;NE>$(S5_=lYoXpwR@j}P>R(pzM>W@udi+zT`2v-U36E?A>vk5-K ykxr-1!`OYF%Kq?a>>ktEU8Z~PvJigLIRH_t>>4e None: + curve_items: dict, + is_last: bool) -> None: """ Добавляет идеальные сигналы для каждого этапа. """ - for stage in point_events.keys(): - for signal in ideal_signals: + for signal in ideal_signals: + for stage in point_events.keys(): curve = self._create_curve_ideal( signal, ideal_data[stage], @@ -126,6 +128,7 @@ class PlotWidget(BasePlotWidget): curve_items["ideal"].setdefault(signal["name"], {}) curve_items["ideal"][signal["name"]].setdefault(stage, []) curve_items["ideal"][signal["name"]][stage].append(curve) + if is_last: legend_item.addItem(curve, "Ideal " + signal["name"]) def _add_real_signals(self, plot_item: pg.PlotItem, @@ -288,8 +291,9 @@ class PlotWidget(BasePlotWidget): # Добавляем идеальные стадии и идеальные сигналы if settings["ideals"]: + is_last_point = (cur_point == len(points_pocket) - 1) self._add_ideal_stage_regions(plot_item, ideal_data, point_events, reg_items, 100) - self._add_ideal_signals(plot_item, ideal_data, point_events, description["Ideal_signals"], curve_items) + self._add_ideal_signals(plot_item, legend, ideal_data, point_events, description["Ideal_signals"], curve_items, is_last_point) # Подсчёт производительности if settings["performance"]: