From 0a32e4baeec712a5463c21f98dd264c7d7f267ba Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Mon, 2 Oct 2023 11:13:28 +0300 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=83=D1=8E=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BF=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/version | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 scripts/version diff --git a/scripts/version b/scripts/version deleted file mode 100755 index 6a6e7f1..0000000 --- a/scripts/version +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -poetry version "$@" From 0779941dc9d9e83c35aff9f07a563da31e5c62c4 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Mon, 2 Oct 2023 21:23:08 +0300 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B0=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=87=D0=B8=D1=81=D0=B5=D0=BB=20=D0=B4?= =?UTF-8?q?=D0=BE=20=D1=81=D0=BE=D1=82=D1=8B=D1=85=20(#48)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit В качестве решения выбрано округление до сотых Closes #32 --- statapp/main_window.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/statapp/main_window.py b/statapp/main_window.py index 3fadbdc..9973cb7 100644 --- a/statapp/main_window.py +++ b/statapp/main_window.py @@ -74,7 +74,7 @@ class MainWindow(QMainWindow): gw = GenerateWindow() if gw.exec(): y = np.random.normal(gw.mat, gw.deviation, size=(gw.count, 1)) - self.model.updateAllData(y) + self.model.updateAllData(y.round(2)) self.isDataChanged = True @Slot() @@ -107,7 +107,7 @@ class MainWindow(QMainWindow): data = self.model.getData() - x_arr = x_arr.reshape(len(x_arr), 1) + x_arr = x_arr.reshape(len(x_arr), 1).round(2) # dd = dd.reshape(len(dd), 1) data = np.concatenate((data, x_arr), axis=1) # data = np.concatenate((data, dd), axis=1) From a3f7c1ac0b1bd16a2954dce83996c2e3677a7164 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Mon, 2 Oct 2023 21:23:22 +0300 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D1=85=20=D0=BE=D0=BA=D0=BE=D0=BD=20(#49)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #44 --- statapp/ui/generate_factor_window.ui | 2 +- statapp/ui/generate_window.ui | 2 +- statapp/ui/ui_generate_factor_window.py | 2 +- statapp/ui/ui_generate_window.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/statapp/ui/generate_factor_window.ui b/statapp/ui/generate_factor_window.ui index 5bacbcc..147b4ae 100644 --- a/statapp/ui/generate_factor_window.ui +++ b/statapp/ui/generate_factor_window.ui @@ -11,7 +11,7 @@ - Dialog + Генерация факторов diff --git a/statapp/ui/generate_window.ui b/statapp/ui/generate_window.ui index 203647a..8abb447 100644 --- a/statapp/ui/generate_window.ui +++ b/statapp/ui/generate_window.ui @@ -16,7 +16,7 @@ - Dialog + Генерация откликов diff --git a/statapp/ui/ui_generate_factor_window.py b/statapp/ui/ui_generate_factor_window.py index e851549..01c3cb1 100644 --- a/statapp/ui/ui_generate_factor_window.py +++ b/statapp/ui/ui_generate_factor_window.py @@ -79,7 +79,7 @@ class Ui_GenerateFactorWindow(object): # setupUi def retranslateUi(self, GenerateFactorWindow): - GenerateFactorWindow.setWindowTitle(QCoreApplication.translate("GenerateFactorWindow", u"Dialog", None)) + GenerateFactorWindow.setWindowTitle(QCoreApplication.translate("GenerateFactorWindow", u"\u0413\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u044f \u0444\u0430\u043a\u0442\u043e\u0440\u043e\u0432", None)) self.label.setText(QCoreApplication.translate("GenerateFactorWindow", u"\u0422\u0438\u043f \u0441\u0432\u044f\u0437\u0438", None)) self.label_3.setText(QCoreApplication.translate("GenerateFactorWindow", u"\u0421\u0440\u0435\u0434\u043d\u0435\u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0438\u0447\u043d\u043e\u0435 \u043e\u0442\u043a\u043b\u043e\u043d\u0435\u043d\u0438\u0435", None)) self.generatePushButton.setText(QCoreApplication.translate("GenerateFactorWindow", u"\u0421\u0433\u0435\u043d\u0435\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c", None)) diff --git a/statapp/ui/ui_generate_window.py b/statapp/ui/ui_generate_window.py index f28d09f..e3c8628 100644 --- a/statapp/ui/ui_generate_window.py +++ b/statapp/ui/ui_generate_window.py @@ -77,7 +77,7 @@ class Ui_GenerateWindow(object): # setupUi def retranslateUi(self, GenerateWindow): - GenerateWindow.setWindowTitle(QCoreApplication.translate("GenerateWindow", u"Dialog", None)) + GenerateWindow.setWindowTitle(QCoreApplication.translate("GenerateWindow", u"\u0413\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u044f \u043e\u0442\u043a\u043b\u0438\u043a\u043e\u0432", None)) self.generatePushButton.setText(QCoreApplication.translate("GenerateWindow", u"\u0421\u0433\u0435\u043d\u0435\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c", None)) self.label_2.setText(QCoreApplication.translate("GenerateWindow", u"\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u0435", None)) self.label_3.setText(QCoreApplication.translate("GenerateWindow", u"\u0421\u0440\u0435\u0434\u043d\u0435\u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0438\u0447\u043d\u043e\u0435 \u043e\u0442\u043a\u043b\u043e\u043d\u0435\u043d\u0438\u0435", None))