From 5dcbc6b4e16206f882cfd9d63743bd17db638aaf Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Tue, 7 Oct 2025 11:56:01 +0200 Subject: [PATCH] test clean mage rep --- .gitlab-ci.yml | 8 -------- src/Model/Results/River/River.py | 10 ++++++++++ src/View/Results/Table.py | 10 +++++++++- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97812b42..a64fdc12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,10 +60,6 @@ dl-mage8-linux: artifacts: paths: - mage8-linux/mage - - mage8-linux/mage_as7 - - mage8-linux/mage_extraire - - mage8-linux/mailleurTT - - mage8-linux/libbief.so dl-mage8-windows: stage: downloads @@ -79,10 +75,6 @@ dl-mage8-windows: artifacts: paths: - mage8-windows/mage.exe - - mage8-windows/mage_as7.exe - - mage8-windows/mage_extraire.exe - - mage8-windows/mailleurTT.exe - - mage8-windows/libbief.dll dl-adists-linux: stage: downloads diff --git a/src/Model/Results/River/River.py b/src/Model/Results/River/River.py index fbf979c0..0497a167 100644 --- a/src/Model/Results/River/River.py +++ b/src/Model/Results/River/River.py @@ -77,6 +77,12 @@ class Reach(object): ) ) + self._profile_mask = list( + map( + lambda p: p.name[0:8] != 'interpol', self._profiles + ) + ) + def __len__(self): return len(self._profiles) @@ -92,6 +98,10 @@ class Reach(object): def profiles(self): return self._profiles.copy() + @property + def profile_mask(self): + return self._profile_mask + def profile(self, id): return self._profiles[id] diff --git a/src/View/Results/Table.py b/src/View/Results/Table.py index 436b9bf6..badda333 100644 --- a/src/View/Results/Table.py +++ b/src/View/Results/Table.py @@ -23,6 +23,8 @@ from numpy import sqrt from tools import timer, trace +from itertools import compress + from PyQt5.QtGui import ( QKeySequence, QColor ) @@ -51,8 +53,12 @@ class TableModel(PamhyrTableModel): self._lst = _river.reachs elif self._opt_data == "profile": self._lst = _river.reach(0).profiles + # self._lst = list(filter(lambda x: x.name[0:8] != 'interpol', + # _river.reach(0).profiles)) elif self._opt_data == "raw_data": self._lst = _river.reach(0).profiles + # self._lst = list(filter(lambda x: x.name[0:8] != 'interpol', + # _river.reach(0).profiles)) elif self._opt_data == "solver": self._lst = self._parent._solvers @@ -150,7 +156,9 @@ class TableModel(PamhyrTableModel): if self._opt_data == "reach": self._lst = _river.reachs elif self._opt_data == "profile" or self._opt_data == "raw_data": - self._lst = _river.reach(reach).profiles + # self._lst = _river.reach(reach).profiles + self._lst = list(compress(_river.reach(reach).profiles, + _river.reach(reach).profile_mask)) elif self._opt_data == "solver": self._lst = self._parent._solvers