shizand/statapp
0
0
Fork 0
mirror of https://github.com/shizand/statapp.git synced 2025-04-01 23:23:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into refactor/refactor-models

Browse Source
This commit is contained in:
Maxim Slipenko 2023-10-02 21:24:19 +03:00 committed by GitHub
commit 65b53cce08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/version
View File

@ -1,3 +0,0 @@
#!/usr/bin/env bash
poetry version "$@"

5
statapp/main_window.py
View File

@ -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

2
statapp/ui/generate_factor_window.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Генерация факторов</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">

2
statapp/ui/generate_window.ui
View File

@ -16,7 +16,7 @@
</font>
</property>
<property name="windowTitle">
<string>Dialog</string>
<string>Генерация откликов</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">

2
statapp/ui/ui_generate_factor_window.py generated
View File

@ -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))

2
statapp/ui/ui_generate_window.py generated
View File

@ -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))