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 "$@" diff --git a/statapp/main_window.py b/statapp/main_window.py index 9a31bfb..e6e02f0 100644 --- a/statapp/main_window.py +++ b/statapp/main_window.py @@ -75,7 +75,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() @@ -86,7 +86,8 @@ class MainWindow(QMainWindow): data = self.model.getData() y = self.model.getY() x_arr = generate_x_values(gfw.mat, gfw.deviation, gfw.typeConnection, y) - 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) self.model.updateAllData(data) self.isDataChanged = True 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))