diff --git a/src/View/WeatherParameters/Edit/Window.py b/src/View/WeatherParameters/Edit/Window.py index c6a882b3..28259f2b 100644 --- a/src/View/WeatherParameters/Edit/Window.py +++ b/src/View/WeatherParameters/Edit/Window.py @@ -56,16 +56,22 @@ class EditWeatherParametersWindow(PamhyrWindow): self._data = data trad = WPETranslate() - name = trad[self._pamhyr_name] + # name = trad[self._pamhyr_name] if self._data is not None: edge_name = (self._data.reach.name if self._data.reach is not None else trad['not_associated']) - name += ( - f" - {study.name} " + - f" - {self._data.name} ({self._data.id}) " + - # f"({trad.get_dict('long_types')[self._data.type]} - " + - f"{edge_name})" + parameter_type = trad.get_dict("long_types").get( + self._data.type, + self._data.type, ) + begin_rk = (self._format_rk(self._data.begin_rk) + if self._data.begin_section is not None + else trad['not_associated']) + end_rk = (self._format_rk(self._data.end_rk) + if self._data.end_section is not None + else trad['not_associated']) + name = (f"{parameter_type} - {edge_name} - " + f"PK {begin_rk} → {end_rk}") super(EditWeatherParametersWindow, self).__init__( title=name, @@ -81,6 +87,12 @@ class EditWeatherParametersWindow(PamhyrWindow): self.setup_plot() self.setup_connections() + @staticmethod + def _format_rk(rk): + if isinstance(rk, (int, float)): + return f"{rk:g}" + return str(rk) + def setup_table(self): self._delegate_time = PamhyrExTimeDelegate( data=self._data, diff --git a/src/View/WeatherParameters/translate.py b/src/View/WeatherParameters/translate.py index 06093fc7..0ac2f2b3 100644 --- a/src/View/WeatherParameters/translate.py +++ b/src/View/WeatherParameters/translate.py @@ -62,3 +62,13 @@ class WeatherParametersTranslate(MainTranslate): "cloud_cover_fraction": _translate("WeatherParameters", "Cloud Cover Fraction"), } + + weather_parameters = self._sub_dict["weather_parameters"] + self._sub_dict["long_types"] = { + "AT": weather_parameters["air_temperature"], + "SH": weather_parameters["specific_humidity"], + "GR": weather_parameters["global_radiation"], + "RWS": weather_parameters["reference_wind_speed"], + "GT": weather_parameters["surface_temperature"], + "GFR": weather_parameters["surface_flow_rate"] + }