diff --git a/src/View/Results/Window.py b/src/View/Results/Window.py index 28e44653..ad0150d2 100644 --- a/src/View/Results/Window.py +++ b/src/View/Results/Window.py @@ -114,8 +114,7 @@ class ResultsWindow(PamhyrWindow): self._additional_plot = {} try: - self._timestamps = sorted(list(self._results[self._current_results].get("timestamps"))) - + self.get_timestamps() self.setup_slider() self.setup_table() self.setup_plots() @@ -402,9 +401,6 @@ class ResultsWindow(PamhyrWindow): ) table.scrollTo(index) - self._table["profile"].update(ind) - self._table["raw_data"].update(ind) - def update(self, reach_id=None, profile_id=None, @@ -443,6 +439,8 @@ class ResultsWindow(PamhyrWindow): for plot in self._additional_plot: self._additional_plot[plot].set_result(solver_id) + self.update_table_selection_solver(solver_id) + if timestamp is not None: self.plot_xy.set_timestamp(timestamp) self.plot_ac.set_timestamp(timestamp) @@ -897,37 +895,11 @@ class ResultsWindow(PamhyrWindow): return my_dict - -#class CompareResultsWindow(ResultsWindow): - #_pamhyr_ui = "CompareResults" - #_pamhyr_name = "CompareResults" - - #def _path_file(self, filename): - #return os.path.abspath( - #os.path.join( - #os.path.dirname(__file__), - #"..", "ui", "ressources", filename - #) - #) - - #def __init__(self, study=None, config=None, - #solver=None, results=None, - #parent=None): - #self._solvers[0] = solver - #self._results = results - - #trad = CompareResultsTranslate() - #name = ( - #trad[self._pamhyr_name] + " - " - #+ study.name + " - " - #+ self._solvers[0].name - #) - - #super(CompareResultsWindow, self).__init__( - #study=study, - #config=config, - #solver=solver, - #results=results, - #parent=parent, - #trad=trad - #) + def get_timestamps(self): + if len(self._results) == 1: + self._timestamps = sorted(list(self._results[0].get("timestamps"))) + else: # len(self._results) == 2: + self._timestamps = sorted(list( + self._results[0].get("timestamps").intersection( + self._results[1].get("timestamps")) + ))