diff --git a/src/View/Results/WindowAdisTS.py b/src/View/Results/WindowAdisTS.py index 350e6595..4348c6ec 100644 --- a/src/View/Results/WindowAdisTS.py +++ b/src/View/Results/WindowAdisTS.py @@ -345,24 +345,29 @@ class ResultsWindowAdisTS(PamhyrWindow): super(ResultsWindowAdisTS, self).closeEvent(event) def _compute_status_label(self): - # Timestamp - ts = self._timestamps[self._slider_time.value()] - - t0 = datetime.fromtimestamp(0) - fts = str( - datetime.fromtimestamp(ts) - t0 - ) - fts.replace("days", _translate("Results", "days"))\ - .replace("day", _translate("Results", "day")) + return (self.text_bief() + " | " + + self.text_profile() + " | " + + self.text_pollutant() + " | " + + self.text_time()) + def text_bief(self): # Reach table = self.find(QTableView, f"tableView_reach") indexes = table.selectedIndexes() if len(indexes) == 0: - reach = self._study.river.edges()[0] + reach = self._study.river.enable_edges()[0] else: - reach = self._study.river.edges()[indexes[0].row()] + reach = self._study.river.enable_edges()[indexes[0].row()] + return f"{self._trad['reach']}: {reach.name}" + def text_profile(self): + # Reach + table = self.find(QTableView, f"tableView_reach") + indexes = table.selectedIndexes() + if len(indexes) == 0: + reach = self._study.river.enable_edges()[0] + else: + reach = self._study.river.enable_edges()[indexes[0].row()] # Profile table = self.find(QTableView, f"tableView_profile") indexes = table.selectedIndexes() @@ -372,7 +377,24 @@ class ResultsWindowAdisTS(PamhyrWindow): profile = reach.reach.profile(indexes[0].row()) pname = profile.name if profile.name != "" else profile.rk + return f"{self._trad['cross_section']}: {pname}" + def text_time(self): + # Timestamp + ts = self._timestamps[self._slider_time.value()] + + t0 = datetime.fromtimestamp(0) + fts = str( + datetime.fromtimestamp(ts) - t0 + ) + fts = str( + datetime.fromtimestamp(ts) - t0 + ) + fts.replace("days", _translate("Results", "days"))\ + .replace("day", _translate("Results", "day")) + return f"{self._trad['time']} : {fts} ({ts} sec)" + + def text_pollutant(self): # Pollutant table = self.find(QTableView, f"tableView_pollutants") indexes = table.selectedIndexes() @@ -381,10 +403,7 @@ class ResultsWindowAdisTS(PamhyrWindow): self._results.pollutants_list[i.row()+1] for i in indexes ] - return (f"{self._trad['reach']}: {reach.name} | " + - f"{self._trad['cross_section']}: {pname} | " + - f"Pollutant: {', '.join(self.pollutant_label)} | " + - f"{self._trad['unit_time_s']} : {fts} ({ts} sec)") + return (f"Pollutant: {', '.join(self.pollutant_label)}") def setup_statusbar(self): txt = self._compute_status_label()