diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py index 3d40fd69ac27f58e525e0d6e64ee6130876d68f5..f3ebe88fb220b018332ac02ed7a1033b1629be8f 100644 --- a/src/Model/Geometry/ProfileXYZ.py +++ b/src/Model/Geometry/ProfileXYZ.py @@ -478,20 +478,12 @@ class ProfileXYZ(Profile, SQLSubModel): return abs(rg.dist(rd)) def get_water_limits(self, z): - # ==================================================================== - # détermination des points limites RG et RD pour un niveau - # d'eau donné - # - # irg et ird sont les premiers indices en partant des rives - # gauche et droite qui correspondent à des points sous la - # surface de l'eau ptX et ptY sont les points interpolés où - # le plan d'eau intersecte le profil known_level est le - # niveau d'eau pour lequel on a obtenu irg, ird, ptX et ptY - # ==================================================================== - - - # Get the index of last point with elevation lesser than water - # level (for the right and left river side) + """ + Determine left and right limits of water elevation. + """ + + # Get the index of first point with elevation lesser than water + # elevation (for the right and left river side) i_left = -1 i_right = -1 diff --git a/src/Model/Results/River/River.py b/src/Model/Results/River/River.py index 7754796dc4c7b9619884f101926991b392c9075b..578236883aa818214fb2d256207609b2b20bce28 100644 --- a/src/Model/Results/River/River.py +++ b/src/Model/Results/River/River.py @@ -62,6 +62,7 @@ class Profile(object): def has_sediment(self): return any(map(lambda ts: "sl" in self._data[ts], self._data)) + class Reach(object): def __init__(self, reach, study): self._study = study @@ -97,6 +98,7 @@ class Reach(object): def has_sediment(self): return any(map(lambda profile: profile.has_sediment(), self._profiles)) + class River(object): def __init__(self, study): self._study = study diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py index 3cade05ab756d91156043eb2d0c337bcfafe066b..9ec0655b162b94b8d65542b187048b735c6fee57 100644 --- a/src/View/Frictions/translate.py +++ b/src/View/Frictions/translate.py @@ -34,7 +34,6 @@ class FrictionsTranslate(PamhyrTranslate): "Frictions", "Stricklers" ) - self._dict["Edit frictions"] = _translate( "Frictions", "Edit frictions" ) diff --git a/src/View/Results/PlotKPC.py b/src/View/Results/PlotKPC.py index c7e288d4b990855651fac4f97931a7518731fd26..7ccffc106ff796513d833b14a9a04363139ccc90 100644 --- a/src/View/Results/PlotKPC.py +++ b/src/View/Results/PlotKPC.py @@ -213,7 +213,7 @@ class PlotKPC(PamhyrPlot): z, d ) ), - z_sl, d_sl + [f] # HACK: Add dummy data for last layer + z_sl, d_sl + [f] # HACK: Add dummy data for last layer ) ) diff --git a/src/View/SedimentLayers/Reach/Profile/translate.py b/src/View/SedimentLayers/Reach/Profile/translate.py index ab1b177c7237a28cc77a66c9c45d74d951e637ba..382bc8d25822b58d33a258248b07d90a76165460 100644 --- a/src/View/SedimentLayers/Reach/Profile/translate.py +++ b/src/View/SedimentLayers/Reach/Profile/translate.py @@ -34,7 +34,6 @@ class SedimentProfileTranslate(SedimentReachTranslate): "SedimentLayers", "Height (m)" ) - self._dict["Profile sediment layers"] = _translate( "SedimentLayers", "Profile sediment layers" )