From b6fd96bb26479621943577c82cdf38b1d565a01e Mon Sep 17 00:00:00 2001 From: Ivan Date: Wed, 31 May 2023 16:58:39 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D0=BE=D1=84=D0=B8=D0=BA=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=B5=D0=B7=D0=BD=D0=B0=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B2=20=D0=BE=D1=84=D0=BE=D1=80=D0=BC=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Calc3D.py | 8 ++++---- calculating.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Calc3D.py b/Calc3D.py index 0a5af1f..83fd836 100644 --- a/Calc3D.py +++ b/Calc3D.py @@ -47,8 +47,8 @@ def create_window(): [Sgi.Txt('_' * 46, pad=(10, 5))], [Sgi.Text(_('Время печати')), Sgi.Push(), Sgi.InputText('0', size=(5, 20)), Sgi.Text(_('ч.')), Sgi.InputText('0', size=(5, 0)), Sgi.Text(_('мин. '))], - [Sgi.Text(_('Вес детали')), Sgi.Push(), Sgi.InputText('0', size=(10, 20), justification='right', ), - Sgi.Text(_('гр. '))], + [Sgi.Text(_('Масса детали')), Sgi.Push(), Sgi.InputText('0', size=(10, 20), justification='right', ), + Sgi.Text(_('г. '))], [Sgi.Text(_('Количество экземпляров')), Sgi.Push(), Sgi.InputText('1', size=(10, 20), justification='right', ), Sgi.Text(_('шт. '))], [Sgi.Txt('_' * 46)], @@ -57,7 +57,7 @@ def create_window(): [Sgi.Text(_('Постобработка')), Sgi.Push(), Sgi.InputText('0', size=(10, 20), justification='right', ), Sgi.Text(_('руб. '))], [Sgi.Txt('_' * 46)], - [Sgi.Txt(' ' * 15), Sgi.ReadFormButton(_('Расчитать'), size=(10, 2)), Sgi.Cancel(_('Выход'), size=(10, 2))] + [Sgi.Txt(' ' * 15), Sgi.ReadFormButton(_('Рассчитать'), size=(10, 2)), Sgi.Cancel(_('Выход'), size=(10, 2))] ] return Sgi.Window(f'Calc3D by Risen ver.{ver}', layout, icon='logo.ico') @@ -86,7 +86,7 @@ def main(): except requests.exceptions.ConnectionError: Sgi.popup_ok(not_connect) - elif event == _('Расчитать'): + elif event == _('Рассчитать'): with open(os.path.expanduser('setts.json')) as f: params = json.load(f)["settings"] try: diff --git a/calculating.py b/calculating.py index 23f31b8..869bb00 100644 --- a/calculating.py +++ b/calculating.py @@ -15,7 +15,7 @@ def cost_prise(p, t, h, md, d, st, mk, am, post, x): x = int(x) # количество экземпляров except ValueError: x = 1 - result = (abs(p) / 1000 * abs(t) / 60 * abs(h)) + (abs(md) * abs(d) * (abs(st) / abs(mk)) + abs(am) + abs(post)) * x + result = (abs(p) / 1000 * abs(t) / 60 * abs(h)) + (abs(md) * abs(d) * (abs(st) / abs(mk)) + abs(am) + abs(post)) * abs(x) return round(result, 2) From d89ca8e830f87a991b6f50173c5e7d9332ce90d6 Mon Sep 17 00:00:00 2001 From: Risen Date: Sat, 3 Jun 2023 19:16:25 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20(ru)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/ru_RU/LC_MESSAGES/locale.mo | Bin 8652 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 locale/ru_RU/LC_MESSAGES/locale.mo diff --git a/locale/ru_RU/LC_MESSAGES/locale.mo b/locale/ru_RU/LC_MESSAGES/locale.mo deleted file mode 100644 index e596fd32b8dd9695924260c3d2372383a7d700fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8652 zcmeI1OKe=#8OIMarEmiX0WIaFUh|Nj8QY*lB0y<{K(J^*Azh?uDZzjNnV8^IE3EZP6L z=brOD{@>%AGyd1L+g^734D)*nzwch6r^e5~51hM(#~t9+;Lo$?Ux7d2`46B6p8>A} zAKn(_{1&`{=Vw8UFMtX74)`1JBk*=`+Yg(BT3Va5XzG+b7?}Jx@>!9TQ1C*S9gOd9{ z@J{e&+nw8oyoW%&f0IQwgGKNG@Kf*}@M@IwfscT9f#V=1y7$0i`1*17+=CEAyI~L$ z-F@JXz=yN(UxQHT_GRyX4@&MILB-)kP;q!CdoF^C!{0!~;d4-YpW~0>xdAE;{{%Ju zU;aq{<&dB_TnCDmL*P6(4=N5f|2W2B6;vF)1Qmy`5GK6ir;)eELGg7MM74VPs1%3u94%=^yakw7T^L$t2;T2GESOgV^bJ_SZs5n%!_n&|+^{@JZUkejq zHcW-Nl!3Eh%CGy9zvv5kT=Z+c5N7zb_x{hktTKPfm;EZEFZgm;aQ;Pq#-H|Y@LKqC zSL)yNr7(enSSm!mo#E zUkS6e4kKq|i!XE~a;T)0NHXyiU#^ddkSUxxAwvdIzZ@oVyhI$5!-8BZMaFEAjF+-h z7BXR0b7#ZzShW&Ap70gO&gdyfLJGk&(HK&KEGzI6uz^tdhm3AYSAHF;QONb>fS0gur4K6BsRo=hGgWo|zUS zq}XF;6nWG$}&#e_`*P%@J71V#CR2JOJt;SY+3pg zZyOGC3@dGvfDpQ+?M81~ZsV#WEvb=OjwnlH{j5n;?!q`(CNG-}t}n|Lh|6s9W{SeX z?j%w1nfOWb#>`DsW-))G&TuLdlUS08odtL*lQnU!*d=vp-04jIA7)FQ=yI_;s9E%HSPRb?csTqAQS zeGSCW$~@&pQ)qkByQwNBBQ=*8{UnJkt%L;$RW-Hnnr_M|#uXEBL)uJZ+carGJ7Po* zo|hRSMy<}=qRQcv!be9@NmO4tkZ3|wO&CgTHmCHb>DVlkjJ5JNKIjdvp{-qZm`CEO z@vuP;TCh|u+T3s110DTV9H~&taXB85G`?i7!b!O)XErS#n#7c&T^DRdt%zxJ8md(~ zWp*bHoIweMV6VDCb9pnYa?I+v(Tr4$W=bwg>q(1%F$-13yUKF~7AmAPw8!~Gf+*GN z{Gz6Y>4YJ?jI>kXsMOZ6uE?oAmUv5YweV0-msf}<%yvy!mo1~f4zRmfw^@dybF%DY3U@uS9pE9h78g%V%p_5b876 z9d)DHs)mzc&K@iiA+=!@J{EYzfC@ZXO?=~!G=5Vwv^8jHZ631d4ekCkX0_0a53vn_ zd{&-YL1+_Yo1IZ{sA6D15>>^UKtsa6U_bt)e*kO#Vi*!Y$j=Hmy#(*oabh6l>7j%nDWt$aznCni&zcyda z3t|bGBpHUqwVY*SQ6pLOE<0F6H;QqOS3ooBVsrV$o8FOCTpG&!x>*!WWL#Pd@dj zZ!=CphT|z+P2R6DO$5#>8~C)01v)CNsp$-c8Ry@H+6%s-5A}l>NyS`MN_G$O)C(`@Vo}RJ6;h~|SzWm^>p}vE?{XL@x`VRDs=Lbg* z_xA4}?H@Zjp6~7LJJvsX^Z<=vS>Vl^2(U>XqHdURzD`It+_WkEZqvbQC$GK{02 z%`59w!`sorO$yp(;aaO8m8_{XtF(Q7yR&_=e^gr3-`h@OVWDA)Vz-4iYD_V4S{o-B zn5AsOQ56+B%CzsxO;NE^ijL}ZBNc__Mygm>MA!*REFpKcutR(0Cfjqf7qlD&nh0B> z(@^Lk%{4$TRZnk^C+4&qV(^zXr(7A%?How5qZbV<>bJX>daCVwo7|_=_@;mlEH#V|6&5s<*4~{*(|Im?p)29yZ|I_$L{{E-N zcI_M*8csTwY{JpGWLwV0V@2nZO<6U4fz-KVcP`nw9d<6+w()i@*_}&v{I0rl$<|k! ox{uhm_wjDkxnysB9qe4PJD2RvC7a71|L193_B)sC@98D`YvKe;wg3PC