parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

scenarios
Pierre-Antoine 2025-10-28 11:09:03 +01:00
parent 188486f33a
commit 5ca763ac8c
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/View/MainWindow.py
View File

@ -153,7 +153,8 @@ define_model_action = [
"action_menu_edit_reach_sediment_layers", "action_menu_edit_reservoirs", "action_menu_edit_reach_sediment_layers", "action_menu_edit_reservoirs",
"action_menu_edit_hydraulic_structures", "action_menu_additional_file", "action_menu_edit_hydraulic_structures", "action_menu_additional_file",
"action_menu_results_last", "action_menu_open_results_from_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_boundary_conditions_sediment",
"action_menu_rep_additional_lines", "action_menu_output_rk", "action_menu_rep_additional_lines", "action_menu_output_rk",
"action_menu_run_adists", "action_menu_pollutants", "action_menu_run_adists", "action_menu_pollutants",
@ -300,7 +301,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
"action_menu_close": self.close_model, "action_menu_close": self.close_model,
"action_menu_results_last": self.open_last_results, "action_menu_results_last": self.open_last_results,
"action_menu_open_results_from_file": self.open_results_from_file, "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_compare_scenarios_results": self.compare_results_scenarios,
"action_menu_open_results_adists": self.open_results_adists, "action_menu_open_results_adists": self.open_results_adists,
# Help # Help
@ -1709,42 +1710,42 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
results=file_name[0] results=file_name[0]
) )
def compare_results(self): # def compare_results(self):
if self._study is None: # if self._study is None:
return # return
run = CompareSolversWindow( # run = CompareSolversWindow(
study=self._study, # study=self._study,
config=self.conf, # config=self.conf,
parent=self # parent=self
) # )
if not run.exec(): # if not run.exec():
return # return
results = self.diff_results( # results = self.diff_results(
run.solver1, run.solver2 # run.solver1, run.solver2
) # )
# At least one result not available # # At least one result not available
if results is None: # if results is None:
return # return
# Windows already opened # # Windows already opened
if self.sub_window_exists( # if self.sub_window_exists(
CompareSolversWindow, # CompareSolversWindow,
data=[self._study, None] + # data=[self._study, None] +
[r._solver for r in results] + # [r._solver for r in results] +
[r._repertory for r in results] + # [r._repertory for r in results] +
[r._name for r in results] # [r._name for r in results]
): # ):
return # return
res = ResultsWindow( # res = ResultsWindow(
study=self._study, # study=self._study,
results=results, # results=results,
parent=self # parent=self
) # )
res.show() # res.show()
def compare_results_scenarios(self): def compare_results_scenarios(self):
if self._study is None: if self._study is None:

3
src/View/ui/MainWindow.ui
View File

@ -161,7 +161,6 @@
</property> </property>
<addaction name="action_menu_results_last"/> <addaction name="action_menu_results_last"/>
<addaction name="action_menu_open_results_from_file"/> <addaction name="action_menu_open_results_from_file"/>
<addaction name="action_menu_compare_results"/>
<addaction name="action_menu_compare_scenarios_results"/> <addaction name="action_menu_compare_scenarios_results"/>
<addaction name="action_menu_open_results_adists"/> <addaction name="action_menu_open_results_adists"/>
</widget> </widget>
@ -809,7 +808,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Compare scenarios results</string> <string>Compare results</string>
</property> </property>
</action> </action>
</widget> </widget>