parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Results: Disable simple compare between solvers to solvers/scenarios.

Browse Source
This commit is contained in:
parouby committed 2025-10-28 11:09:48 +01:00
1 parent 188486f33a
commit 5ca763ac8c
2 files changed
+35 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/View/MainWindow.py
+34 -33
View File
@@ -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: