From 4262450df197f9a8f42e0835ee09933f78eae94b Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 9 Dec 2024 17:24:30 +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=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20(=D1=82=D1=80=D0=B5=D0=B9=D1=81=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=87=D0=B8=D0=BD=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D1=81=20oncoming)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- params/system_params.json | 2 +- .../passportFormer.cpython-310.pyc | Bin 4048 -> 4116 bytes src/controller/passportFormer.py | 5 ++++- src/gui/__pycache__/plotter.cpython-310.pyc | Bin 10658 -> 10616 bytes src/gui/plotter.py | 5 ++--- .../base/__pycache__/base.cpython-310.pyc | Bin 15997 -> 15997 bytes 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/params/system_params.json b/params/system_params.json index 54497d3..1328fb2 100644 --- a/params/system_params.json +++ b/params/system_params.json @@ -51,7 +51,7 @@ 0.075 ], "time_capture": [ - 100000.0 + 1000.0 ], "UML_time_scaler": [ 1000.0 diff --git a/src/controller/__pycache__/passportFormer.cpython-310.pyc b/src/controller/__pycache__/passportFormer.cpython-310.pyc index 2bbeeec47a11ebec04acd3ed970cb586397b3282..95d7b18fd9015588186f79e7290adfed9d8b4385 100644 GIT binary patch delta 540 zcmZ8dziSjh6n<}ZZ*O*Xc6LqT={5cW2?y8MhzS=AF-=6%L^DfjeI5j$n| zb5UxiXQB?UB(5Y*X2&BobqWSJf-?SVm6y(JjyV5s-^EQ}6J~1EOpS_v784hYjWfI{ z>3I|0aClurIBEodb)QeT7bzd3Hvi&}%8L_4@dpQ9V}vUZYI^!0^R{=Ljp zlvLDV+MqXjP1g7FV!wAcr!RW5o}J--E2ZUlH`)&S_VHeRuiq``b$rG5xTKHq#ha_u zfa#P=d|PDXmzfq&qK~IVL-=BjaY1OIP>bM~^cBvI;f}-<+t^@@LjN0eObgejYpya+ Yl6iV>Qrx5uW*>K`owRY0?j(=?0CKE%PXGV_ delta 451 zcmX|-O)oS-5XY-}XLe_Lrh7zK_TnLgY~p|m2OJ@^0T_rJ+9XL%(7+J zs&h2qR*ssroXOO22G+LD;S@?3=0fYlF;Kx!6rdrRFavdr9pf0QEMnI{!!d3XV`(Hu zxd#xfC*H^c#9mE?P8|_;T9|n?-?*WBA!5&XKQZIL5i*G|f{EHpniL?>Gxk3)^ipOg zEVMhAb7Map&QFIE|Ho1$+t9}6@~WI^a@qYcgC=Y2Qf3K4Sc0OWd-+P2c01jAt2j!& zzhJ+A@%d#oMgDBtByS{2))NJZjI+$qgFj7qwb=5K`&X@Pl((x<7xSW~idv&5HAaE% z>rXS&q+$LXV5^R>w4s9*c8a{PM60l9MHl1{=J_ts`lMrB#3{PbldK=Q7w1U_8@NJy L!65e0b#V9%wkKvQ diff --git a/src/controller/passportFormer.py b/src/controller/passportFormer.py index 7d9bb3d..8abb3ba 100644 --- a/src/controller/passportFormer.py +++ b/src/controller/passportFormer.py @@ -50,6 +50,8 @@ class PassportFormer(BasePointPassportFormer): time_is_valid = not dataframe["time"].isna().all() if time_is_valid: + + idx_shift = True if events[self._stages[-1]][1][0] == 0 else False for i in range(point_quantity): operator_settings = { @@ -65,7 +67,8 @@ class PassportFormer(BasePointPassportFormer): ideal_data = self._build_ideal_data(idealDataBuilder=idealDataBuilder, params=params_list) self._ideal_data_cashe[cache_key] = ideal_data print(f"Cache miss. Computed and cached.") - point_timeframe = [events[self._stages[0]][0][i], events[self._stages[-1]][1][i+1]] + 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()} diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index 3d9b74dcc03cbb06a099993405928c2d8c73db27..e3db1556821ed38038124bc27948d6c12714e4af 100644 GIT binary patch delta 1978 zcmZuy-A^1<6yH0$J3H(*EMH~iV*%M6ODVLp1&V7MP=q2hfJ8U8(}5Y*X=iuIo!LSo zl|%z&8PVbG)9eyF+P~+J!eYUqCEV#_uO-S=iJ|% zbNAljUkkBHEEe|hzx#hL7tig++R4i9(Py6Zn^LK+P*(~U!o;Wfw162YMGH~loAPNv zO?=y@i913e#&;o2;yX!??)VFFjV$`)y4}ylc7J&&#yKmEv#&|MMdC}yVtEURNF++A z|&tQ2_5=umU!EjKeXfAxy~-#$)n4Hx`1MO35hWKXvnPSTFY&VP8eg zkyFl}krQM)4PXmh+SW^QkYdhL5H<<$JirS8PnPMX z_Ak9!rPp=E&~(*=2n+m@Qo#8>q&H<83aqnt6&-; z4wBEn7DRA^s}+;WS5pn!N*p0e?32W4(!#z^w3B7_bK>a9EpjKI33mzc*}kj1$Dp%5 z5N--v!X1&Hh3@*`Y>R9OYXWrH9BpRLCDWoO6T6b^lO(UYB>OPg8IM`IJz*N_OO<6q z-(X)P`!BRWL6LPXpt50TMcsBqQ!naet+qVysaK4$VJkJBtK5uIMTNK!Ct)X3|9}kj za4W{{39c|ONI``?Lc!Ui#D1$A=Q;Gvb(-H`;nYi4=izvWgBm^u&D9qBJsG6o=)T7z4%FZ{bIg&ZZ7p=*M?Se^X*kDt- z7r)>&pfdsB;~kczm3`UNO5SvCH|5EzFMfQ0;1^w4VQwvCb>x0{f%$qUgOCY^JNPYXAxb>3J97WIqn3 zIc^QIkGn=A0yy~r`q>X%BV?S#GVQ}-VAuiZ<=`f{oUbgX<)S|EI-o{Rg1L@Q#jJXx zQnlrFnq`+W%_PODnO!o;LfuotSjsSv^Z`J2t~_=LmV?)bDJxaO)E>>yx6WJLRU)6? zXJ7E%?TP((?~_9yz0D!)boJ&05@*wWy@`X{-Qq_bY^!ft#ys!xtsC-&)bbeK0|v|= z#Pp5q*S-un%aYl~o;o;#9~c^ez@S}SH+46-W>!>t|4o?6=H%nxf5S>HT68<9{B7?zD6SXlLVfh#^AqA_NAi$ delta 2048 zcmZuy-ES0C6rVf0J3IT;-DUf=Eu|lp?M@q7N=l)ntRlr)sHII(&BcagRE{3^v@GhE=F`g517$PtQf1ri*X`=95fS^hGGMM z51GkIs+c0el%Pv`_#;6NZ;8b;NU|OQDPp9y0>uM5SrnA$_TBMlWPWPqa#=4K&h`&K zNl8dblk5vpXo3#6wqZS;6)cMPOH=?m8~kx zfXWNnhPgs{z!b{zgsD}o=vrX_BwGZC3m*)!dHEn~3uj51jf6jL%7dC7K)@KZ5uu4a z3ZLrXfpRGGXlZqs8k%FMRc*Cg(j1Fs+yVJE8RrpBpxsG?4ggPD(U!r2j-h58!QUso zVKh1jFyuaoP%_N@dGc35Sq!bIm2#Cow6z!A4ui!w`#km<8Fhb)9V43uF<3hSHb@E3 zy+XJ`r2U}x;&Z0uOlpoc?HCm$M0w6pbUTOe2Er7=^JRLO-Aymo>8hcYbwe}J*lqww z$wBvKVu|E?Kv04-ivga8#{pcDcoFm{6O%nBhEWstD>#oHd&w`Lh)wW9%a#f4+gA;H zJDDYySUovPTG_YB4l=`jOb(oPg!h9;J6*mb-Vis$d!Y?-Pr5JMCq&pF8{&!xw2REr z7Kpm!1#5m;0^-C%{w66}VF0GcU zWk;<+Pt|Lj$p)xx73nJgaj_8SlM=5T0htTC+wNI=JBkSv>QdqDE+-?rJ*3r@}K%l2mSolDyn1Eht0f2fySV1FLE-pB29$f^+kxVeI# zUUULWUbZT=!ee%)^F84HU!8N3e`m1Cu3Xm;R*MG!1mm;)%$X{nmDsJWu~-<5a3JXs z_NeP5InBb|9kElW*g`nWhPs>kN8r_q*oHHsty^_R>F@*IM789zonA-tMrL(ylXHyp zOpWkTj-$2@0kcEaY%O1*6APe{n^~5pH1woekW;Ujh8J2fEzQ}z7|!(Nm7{3F`-ayz#Y>rn5Z*-KoKE1|9J|{$o8`ss z0pC#?mecH?zIRB1UCv*VP*yVR*Zf$rA6~sswO*;Mdt$Z5(n==XFt)?E~RNo#vJ(3r0BkHDxS3mK7nw@)lH*7z{1AQoGdgFIUti1d|UCdY7G4cLolpF diff --git a/src/gui/plotter.py b/src/gui/plotter.py index a1dfbcc..235a451 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -3,9 +3,7 @@ from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel import pyqtgraph as pg -import numpy as np from typing import Optional, Any -from PyQt5.QtOpenGL import QGLWidget from utils.base.base import BasePlotWidget @@ -104,6 +102,7 @@ class PlotWidget(BasePlotWidget): # Оптимизация отображения графиков plot_widget.setDownsampling(auto=True, mode='peak') plot_widget.showGrid(x=True, y=True) + plot_widget.setClipToView(True) legend = pg.LegendItem((80, 60), offset=(70, 20)) legend.setParentItem(plot_widget.graphicsItem()) return plot_widget, legend @@ -198,7 +197,7 @@ class PlotWidget(BasePlotWidget): Собирает графический виджет для одного набора данных. Параметр `data` предполагается списком: [dataframe, points_pocket, tesla_time]. """ - widget = QGLWidget() + widget = QWidget() layout = QVBoxLayout(widget) dataframe, points_pocket, tesla_time = data diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc index 9770f9b67ff69538dbc478c31d488f6842b6513a..8c98d9201f9e6eea7a9fbff3be17468aeb6eebd3 100644 GIT binary patch delta 19 Zcmexc^S6d8pO=@50SIcoZ{#Yr0{}=n25$fW delta 19 Zcmexc^S6d8pO=@50SNS-Z{#Yr0{})B1`z-N