From e7e158283697ded7982b1c4d728a2dcc0e8cfab4 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 27 Mar 2024 09:57:53 +0100 Subject: [PATCH] MainWindow: Checker: Minor change and fixes. --- src/Modules.py | 14 ++++ src/Solver/Mage.py | 6 +- src/View/CheckList/Table.py | 79 ++++++++++---------- src/View/ui/Widgets/MainWindowTabCheckers.ui | 24 ------ src/lang/fr.ts | 58 +++++++------- 5 files changed, 87 insertions(+), 94 deletions(-) diff --git a/src/Modules.py b/src/Modules.py index 90881369..643dd05a 100644 --- a/src/Modules.py +++ b/src/Modules.py @@ -79,3 +79,17 @@ class Modules(Flag): cls.RESERVOIR, cls.SEDIMENT_LAYER, ] + + @classmethod + def modelling_display_name(cls): + return { + cls.NETWORK: "Network", + cls.GEOMETRY: "Geometry", + cls.BOUNDARY_CONDITION: "Boundary condition", + cls.LATERAL_CONTRIBUTION: "Lateral contribution", + cls.FRICTION: "Friction", + cls.INITIAL_CONDITION: "Initial condition", + cls.HYDRAULIC_STRUCTURES: "Hydraulic structures", + cls.RESERVOIR: "Reservoir", + cls.SEDIMENT_LAYER: "Sediment layer", + } diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py index dc95c510..3edce593 100644 --- a/src/Solver/Mage.py +++ b/src/Solver/Mage.py @@ -98,9 +98,9 @@ class Mage(CommandLineSolver): @classmethod def checkers(cls): lst = [ - MageNetworkGraphChecker(connectivity=True), - MageNetworkGraphChecker(connectivity=False), - MageGeometryGuideLineChecker(), + MageNetworkGraphChecker(connectivity=True, version=cls._type), + MageNetworkGraphChecker(connectivity=False, version=cls._type), + MageGeometryGuideLineChecker(version=cls._type), ] return lst diff --git a/src/View/CheckList/Table.py b/src/View/CheckList/Table.py index fc95b901..53828af0 100644 --- a/src/View/CheckList/Table.py +++ b/src/View/CheckList/Table.py @@ -79,6 +79,47 @@ class TabTableModel(PamhyrTableModel): def _setup_lst(self): self._lst = self._opt_data + def data(self, index, role): + row = index.row() + column = index.column() + + if role == Qt.ForegroundRole: + if self._headers[column] == "type": + return QVariant() + + color = Qt.gray + status, _ = self.compute_status(row, column) + + if status is STATUS.OK: + color = Qt.green + elif status is STATUS.WARNING: + color = QColor("orange") + elif status is STATUS.ERROR: + color = Qt.red + + return QBrush(color) + + if role == Qt.ItemDataRole.DisplayRole: + if self._headers[column] == "type": + return self.module_display_name(self._opt_data[row]) + + value = "UNKNOWN" + status, _ = self.compute_status(row, column) + + if status is STATUS.OK: + value = "OK" + elif status is STATUS.WARNING: + value = "WARNING" + elif status is STATUS.ERROR: + value = "ERROR" + + return value + + return QVariant() + + def module_display_name(self, module): + return Modules.modelling_display_name()[module] + def get_checkers(self, row, column): module = self._opt_data[row] solver = self._headers[column] @@ -121,41 +162,3 @@ class TabTableModel(PamhyrTableModel): logger.debug(f"Checkers: {row}, {column}: {checkers_status} {status}") return status, checkers_status - - def data(self, index, role): - row = index.row() - column = index.column() - - if role == Qt.ForegroundRole: - if self._headers[column] == "type": - return QVariant() - - color = Qt.gray - status, _ = self.compute_status(row, column) - - if status is STATUS.OK: - color = Qt.green - elif status is STATUS.WARNING: - color = QColor("orange") - elif status is STATUS.ERROR: - color = Qt.red - - return QBrush(color) - - if role == Qt.ItemDataRole.DisplayRole: - if self._headers[column] == "type": - return str(self._opt_data[row]) - - value = "UNKNOWN" - status, _ = self.compute_status(row, column) - - if status is STATUS.OK: - value = "OK" - elif status is STATUS.WARNING: - value = "WARNING" - elif status is STATUS.ERROR: - value = "ERROR" - - return value - - return QVariant() diff --git a/src/View/ui/Widgets/MainWindowTabCheckers.ui b/src/View/ui/Widgets/MainWindowTabCheckers.ui index 89bb9767..444aac34 100644 --- a/src/View/ui/Widgets/MainWindowTabCheckers.ui +++ b/src/View/ui/Widgets/MainWindowTabCheckers.ui @@ -15,30 +15,6 @@ - - - - - Restart - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - Qt::Horizontal diff --git a/src/lang/fr.ts b/src/lang/fr.ts index 339e9fa7..40cbd439 100644 --- a/src/lang/fr.ts +++ b/src/lang/fr.ts @@ -871,130 +871,130 @@ Description: - Description : + Description : Name: - Nom : + Nom : - + @study_name @study_name - + River network Réseau de la rivière - + Reach: Bief : - + Node: Nœud : - + @nb_nodes @nb_nodes - + @nb_edges @nb_edges - + Current reach: Bief actuel : - + @current_reach @current_reach - + Geometry Géometrie - + @nb_points @nb_points - + Cross-sections: Section en travers : - + Points: Points : - + @nb_cs @nb_cs - + @nb_res @nb_res - + Boundary conditions: Conditions aux limites : - + Reservoir: Casier : - + @nb_bc @nb_bc - + Lateral contributions: Contributions latérales : - + @nb_lc @nb_lc - + Hydraulic stuctures: Ouvrages hydrauliques : - + @nb_hs @nb_hs Restart - Relancer + Relancer - + Checkers list Liste des vérificateurs - + Errors summary Résumer des erreurs @@ -1874,7 +1874,7 @@ Retry check - Réessayer les verifications + Réessayer les vérifications @@ -2149,7 +2149,7 @@ Checks - Verifications + Vérifications @@ -2239,7 +2239,7 @@ Edit the study information - + Éditer les information de l'étude