mirror of
https://github.com/shizand/statapp.git
synced 2025-10-08 13:10:19 +03:00
Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
67958838fc | ||
8b7fabfa46 | |||
f603a77130 | |||
|
775c0887ab | ||
2b061bed2f | |||
48ae2644e8 |
17
.github/workflows/release.yml
vendored
17
.github/workflows/release.yml
vendored
@@ -13,11 +13,16 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, windows-latest]
|
os: [ubuntu-20.04, windows-latest]
|
||||||
spec: [statapp-onefile, statapp]
|
spec: [statapp-onefile, statapp]
|
||||||
arch: [x86, x64]
|
arch: [x86, x64]
|
||||||
|
include:
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
target: linux
|
||||||
|
- os: windows-latest
|
||||||
|
target: windows
|
||||||
exclude:
|
exclude:
|
||||||
- os: ubuntu-latest
|
- os: ubuntu-20.04
|
||||||
arch: x86
|
arch: x86
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
@@ -48,12 +53,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
type: 'zip'
|
type: 'zip'
|
||||||
directory: 'dist'
|
directory: 'dist'
|
||||||
filename: "../${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip"
|
filename: "../${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}.zip"
|
||||||
- name: Загрузка артефактов
|
- name: Загрузка артефактов
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}
|
name: ${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}
|
||||||
path: '${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.spec }}.zip'
|
path: '${{ matrix.target }}-${{ matrix.arch }}-${{ matrix.spec }}.zip'
|
||||||
|
|
||||||
release-please:
|
release-please:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -77,4 +82,4 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
run:
|
run:
|
||||||
gh release upload ${{ steps.release.outputs.tag_name }} ./dist/*
|
gh release upload ${{ steps.release.outputs.tag_name }} ./dist/**/*.zip
|
||||||
|
14
CHANGELOG.md
14
CHANGELOG.md
@@ -1,5 +1,19 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.3.2](https://github.com/shizand/statapp/compare/v0.3.1...v0.3.2) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Исправления
|
||||||
|
|
||||||
|
* исправлена загрузка данных из файла ([8b7fabf](https://github.com/shizand/statapp/commit/8b7fabfa46d546b1969bdf9f4800cb0e06fa186a))
|
||||||
|
|
||||||
|
## [0.3.1](https://github.com/shizand/statapp/compare/v0.3.0...v0.3.1) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Исправления
|
||||||
|
|
||||||
|
* исправлена локализация стандартных кнопок ([2b061be](https://github.com/shizand/statapp/commit/2b061bed2f6343fc2feb87472afc4c9a051b30a9))
|
||||||
|
|
||||||
## [0.3.0](https://github.com/shizand/statapp/compare/v0.2.1...v0.3.0) (2023-09-28)
|
## [0.3.0](https://github.com/shizand/statapp/compare/v0.2.1...v0.3.0) (2023-09-28)
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "statapp"
|
name = "statapp"
|
||||||
version = "0.3.0"
|
version = "0.3.2"
|
||||||
description = ""
|
description = ""
|
||||||
authors = [
|
authors = [
|
||||||
"Maxim Slipenko <statapp@maks1ms.addy.io>"
|
"Maxim Slipenko <statapp@maks1ms.addy.io>"
|
||||||
|
@@ -1,4 +1,6 @@
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from PySide2 import QtCore
|
||||||
from PySide2.QtWidgets import QApplication
|
from PySide2.QtWidgets import QApplication
|
||||||
|
|
||||||
from statapp.main_window import MainWindow
|
from statapp.main_window import MainWindow
|
||||||
@@ -6,6 +8,13 @@ from statapp.main_window import MainWindow
|
|||||||
|
|
||||||
def main():
|
def main():
|
||||||
app = QApplication(sys.argv)
|
app = QApplication(sys.argv)
|
||||||
|
|
||||||
|
translator = QtCore.QTranslator(app)
|
||||||
|
locale = QtCore.QLocale.system().name()
|
||||||
|
path = QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath)
|
||||||
|
translator.load('qt_%s' % locale, path)
|
||||||
|
app.installTranslator(translator)
|
||||||
|
|
||||||
window = MainWindow()
|
window = MainWindow()
|
||||||
window.show()
|
window.show()
|
||||||
return app.exec_()
|
return app.exec_()
|
||||||
|
@@ -17,7 +17,7 @@ class FileSLCModel:
|
|||||||
|
|
||||||
def loadFile(self):
|
def loadFile(self):
|
||||||
self.file_name, _ = QFileDialog.getOpenFileName(None, "Загрузить файл", "", "Files (*.txt;*.csv)")
|
self.file_name, _ = QFileDialog.getOpenFileName(None, "Загрузить файл", "", "Files (*.txt;*.csv)")
|
||||||
if not self.file_name:
|
if self.file_name:
|
||||||
try:
|
try:
|
||||||
content = np.genfromtxt(self.file_name, delimiter=',', invalid_raise=True)
|
content = np.genfromtxt(self.file_name, delimiter=',', invalid_raise=True)
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
@@ -30,4 +30,4 @@ class FileSLCModel:
|
|||||||
|
|
||||||
def closeFile(self):
|
def closeFile(self):
|
||||||
self.file_name = None
|
self.file_name = None
|
||||||
pass
|
pass
|
||||||
|
Reference in New Issue
Block a user