From 3aeb048a43389f9e95c2355de07cc82e280e7fb0 Mon Sep 17 00:00:00 2001 From: Maxim Slipenko Date: Tue, 26 Sep 2023 11:03:49 +0300 Subject: [PATCH] =?UTF-8?q?chore:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D0=BB=D1=83=D1=88=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=BA?= =?UTF-8?q?=D0=BD=D0=B0=20(#5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 1 + .idea/misc.xml | 2 +- .idea/runConfigurations/statapp.xml | 24 +++++++++ .idea/stat.iml | 2 +- poetry.lock | 2 +- pyproject.toml | 2 +- statapp/__main__.py | 9 +++- statapp/main_window.py | 11 ++++ statapp/ui/main_window.ui | 77 +++++++++++++++++++++++++++ statapp/ui/ui_main_window.py | 82 +++++++++++++++++++++++++++++ 10 files changed, 206 insertions(+), 6 deletions(-) create mode 100644 .gitattributes create mode 100644 .idea/runConfigurations/statapp.xml create mode 100644 statapp/main_window.py create mode 100644 statapp/ui/main_window.ui create mode 100644 statapp/ui/ui_main_window.py diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..32a0909 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +statapp/ui/ui_*.py linguist-generated=true \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 79f6ba0..55979d6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/runConfigurations/statapp.xml b/.idea/runConfigurations/statapp.xml new file mode 100644 index 0000000..3a0f2a0 --- /dev/null +++ b/.idea/runConfigurations/statapp.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/.idea/stat.iml b/.idea/stat.iml index d0876a7..e01b4dd 100644 --- a/.idea/stat.iml +++ b/.idea/stat.iml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index 2611dff..881a2d2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -424,4 +424,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "ecc1177c0cdaf44ed3449d23dc97e7263b1ca2a098bac78f644292ee77c7d9ae" +content-hash = "7a4e4c088cf2b371f4aad4e5a9240f375d2f8d912df57d82dbc4117537e0fd77" diff --git a/pyproject.toml b/pyproject.toml index c197309..f49724f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ readme = "README.md" [tool.poetry.dependencies] python = ">=3.9,<3.12" -pyside6 = "^6.4" +pyside6 = "^6.4.0" pandas = "^2.1.1" numpy = "^1.26.0" pre-commit = "^3.4.0" diff --git a/statapp/__main__.py b/statapp/__main__.py index 449295f..43fe259 100644 --- a/statapp/__main__.py +++ b/statapp/__main__.py @@ -1,9 +1,14 @@ import sys +from PySide6.QtWidgets import QApplication + +from statapp.main_window import MainWindow def main(): - print('hello world!') - return 0 + app = QApplication(sys.argv) + window = MainWindow() + window.show() + return app.exec() if __name__ == "__main__": diff --git a/statapp/main_window.py b/statapp/main_window.py new file mode 100644 index 0000000..66fcea4 --- /dev/null +++ b/statapp/main_window.py @@ -0,0 +1,11 @@ +from PySide6.QtWidgets import QMainWindow + +from statapp.ui.ui_main_window import Ui_MainWindow + + +class MainWindow(QMainWindow): + def __init__(self): + super().__init__() + self.ui = Ui_MainWindow() + self.ui.setupUi(self) + diff --git a/statapp/ui/main_window.ui b/statapp/ui/main_window.ui new file mode 100644 index 0000000..e035e15 --- /dev/null +++ b/statapp/ui/main_window.ui @@ -0,0 +1,77 @@ + + + MainWindow + + + + 0 + 0 + 800 + 600 + + + + Статистическое моделирование + + + + + + + + + + СТАТИСТИЧЕСКИЕ ДАННЫЕ + + + Qt::AlignCenter + + + + + + + + + 0 + 0 + 800 + 19 + + + + + Файл + + + + + Генерация показателей + + + + + Анализ данных + + + + + Моделирование + + + + + Справка + + + + + + + + + + + + + diff --git a/statapp/ui/ui_main_window.py b/statapp/ui/ui_main_window.py new file mode 100644 index 0000000..84c898b --- /dev/null +++ b/statapp/ui/ui_main_window.py @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- + +################################################################################ +## Form generated from reading UI file 'main_window.ui' +## +## Created by: Qt User Interface Compiler version 6.5.2 +## +## WARNING! All changes made in this file will be lost when recompiling UI file! +################################################################################ + +from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, + QMetaObject, QObject, QPoint, QRect, + QSize, QTime, QUrl, Qt) +from PySide6.QtGui import (QAction, QBrush, QColor, QConicalGradient, + QCursor, QFont, QFontDatabase, QGradient, + QIcon, QImage, QKeySequence, QLinearGradient, + QPainter, QPalette, QPixmap, QRadialGradient, + QTransform) +from PySide6.QtWidgets import (QApplication, QGridLayout, QHeaderView, QLabel, + QMainWindow, QMenu, QMenuBar, QSizePolicy, + QStatusBar, QTableView, QWidget) + +class Ui_MainWindow(object): + def setupUi(self, MainWindow): + if not MainWindow.objectName(): + MainWindow.setObjectName(u"MainWindow") + MainWindow.resize(800, 600) + self.centralwidget = QWidget(MainWindow) + self.centralwidget.setObjectName(u"centralwidget") + self.gridLayout = QGridLayout(self.centralwidget) + self.gridLayout.setObjectName(u"gridLayout") + self.tableView = QTableView(self.centralwidget) + self.tableView.setObjectName(u"tableView") + + self.gridLayout.addWidget(self.tableView, 1, 0, 1, 1) + + self.label = QLabel(self.centralwidget) + self.label.setObjectName(u"label") + self.label.setAlignment(Qt.AlignCenter) + + self.gridLayout.addWidget(self.label, 0, 0, 1, 1) + + MainWindow.setCentralWidget(self.centralwidget) + self.menubar = QMenuBar(MainWindow) + self.menubar.setObjectName(u"menubar") + self.menubar.setGeometry(QRect(0, 0, 800, 19)) + self.menu = QMenu(self.menubar) + self.menu.setObjectName(u"menu") + self.menu_2 = QMenu(self.menubar) + self.menu_2.setObjectName(u"menu_2") + self.menu_3 = QMenu(self.menubar) + self.menu_3.setObjectName(u"menu_3") + self.menu_4 = QMenu(self.menubar) + self.menu_4.setObjectName(u"menu_4") + self.menu_5 = QMenu(self.menubar) + self.menu_5.setObjectName(u"menu_5") + MainWindow.setMenuBar(self.menubar) + self.statusbar = QStatusBar(MainWindow) + self.statusbar.setObjectName(u"statusbar") + MainWindow.setStatusBar(self.statusbar) + + self.menubar.addAction(self.menu.menuAction()) + self.menubar.addAction(self.menu_2.menuAction()) + self.menubar.addAction(self.menu_3.menuAction()) + self.menubar.addAction(self.menu_4.menuAction()) + self.menubar.addAction(self.menu_5.menuAction()) + + self.retranslateUi(MainWindow) + + QMetaObject.connectSlotsByName(MainWindow) + # setupUi + + def retranslateUi(self, MainWindow): + MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u043c\u043e\u0434\u0435\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435", None)) + self.label.setText(QCoreApplication.translate("MainWindow", u"\u0421\u0422\u0410\u0422\u0418\u0421\u0422\u0418\u0427\u0415\u0421\u041a\u0418\u0415 \u0414\u0410\u041d\u041d\u042b\u0415", None)) + self.menu.setTitle(QCoreApplication.translate("MainWindow", u"\u0424\u0430\u0439\u043b", None)) + self.menu_2.setTitle(QCoreApplication.translate("MainWindow", u"\u0413\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u0435\u043b\u0435\u0439", None)) + self.menu_3.setTitle(QCoreApplication.translate("MainWindow", u"\u0410\u043d\u0430\u043b\u0438\u0437 \u0434\u0430\u043d\u043d\u044b\u0445", None)) + self.menu_4.setTitle(QCoreApplication.translate("MainWindow", u"\u041c\u043e\u0434\u0435\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435", None)) + self.menu_5.setTitle(QCoreApplication.translate("MainWindow", u"\u0421\u043f\u0440\u0430\u0432\u043a\u0430", None)) + # retranslateUi +