From 5ca763ac8c78b1c6cdf231a0514ad426af9c16d2 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 28 Oct 2025 11:09:03 +0100 Subject: [PATCH] Results: Disable simple compare between solvers to solvers/scenarios. --- src/View/MainWindow.py | 67 ++++++++++++++++++++------------------- src/View/ui/MainWindow.ui | 3 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index ae401e89..c7d65b83 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -153,7 +153,8 @@ define_model_action = [ "action_menu_edit_reach_sediment_layers", "action_menu_edit_reservoirs", "action_menu_edit_hydraulic_structures", "action_menu_additional_file", "action_menu_results_last", "action_menu_open_results_from_file", - "action_menu_compare_results", "action_menu_compare_scenarios_results", + # "action_menu_compare_results", + "action_menu_compare_scenarios_results", "action_menu_boundary_conditions_sediment", "action_menu_rep_additional_lines", "action_menu_output_rk", "action_menu_run_adists", "action_menu_pollutants", @@ -300,7 +301,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): "action_menu_close": self.close_model, "action_menu_results_last": self.open_last_results, "action_menu_open_results_from_file": self.open_results_from_file, - "action_menu_compare_results": self.compare_results, + # "action_menu_compare_results": self.compare_results, "action_menu_compare_scenarios_results": self.compare_results_scenarios, "action_menu_open_results_adists": self.open_results_adists, # Help @@ -1709,42 +1710,42 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): results=file_name[0] ) - def compare_results(self): - if self._study is None: - return + # def compare_results(self): + # if self._study is None: + # return - run = CompareSolversWindow( - study=self._study, - config=self.conf, - parent=self - ) - if not run.exec(): - return + # run = CompareSolversWindow( + # study=self._study, + # config=self.conf, + # parent=self + # ) + # if not run.exec(): + # return - results = self.diff_results( - run.solver1, run.solver2 - ) + # results = self.diff_results( + # run.solver1, run.solver2 + # ) - # At least one result not available - if results is None: - return + # # At least one result not available + # if results is None: + # return - # Windows already opened - if self.sub_window_exists( - CompareSolversWindow, - data=[self._study, None] + - [r._solver for r in results] + - [r._repertory for r in results] + - [r._name for r in results] - ): - return + # # Windows already opened + # if self.sub_window_exists( + # CompareSolversWindow, + # data=[self._study, None] + + # [r._solver for r in results] + + # [r._repertory for r in results] + + # [r._name for r in results] + # ): + # return - res = ResultsWindow( - study=self._study, - results=results, - parent=self - ) - res.show() + # res = ResultsWindow( + # study=self._study, + # results=results, + # parent=self + # ) + # res.show() def compare_results_scenarios(self): if self._study is None: diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index 9f1f3b79..96661c4f 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -161,7 +161,6 @@ - @@ -809,7 +808,7 @@ false - Compare scenarios results + Compare results