Merge branch 'master' into compare_results

src/View/MainWindow.py

@@ -1705,13 +1705,21 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         if dialog.exec_():
             dir_path = dialog.selectedFiles()[0]
             dir_list = os.listdir(dir_path)
+            if "resultats" in dir_list:
+                dir_path = os.path.join(dir_path, "resultats")
+                dir_list = os.listdir(dir_path)
+
             bin_list = list(filter(lambda s: "bin" in s, dir_list))
-            solver_name = dir_path.split("/")[-2]
+            if len(bin_list) < 1:
+                # TODO message
+                return
+            path = os.path.normpath(dir_path)
+            solver_name = path.split(os.sep)[-2]
             solver_results = next(filter(lambda x: x.name == solver_name,
                                          self.conf.solvers))
             solver_results_adists = solver_results.results(
                 self._study,
-                repertory=dir_path[:-10], qlog=None)  # self._output)
+                repertory=dir_path, qlog=None)  # self._output)
             logger.info(f"Select results: {dir_path}")
             if len(bin_list) >= 2 and ("total_sediment.bin" in bin_list):
                 self.open_solver_results_adists(