fix: Добавлена обработка ошибок

shizand · Jan 29, 2024 · b00f7e2 · b00f7e2
1 parent 5434016
commit b00f7e2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/statapp/main_window.py b/statapp/main_window.py
@@ -33,7 +33,7 @@
 from statapp.models.fileslc_model import FileSLCModel
 from statapp.polynoms.squared_polynom_window import SquaredPolynomWindow
 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.correlation_analysis import CorrelationAnalysisWindow
 from statapp.polynoms.transform_polynom_window import TransformPolynomWindow
@@ -139,23 +139,23 @@ def on_openfileaction_triggered(self):
                     self.model.updateAllData(data)
                     self.isDataChanged = False
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
 
     @Slot()
     def on_savefileaction_triggered(self):
         try:
             self.isDataChanged = not self.fileModel.saveFile(self.model.getData())
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_closefileaction_triggered(self):
         try:
             self.fileModel.closeFile()
             self.isDataChanged = False
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_generateYaction_triggered(self):
@@ -167,7 +167,7 @@ def on_generateYaction_triggered(self):
                 self.model.updateAllData(y.round(NUMBERS_PRECISION))
                 self.isDataChanged = True
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_generateXaction_triggered(self):
@@ -182,7 +182,7 @@ def on_generateXaction_triggered(self):
                 self.model.updateAllData(data)
                 self.isDataChanged = True
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_aboutmenuaction_triggered(self):
@@ -195,39 +195,39 @@ def on_varianceAnalysisAction_triggered(self):
             dw = VarianceAnalysisWindow(self.model.getData())
             dw.exec()
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_correlationAnalisisAction_triggered(self):
         try:
             dw = CorrelationAnalysisWindow(self.model.getData())
             dw.exec()
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_linearPolynomAction_triggered(self):
         try:
             dw = LinearPolynomWindow(self.model.getData())
             dw.exec()
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_squaredPolynomAction_triggered(self):
         try:
             dw = SquaredPolynomWindow(self.model.getData())
             dw.exec()
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     @Slot()
     def on_transformPolynomAction_triggered(self):
         try:
             dw = TransformPolynomWindow(self.model.getData())
             dw.exec()
         except Exception as error:
-            self.onError(error)
+            onError(error)
 
     def closeEvent(self, event):
         if self.isDataChanged:
@@ -252,13 +252,3 @@ def closeEvent(self, event):
                 event.ignore()
         else:
             event.accept()
-
-    def onError(self, errorName: Exception):
-        msgBox = buildMessageBox \
-            ('Ошибка',
-             "Упс.. Произошла ошибка:\n" + str(errorName),
-             QMessageBox.Critical,
-             QMessageBox.Ok | QMessageBox.Cancel,
-             QMessageBox.Cancel)
-
-        msgBox.exec_()
diff --git a/statapp/polynoms/transform_polynom_window.py b/statapp/polynoms/transform_polynom_window.py
@@ -28,7 +28,7 @@
 from statapp.models.transform_polynom_model import TransformPolynomModel, TRANSFORMS
 from statapp.polynoms.polynom_window import MplCanvas
 from statapp.ui.ui_polynom_window import Ui_PolynomWindow
-from statapp.utils import addIcon
+from statapp.utils import addIcon, onError
 
 
 class TransformPolynomWindow(QDialog):
@@ -41,8 +41,11 @@ def __init__(self, data):
 
         self.data = data
         result = linearPolynom(data)
+        try:
+            predictionResult = prediction(data, result)
+        except Exception as error:
+            onError(error)
 
-        predictionResult = prediction(data, result)
         self.predictionModel = PreditionTableModel(predictionResult)
         self.ui.predictionTableView.setModel(self.predictionModel)
         header = self.ui.predictionTableView.horizontalHeader()
@@ -90,7 +93,10 @@ def on_data_changed(self):
                 tr = self.model.data(self.model.createIndex(j, 0), Qt.DisplayRole)
                 data[i][j] = TRANSFORMS[tr](data[i][j])
 
-        self.rebuildData(data)
+        try:
+            self.rebuildData(data)
+        except Exception as error:
+            onError(error)
 
     def rebuildData(self, data):
         result = linearPolynom(data)

diff --git a/statapp/utils.py b/statapp/utils.py
@@ -63,6 +63,15 @@ def buildMessageBox(title, text, icon, buttons, defaultButton):
 
     return msgBox
 
+def onError(errorName: Exception):
+    msgBox = buildMessageBox \
+        ('Ошибка',
+        "Упс.. Произошла ошибка:\n" + str(errorName),
+        QMessageBox.Critical,
+        QMessageBox.Ok,
+        QMessageBox.Ok)
+
+    msgBox.exec_()
 
 class FloatDelegate(QStyledItemDelegate):
     def __init__(self, parent=None):