mirror of https://gitlab.com/pamhyr/pamhyr2
test clean mage rep
parent
ebe906fce0
commit
5dcbc6b4e1
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue