diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index 56f2fa4e7389f55edffa2a79969c33c1b4ee9d5f..e03a69761a0a41e07a27733c0086d6ba5e9c8274 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -623,6 +623,9 @@ class AdisTSwc(AdisTS): files_bin_names = [el.split("/")[-1] for el in glob.glob(repertory_results+"/*.bin")] + files_bin_names.insert(0, files_bin_names.pop( + files_bin_names.index("total_sediment.bin")) + ) print("files names resultats: ", files_bin_names) ifilename = os.path.join(repertory_results, files_bin_names[0]) diff --git a/src/View/Results/WindowAdisTS.py b/src/View/Results/WindowAdisTS.py index 66dd3334f4d5e7adae00475da6ef609c29f2a483..c7d9ab8bfadf668e94ed3bac56f632ec51f2ed7a 100644 --- a/src/View/Results/WindowAdisTS.py +++ b/src/View/Results/WindowAdisTS.py @@ -78,6 +78,7 @@ class ResultsWindowAdisTS(PamhyrWindow): parent=None): self._solver = solver self._results = results + self.pollutant_label = ["None"] pollutants_headers = self._results.pollutants_list.copy() @@ -374,14 +375,13 @@ class ResultsWindowAdisTS(PamhyrWindow): # Pollutant table = self.find(QTableView, f"tableView_pollutants") indexes = table.selectedIndexes() - if len(indexes) == 0: - pollutant = self._results.pollutants_list[0] - else: - pollutant = self._results.pollutants_list[indexes[0].row()] + if len(indexes) != 0: + self.pollutant_label = [self._results.pollutants_list[i.row()+1] for i in indexes] return (f"Reach: {reach.name} | " + f"Profile: {pname} | " + - f"Pollutant: {pollutant}") + f"Pollutant: {', '.join(self.pollutant_label)} | " + + f"{self._trad['unit_time_s']} : {fts} ({ts} sec)") def setup_statusbar(self): txt = self._compute_status_label()