diff --git a/src/View/InitialConditionsTemperature/Table.py b/src/View/InitialConditionsTemperature/Table.py index 60b7adb6..037d0d27 100644 --- a/src/View/InitialConditionsTemperature/Table.py +++ b/src/View/InitialConditionsTemperature/Table.py @@ -169,16 +169,11 @@ class InitialConditionTableModel(PamhyrTableModel): return next(filter( lambda edge: edge.id == n, self._river.edges() )).name - elif self._headers[column] == "start_rk": + elif self._headers[column] == "rk": n = self._lst[row].start_rk if n is None: return self._trad['not_associated'] return self._rk_display_name(row, n) - elif self._headers[column] == "end_rk": - n = self._lst[row].end_rk - if n is None: - return self._trad['not_associated'] - return self._rk_display_name(row, n) elif self._headers[column] == "temperature": n = self._lst[row].temperature if n is None: diff --git a/src/View/InitialConditionsTemperature/UndoCommand.py b/src/View/InitialConditionsTemperature/UndoCommand.py index fb1f257e..83f93265 100644 --- a/src/View/InitialConditionsTemperature/UndoCommand.py +++ b/src/View/InitialConditionsTemperature/UndoCommand.py @@ -73,10 +73,8 @@ class SetCommandSpec(QUndoCommand): self._old = self._data[self._row].name elif self._column == "reach": self._old = self._data[self._row].reach - elif self._column == "start_rk": + elif self._column == "rk": self._old = self._data[self._row].start_rk - elif self._column == "end_rk": - self._old = self._data[self._row].end_rk elif self._column == "temperature": self._old = self._data[self._row].temperature @@ -93,9 +91,8 @@ class SetCommandSpec(QUndoCommand): self._data[self._row].name = self._old elif self._column == "reach": self._data[self._row].reach = self._old - elif self._column == "start_rk": + elif self._column == "rk": self._data[self._row].start_rk = self._old - elif self._column == "end_rk": self._data[self._row].end_rk = self._old elif self._column == "temperature": self._data[self._row].temperature = self._old @@ -105,9 +102,8 @@ class SetCommandSpec(QUndoCommand): self._data[self._row].name = self._new elif self._column == "reach": self._data[self._row].reach = self._new - elif self._column == "start_rk": + elif self._column == "rk": self._data[self._row].start_rk = self._new - elif self._column == "end_rk": self._data[self._row].end_rk = self._new elif self._column == "temperature": self._data[self._row].temperature = self._new diff --git a/src/View/InitialConditionsTemperature/Window.py b/src/View/InitialConditionsTemperature/Window.py index d1002fb1..53f45fe6 100644 --- a/src/View/InitialConditionsTemperature/Window.py +++ b/src/View/InitialConditionsTemperature/Window.py @@ -167,8 +167,7 @@ class InitialConditionsTemperatureWindow(PamhyrWindow): editable_headers=editable_headers_spec, delegates={ "reach": self._delegate_reach, - "start_rk": self._delegate_rk, - "end_rk": self._delegate_rk + "rk": self._delegate_rk }, data=self._data[0], undo=self._undo_stack, diff --git a/src/View/InitialConditionsTemperature/translate.py b/src/View/InitialConditionsTemperature/translate.py index 370d0bb1..d8517008 100644 --- a/src/View/InitialConditionsTemperature/translate.py +++ b/src/View/InitialConditionsTemperature/translate.py @@ -40,7 +40,6 @@ class IcTemperatureTranslate(MainTranslate): self._sub_dict["table_headers_spec"] = { "name": self._dict["name"], "reach": self._dict["reach"], - "start_rk": _translate("Unit", "Start_RK (m)"), - "end_rk": _translate("Unit", "End_RK (m)"), + "rk": _translate("Unit", "RK (m)"), "temperature": self._dict["unit_temperature"], } diff --git a/src/tools.py b/src/tools.py index 35f806fd..d98d40ae 100644 --- a/src/tools.py +++ b/src/tools.py @@ -321,7 +321,7 @@ def timestamp_to_old_pamhyr_date_adists(time: int): minutes = (dt.seconds % 3600) // 60 seconds = dt.seconds % 60 - s = f"{dt.days:>3}:{hours:>2}:{minutes:>2}" + s = f"{dt.days:>3}:{hours:>2}:{minutes:>2}"#:{seconds:>2}" s = s.replace(" ", "0") return s