From 02268f1f7b18941aa61c2971509328a6c0be9170 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 17 Dec 2024 15:27:03 +0300 Subject: [PATCH] =?UTF-8?q?style:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B0=D1=81=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BB=D0=BE=D0=B5=D0=B2.=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20=D1=86=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gui/__pycache__/plotter.cpython-310.pyc | Bin 12144 -> 12262 bytes src/gui/plotter.py | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index ab41eb5bcba0a31c60319a019b4590d1c22dc528..ec565abe16df2fade8de178e60052c8abf049ed4 100644 GIT binary patch delta 1772 zcmYLJTWlLe6y4c}?KsKCcKmGY*zqei&4U)C0)>KTr9M<#TIhoSP27x|Z0tD6?gm;q zCawB1w1u`85E7-@d?3LGs3?_+kU)qZ5E8T!;>UdOfmEpyA0VJekP_~!LmDe*@4a(o z?wLDt=hyu=ht;X}cDI0kpHCLYK7IUS^$RZ zj94;j;ns|oN>2&=Kd;Pw2=QOL?UsmrI9@hE%Ln^a3Vnv=}9G zXiu>+TY`5xC&EFDxm-cwB5lNj=*FLTRQ?-c{>R7!?Dr=~8s_|K;%ix}B~xixfWlgB z0Vp~sRVNMYiHV3BzN zl}M;0TXQf6B@uxsF9>=+{2WU4IPstycAaEAC}(qgUc}>aQYTi+1+j2FsuNtTkXQ88 z_-#1MsfuQpdOtd-?OOQh$a`oS9t1b4Y9mS1>h3j1&;(vulIymrE^c=zs_&vHaeVV&<4t@?c&#uh<+_h(%h4EOFd<`dKPe`u{ z0$hsr!eXqm`wVBCU7@Wk{38#YgZ}P;)vs~$^%aUu=DbGhuraP3G>2)?EPl_&FTknp z^<)IT>@JWpc;mZ?8^+>4kU!y(#D+No}4vL7%zCxWz#MrrJvXvb75 z#FDnaY8%7LRqY( zSn7O{=xfcc)51YQ6SU`qizYV-$H{S0OPgIRLQ@fesx*31j9|2uskX5o?Z9ggq-sP6 z3$-+I(h;GSVP2MAC)B*m$1?c!u{2f75=z_wJ9`3qhgi1O$%3`snH?xGiV|fM=*E>g zY>BPN7Lh&4)LO2pFx85&-11hN;?Ll`ZYE(KAGSbqt8w_OC$u%eRL-19V*@2vp4-Un zVL5gWzm6<7k+f3WJ1CwexX%pDp0M8)CR#Yh&LZN4?S)wKH!=qusl4MDKe(f?A+;56 zU_BMbH{$(NZ|K%P*!2y0OfMa7CCq8!D-ZFFyEyCL|D^jL90KiP6LdBEA?Ci+KLo646QKoBwwH|2zMG z&iqoocR+4*b-4xpl#0WL?{2v+f9WL$;Ep%pT*d6$gx8|*hc_D;V5DhdD;5Y5ro5`{ zMFC$$n!W~8JsIc@dKYzHiue?%C5>yx^_HzttI-nA3ZMJOLIEzgTp{8joy5b@O~g~u zU$8E)nGC~BAVK0VA6OGC@FEiHu!_jb1zuS$P>PlmdrPWSb%P$}=~^qa`t*cGD~3i( za60%zPZh1CN}uCjI)*TgumP?Y{qSQj5ZZMsyHSz$%4RZ+IY>R>0l0(LPd$sJ_={sx*+m_I8_H9h7%e+bH0)y(N#Q6%V9LEW)(P#Amk&P!dH=l%)!k$bdnVB z0UyKt#Z!?wAqM=`d)qU^z4QbELonf1beMd)SXk*HfeUEqM(`lyIoyIheS5Z?L-jlY zHkVp)I3oHag0OKqJ1F*x{@AH{>47CpOL+ zzNTM|ED)S1OEm+AZ!DP7InoR>nMLLVb>)IY1g`hA zb=IZ&A_Cf&NA0ts_p*QyVfHgb?d}oAMKjIPJV(Lky&#MbH5yanXI*Myn{bAlA!f$t zWf3(Q5mZ@CftlI9D+z(dFKW65R;wGr_G;oHcl*|XOF!NbI6n%S(vB0rZoIG6gJm~b?$IA(DyC*h;? z^ZdZwOUFqSJemHEmUOT-t+i}aQ=ya@=DtrdMUsRcGDD6!F4+N3WiOG9a3i~RHbX@; z*%0ug(_;ve9QJpWCu>Ie&}gMz*J^spUNy7{otDx6HiwpUs4;oGYId1+_0K2Fb~ zcOAlM_#*eX{0_PuN2}^#&7d=|l*@LQ=zSLfV0Hf{NBiQzRR2Em9^CBz*zq0r>F2@B zZ(sa6e}dRQ;QH3ZX9tR6;Tjhek*fT&zXNYkS+7h?)-*cLEstE&_qn4Q+Gk2P$Uzut+1Xn;Pt}G8?0XZyIb62yYtreu&Gw}+9N?u6gkrC z2;Go$`(a>k=9vKh&k^x~TNMA6ZQ^}V5|>2Dy(D@cwaO2zezZ!1U48IO;4UERz b)XS4A-u;frN?on!^fTC8RLF-gR%HJGUedTO diff --git a/src/gui/plotter.py b/src/gui/plotter.py index dc51106..8526ad5 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -121,6 +121,7 @@ class PlotWidget(BasePlotWidget): start_t, end_t = point_events[stage] region = self._create_stage_region(stage, start_t, end_t, transparency) if region is not None: + region.setZValue(-20) plot_widget.addItem(region) def _add_ideal_stage_regions(self, @@ -138,6 +139,7 @@ class PlotWidget(BasePlotWidget): end_t = start_t + ideal_timings[i] region = self._create_stage_region(stage, start_t, end_t, transparency) if region: + region.setZValue(-10) plot_widget.addItem(region) def _add_ideal_signals(self, @@ -157,6 +159,7 @@ class PlotWidget(BasePlotWidget): point_events[stage][1] ) if curve: + curve.setZValue(10) plot_widget.addItem(curve) def _add_real_signals(self, @@ -171,6 +174,7 @@ class PlotWidget(BasePlotWidget): for signal in real_signals: if signal["name"] in dataframe_headers: plot = plot_widget.plot(dataframe["time"], dataframe[signal["name"]], pen=signal["pen"], fast=True) + plot.setZValue(0) legend.addItem(plot, signal["name"]) def _add_performance_label(self, @@ -273,8 +277,9 @@ class PlotWidget(BasePlotWidget): 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)) + rect_item.setZValue(-5) + rect_item.setBrush(pg.mkBrush('grey')) + rect_item.setPen(pg.mkPen('black', width=3)) plot_widget.addItem(rect_item) # Добавляем идеальные стадии и идеальные сигналы