src/Model/Study.py

@@ -541,7 +541,7 @@ class Study(SQLModel):
         empty shell, it's not fully functional. Study object use
         SQLite connection to file, this copy as no valid connection.
 
-        (!) Please use this copy as read only object!
+        /!\ Please use this copy as read only object!
         """
         new = Study(copy=True)
 

src/View/MainWindow.py

@@ -153,8 +153,7 @@ 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_results", "action_menu_compare_scenarios_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",
@@ -301,9 +300,8 @@ 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":
+            "action_menu_compare_scenarios_results": self.compare_results_scenarios,
-            self.compare_results_scenarios,
             "action_menu_open_results_adists": self.open_results_adists,
             # Help
             "action_menu_pamhyr_users_wiki": self.open_doc_user,
@@ -1711,42 +1709,42 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
                 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):
         if self._study is None:
@@ -1854,9 +1852,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         result3 = Results(study=self._study, solver=solver3)
         ts = sorted(
             list(
-                result1.get("timestamps").intersection(
+                result1.get("timestamps")\
-                    result2.get("timestamps")
+                       .intersection(result2.get("timestamps"))
-                )
             )
         )
 

src/View/Results/CompareDialog.py

@@ -32,6 +32,7 @@ _translate = QCoreApplication.translate
 logger = logging.getLogger()
 
 
+
 class CompareSolversWindow(PamhyrDialog):
     _pamhyr_ui = "CompareSolvers"
     _pamhyr_name = "Compare solvers"
@@ -162,7 +163,7 @@ class CompareScenariosWindow(PamhyrDialog):
         scenarios = self._study.scenarios.lst
         scenarios_name = list(
             map(
-                lambda s: s.name, scenarios
+                lambda s : s.name, scenarios
             )
         )
 

src/View/ui/MainWindow.ui

@@ -161,6 +161,7 @@
     </property>
     <addaction name="action_menu_results_last"/>
     <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_open_results_adists"/>
    </widget>
@@ -808,7 +809,7 @@
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Compare results</string>
+    <string>Compare scenarios results</string>
    </property>
   </action>
  </widget>