diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index 2aeba1063153471be5042c050b78386bb2bae852..dd6b8a521f9b70c43efca5b879bfeba9b989c5c0 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -711,6 +711,8 @@ class AdisTSwc(AdisTS): #print("isma") ###print("iprofiles: ", iprofiles) + print("reading bin files is ok =======") + for i in range(ismax): #print("first i: ", i) reach = ip_to_r(i) @@ -731,6 +733,8 @@ class AdisTSwc(AdisTS): ###print("reach from i: ", reach_tmp) #print("pol view: ", pol_view) #print("results: ", results) + + print("reading bin files is ok =======") results.set("timestamps", set(timestamps_keys)) #print("------------------------set timestamps results meta data: ", set(timestamps_keys)) @@ -741,12 +745,16 @@ class AdisTSwc(AdisTS): ###print(data_tmp["AAA-silt"][1205.7208829578194]["C"][0]) ###print("========================") + print("reading bin files is ok =======") + @timer def results(self, study, repertory, qlog=None, name=None): self._study = study if name is None: name = study.name.replace(" ", "_") + print("adist ts results repertory: ", repertory) + results = super(AdisTSwc, self).results(study, repertory, qlog, name=name) return results diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index 71f2fd1279daa973b00e98b144292f4b98eccbf5..be2e24abe4a86cb553705d7a14af7f4ec3a10abe 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -23,6 +23,7 @@ import logging import subprocess from queue import Queue from functools import reduce +from time import process_time_ns from numpy.core.multiarray import where from platformdirs import user_cache_dir @@ -1562,16 +1563,20 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): if dialog.exec_(): dir_path = dialog.selectedFiles()[0] dir_list = os.listdir(dir_path) + print("dir path:", dir_path) bin_list = list(filter(lambda s: "bin" in s, dir_list)) - dir_sover_name = dir_path.split("/")[-2] - solver_results = next(filter(lambda x: x.name == dir_sover_name, self.conf.solvers)) - print("dir solver name path:", dir_sover_name) + solver_name = dir_path.split("/")[-2] + print("dir solver name path:", solver_name) + solver_results = next(filter(lambda x: x.name == solver_name, self.conf.solvers)) print("solver type:", solver_results._type) + print("dir path bis:", dir_path) + solver_results_adists = solver_results.results(self._study, repertory=dir_path[:-10], qlog=None)#self._output) + print("results adists", solver_results_adists) logger.info(f"Select results: {dir_path}") if len(bin_list) >= 2 and ("total_sediment.bin" in bin_list): self.open_solver_results_adists( - self._last_solver, - results=None, + solver_results, + results=solver_results_adists, ) else: dlg = QDialog(self)