mirror of
https://github.com/shizand/statapp.git
synced 2024-12-23 12:12:59 +03:00
fix: Добавлена обработка ошибок (#98)
Closes #83 Closes #96 Closes #97 Добавлена обобщенная обработка на большинство методов. Один из вариантов временно (а может и постоянно) решить проблемы.
This commit is contained in:
parent
1c88acf772
commit
c36e1aa733
@ -3,5 +3,5 @@
|
|||||||
<component name="Black">
|
<component name="Black">
|
||||||
<option name="sdkName" value="Poetry (statapp)" />
|
<option name="sdkName" value="Poetry (statapp)" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="statapp" project-jdk-type="Python SDK" />
|
<component name="ProjectRootManager" version="2" project-jdk-name="Poetry (statapp) (2)" project-jdk-type="Python SDK" />
|
||||||
</project>
|
</project>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<module type="PYTHON_MODULE" version="4">
|
<module type="PYTHON_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager">
|
<component name="NewModuleRootManager">
|
||||||
<content url="file://$MODULE_DIR$" />
|
<content url="file://$MODULE_DIR$" />
|
||||||
<orderEntry type="jdk" jdkName="statapp" jdkType="Python SDK" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
@ -24,4 +24,5 @@ disable=
|
|||||||
missing-docstring,
|
missing-docstring,
|
||||||
too-many-public-methods,
|
too-many-public-methods,
|
||||||
too-few-public-methods,
|
too-few-public-methods,
|
||||||
too-many-arguments
|
too-many-arguments,
|
||||||
|
broad-except
|
||||||
|
@ -33,7 +33,7 @@ from statapp.about_window import AboutWindow
|
|||||||
from statapp.models.fileslc_model import FileSLCModel
|
from statapp.models.fileslc_model import FileSLCModel
|
||||||
from statapp.polynoms.squared_polynom_window import SquaredPolynomWindow
|
from statapp.polynoms.squared_polynom_window import SquaredPolynomWindow
|
||||||
from statapp.ui.ui_main_window import Ui_MainWindow
|
from statapp.ui.ui_main_window import Ui_MainWindow
|
||||||
from statapp.utils import buildMessageBox, addIcon, FloatDelegate
|
from statapp.utils import buildMessageBox, addIcon, FloatDelegate, onError
|
||||||
from statapp.variance_analysis import VarianceAnalysisWindow
|
from statapp.variance_analysis import VarianceAnalysisWindow
|
||||||
from statapp.correlation_analysis import CorrelationAnalysisWindow
|
from statapp.correlation_analysis import CorrelationAnalysisWindow
|
||||||
from statapp.polynoms.transform_polynom_window import TransformPolynomWindow
|
from statapp.polynoms.transform_polynom_window import TransformPolynomWindow
|
||||||
@ -103,6 +103,7 @@ class MainWindow(QMainWindow):
|
|||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_openfileaction_triggered(self):
|
def on_openfileaction_triggered(self):
|
||||||
|
try:
|
||||||
currentData = self.model.getData()
|
currentData = self.model.getData()
|
||||||
data = np.array([])
|
data = np.array([])
|
||||||
if currentData.size > 1:
|
if currentData.size > 1:
|
||||||
@ -137,28 +138,40 @@ class MainWindow(QMainWindow):
|
|||||||
if data is not None and data.shape[0] > 0:
|
if data is not None and data.shape[0] > 0:
|
||||||
self.model.updateAllData(data)
|
self.model.updateAllData(data)
|
||||||
self.isDataChanged = False
|
self.isDataChanged = False
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_savefileaction_triggered(self):
|
def on_savefileaction_triggered(self):
|
||||||
|
try:
|
||||||
self.isDataChanged = not self.fileModel.saveFile(self.model.getData())
|
self.isDataChanged = not self.fileModel.saveFile(self.model.getData())
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_closefileaction_triggered(self):
|
def on_closefileaction_triggered(self):
|
||||||
|
try:
|
||||||
self.fileModel.closeFile()
|
self.fileModel.closeFile()
|
||||||
self.isDataChanged = False
|
self.isDataChanged = False
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_generateYaction_triggered(self):
|
def on_generateYaction_triggered(self):
|
||||||
|
try:
|
||||||
gw = GenerateWindow()
|
gw = GenerateWindow()
|
||||||
|
|
||||||
if gw.exec():
|
if gw.exec():
|
||||||
y = generateYValues(gw.mat, gw.deviation, gw.count)
|
y = generateYValues(gw.mat, gw.deviation, gw.count)
|
||||||
self.model.updateAllData(y.round(NUMBERS_PRECISION))
|
self.model.updateAllData(y.round(NUMBERS_PRECISION))
|
||||||
self.isDataChanged = True
|
self.isDataChanged = True
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_generateXaction_triggered(self):
|
def on_generateXaction_triggered(self):
|
||||||
|
try:
|
||||||
gfw = GenerateFactorWindow()
|
gfw = GenerateFactorWindow()
|
||||||
|
|
||||||
if gfw.exec():
|
if gfw.exec():
|
||||||
@ -168,6 +181,8 @@ class MainWindow(QMainWindow):
|
|||||||
data = np.concatenate((data, xValues.round(NUMBERS_PRECISION)), axis=1)
|
data = np.concatenate((data, xValues.round(NUMBERS_PRECISION)), axis=1)
|
||||||
self.model.updateAllData(data)
|
self.model.updateAllData(data)
|
||||||
self.isDataChanged = True
|
self.isDataChanged = True
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_aboutmenuaction_triggered(self):
|
def on_aboutmenuaction_triggered(self):
|
||||||
@ -176,28 +191,43 @@ class MainWindow(QMainWindow):
|
|||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_varianceAnalysisAction_triggered(self):
|
def on_varianceAnalysisAction_triggered(self):
|
||||||
|
try:
|
||||||
dw = VarianceAnalysisWindow(self.model.getData())
|
dw = VarianceAnalysisWindow(self.model.getData())
|
||||||
dw.exec()
|
dw.exec()
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_correlationAnalisisAction_triggered(self):
|
def on_correlationAnalisisAction_triggered(self):
|
||||||
|
try:
|
||||||
dw = CorrelationAnalysisWindow(self.model.getData())
|
dw = CorrelationAnalysisWindow(self.model.getData())
|
||||||
dw.exec()
|
dw.exec()
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_linearPolynomAction_triggered(self):
|
def on_linearPolynomAction_triggered(self):
|
||||||
|
try:
|
||||||
dw = LinearPolynomWindow(self.model.getData())
|
dw = LinearPolynomWindow(self.model.getData())
|
||||||
dw.exec()
|
dw.exec()
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_squaredPolynomAction_triggered(self):
|
def on_squaredPolynomAction_triggered(self):
|
||||||
|
try:
|
||||||
dw = SquaredPolynomWindow(self.model.getData())
|
dw = SquaredPolynomWindow(self.model.getData())
|
||||||
dw.exec()
|
dw.exec()
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
@Slot()
|
@Slot()
|
||||||
def on_transformPolynomAction_triggered(self):
|
def on_transformPolynomAction_triggered(self):
|
||||||
|
try:
|
||||||
dw = TransformPolynomWindow(self.model.getData())
|
dw = TransformPolynomWindow(self.model.getData())
|
||||||
dw.exec()
|
dw.exec()
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
def closeEvent(self, event):
|
def closeEvent(self, event):
|
||||||
if self.isDataChanged:
|
if self.isDataChanged:
|
||||||
|
@ -28,7 +28,7 @@ from statapp.models.prediction_table_model import PreditionTableModel
|
|||||||
from statapp.models.transform_polynom_model import TransformPolynomModel, TRANSFORMS
|
from statapp.models.transform_polynom_model import TransformPolynomModel, TRANSFORMS
|
||||||
from statapp.polynoms.polynom_window import MplCanvas
|
from statapp.polynoms.polynom_window import MplCanvas
|
||||||
from statapp.ui.ui_polynom_window import Ui_PolynomWindow
|
from statapp.ui.ui_polynom_window import Ui_PolynomWindow
|
||||||
from statapp.utils import addIcon
|
from statapp.utils import addIcon, onError
|
||||||
|
|
||||||
|
|
||||||
class TransformPolynomWindow(QDialog):
|
class TransformPolynomWindow(QDialog):
|
||||||
@ -41,8 +41,11 @@ class TransformPolynomWindow(QDialog):
|
|||||||
|
|
||||||
self.data = data
|
self.data = data
|
||||||
result = linearPolynom(data)
|
result = linearPolynom(data)
|
||||||
|
try:
|
||||||
predictionResult = prediction(data, result)
|
predictionResult = prediction(data, result)
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
self.predictionModel = PreditionTableModel(predictionResult)
|
self.predictionModel = PreditionTableModel(predictionResult)
|
||||||
self.ui.predictionTableView.setModel(self.predictionModel)
|
self.ui.predictionTableView.setModel(self.predictionModel)
|
||||||
header = self.ui.predictionTableView.horizontalHeader()
|
header = self.ui.predictionTableView.horizontalHeader()
|
||||||
@ -90,7 +93,10 @@ class TransformPolynomWindow(QDialog):
|
|||||||
tr = self.model.data(self.model.createIndex(j, 0), Qt.DisplayRole)
|
tr = self.model.data(self.model.createIndex(j, 0), Qt.DisplayRole)
|
||||||
data[i][j] = TRANSFORMS[tr](data[i][j])
|
data[i][j] = TRANSFORMS[tr](data[i][j])
|
||||||
|
|
||||||
|
try:
|
||||||
self.rebuildData(data)
|
self.rebuildData(data)
|
||||||
|
except Exception as error:
|
||||||
|
onError(error)
|
||||||
|
|
||||||
def rebuildData(self, data):
|
def rebuildData(self, data):
|
||||||
result = linearPolynom(data)
|
result = linearPolynom(data)
|
||||||
|
@ -59,8 +59,19 @@ def buildMessageBox(title, text, icon, buttons, defaultButton):
|
|||||||
msgBox.setStandardButtons(buttons)
|
msgBox.setStandardButtons(buttons)
|
||||||
msgBox.setDefaultButton(defaultButton)
|
msgBox.setDefaultButton(defaultButton)
|
||||||
|
|
||||||
|
addIcon(msgBox)
|
||||||
|
|
||||||
return msgBox
|
return msgBox
|
||||||
|
|
||||||
|
def onError(errorName: Exception):
|
||||||
|
msgBox = buildMessageBox \
|
||||||
|
('Ошибка',
|
||||||
|
"Упс.. Произошла ошибка:\n" + str(errorName),
|
||||||
|
QMessageBox.Critical,
|
||||||
|
QMessageBox.Ok,
|
||||||
|
QMessageBox.Ok)
|
||||||
|
|
||||||
|
msgBox.exec_()
|
||||||
|
|
||||||
class FloatDelegate(QStyledItemDelegate):
|
class FloatDelegate(QStyledItemDelegate):
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
|
Loading…
Reference in New Issue
Block a user