mirror of https://gitlab.com/pamhyr/pamhyr2
Compare commits
2 Commits
c0d4aced5e
...
f54dc07432
| Author | SHA1 | Date |
|---|---|---|
|
|
f54dc07432 | |
|
|
3bbc55b4be |
|
|
@ -860,6 +860,13 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
elif res == QMessageBox.Cancel:
|
elif res == QMessageBox.Cancel:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def msg_results_warning(self, text="", info=""):
|
||||||
|
self.message_box(
|
||||||
|
window_title=self._trad["Warning"],
|
||||||
|
text=text,
|
||||||
|
informative_text=info
|
||||||
|
)
|
||||||
|
|
||||||
#########################
|
#########################
|
||||||
# SUB WINDOWS MENU LIST #
|
# SUB WINDOWS MENU LIST #
|
||||||
#########################
|
#########################
|
||||||
|
|
@ -1614,10 +1621,16 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
|
|
||||||
def diff_results(self, solver1, solver2):
|
def diff_results(self, solver1, solver2):
|
||||||
if solver1 is None:
|
if solver1 is None:
|
||||||
# TODO message
|
logger.warning(f"diff_results: solver1 is None")
|
||||||
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"]
|
||||||
|
)
|
||||||
return None
|
return None
|
||||||
if solver2 is None:
|
if solver2 is None:
|
||||||
# TODO message
|
logger.warning(f"diff_results: solver2 is None")
|
||||||
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"]
|
||||||
|
)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
solver3 = GenericSolver(solver1.name+" - "+solver2.name)
|
solver3 = GenericSolver(solver1.name+" - "+solver2.name)
|
||||||
|
|
@ -1631,6 +1644,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
|
|
||||||
if result1 is None:
|
if result1 is None:
|
||||||
logger.warning(f"diff_results: result1 is None")
|
logger.warning(f"diff_results: result1 is None")
|
||||||
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"]
|
||||||
|
)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
result2 = solver2.results(
|
result2 = solver2.results(
|
||||||
|
|
@ -1640,14 +1656,23 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
|
|
||||||
if result2 is None:
|
if result2 is None:
|
||||||
logger.warning(f"diff_results: result2 is None")
|
logger.warning(f"diff_results: result2 is None")
|
||||||
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"]
|
||||||
|
)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
if result2.get("nb_reach") != result1.get("nb_reach"):
|
if result2.get("nb_reach") != result1.get("nb_reach"):
|
||||||
logger.warning(f"diff_results: nb_reach missmatch")
|
logger.warning(f"diff_results: nb_reach missmatch")
|
||||||
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"]
|
||||||
|
)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
if result2.get("nb_profile") != result1.get("nb_profile"):
|
if result2.get("nb_profile") != result1.get("nb_profile"):
|
||||||
logger.warning(f"diff_results: nb_profile missmatch")
|
logger.warning(f"diff_results: nb_profile missmatch")
|
||||||
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"]
|
||||||
|
)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
result3 = Results(self._study, solver3)
|
result3 = Results(self._study, solver3)
|
||||||
|
|
@ -1751,12 +1776,22 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
|
|
||||||
bin_list = list(filter(lambda s: "bin" in s, dir_list))
|
bin_list = list(filter(lambda s: "bin" in s, dir_list))
|
||||||
if len(bin_list) < 1:
|
if len(bin_list) < 1:
|
||||||
# TODO message
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"],
|
||||||
|
text=self._trad["mb_results_bin_not_found"]
|
||||||
|
)
|
||||||
return
|
return
|
||||||
path = os.path.normpath(dir_path)
|
path = os.path.normpath(dir_path)
|
||||||
solver_name = path.split(os.sep)[-2]
|
solver_name = path.split(os.sep)[-2]
|
||||||
solver_results = next(filter(lambda x: x.name == solver_name,
|
solver_results = next(filter(lambda x: x.name == solver_name,
|
||||||
self.conf.solvers), None)
|
self.conf.solvers), None)
|
||||||
|
if solver_results is None:
|
||||||
|
self.msg_results_warning(
|
||||||
|
info=self._trad["mb_results_not_found"],
|
||||||
|
text=self._trad["mb_results_folder_not_found"]
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
solver_results_adists = solver_results.results(
|
solver_results_adists = solver_results.results(
|
||||||
self._study,
|
self._study,
|
||||||
repertory=dir_path, qlog=None) # self._output)
|
repertory=dir_path, qlog=None) # self._output)
|
||||||
|
|
@ -1767,13 +1802,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
results=solver_results_adists,
|
results=solver_results_adists,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
dlg = QDialog(self)
|
self.msg_results_warning(
|
||||||
dlg.setWindowTitle("AdisTS Results")
|
info=self._trad["mb_results_not_found"],
|
||||||
layout = QVBoxLayout()
|
text=self._trad["mb_results_total_bin_not_found"]
|
||||||
message = QLabel("AdisTS Results not found")
|
)
|
||||||
layout.addWidget(message)
|
|
||||||
dlg.setLayout(layout)
|
|
||||||
dlg.exec()
|
|
||||||
|
|
||||||
#################
|
#################
|
||||||
# DOCUMENTATION #
|
# DOCUMENTATION #
|
||||||
|
|
@ -1817,7 +1849,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
|
|
||||||
def open_doc_user(self):
|
def open_doc_user(self):
|
||||||
self.open_doc(
|
self.open_doc(
|
||||||
"https://gitlab.irstea.fr/theophile.terraz/pamhyr/-/wikis/home"
|
"https://gitlab.com/pamhyr/pamhyr2/-/wikis/home"
|
||||||
)
|
)
|
||||||
|
|
||||||
def open_doc_dev(self, ext="pdf"):
|
def open_doc_dev(self, ext="pdf"):
|
||||||
|
|
|
||||||
|
|
@ -204,3 +204,16 @@ class MainTranslate(UnitTranslate):
|
||||||
self._dict["Cancel"] = _translate("MainWindow", "Cancel")
|
self._dict["Cancel"] = _translate("MainWindow", "Cancel")
|
||||||
self._dict["Save"] = _translate("MainWindow", "Save")
|
self._dict["Save"] = _translate("MainWindow", "Save")
|
||||||
self._dict["Close"] = _translate("MainWindow", "Close")
|
self._dict["Close"] = _translate("MainWindow", "Close")
|
||||||
|
|
||||||
|
self._dict["mb_results_not_found"] = _translate(
|
||||||
|
"MainWindow", "Results can not be loaded"
|
||||||
|
)
|
||||||
|
self._dict["mb_results_folder_not_found"] = _translate(
|
||||||
|
"MainWindow", "Results folder does not correspond to a Pamhyr2 solver"
|
||||||
|
)
|
||||||
|
self._dict["mb_results_bin_not_found"] = _translate(
|
||||||
|
"MainWindow", "Results binary files not found"
|
||||||
|
)
|
||||||
|
self._dict["mb_results_total_bin_not_found"] = _translate(
|
||||||
|
"MainWindow", "total_sediment.bin file not found"
|
||||||
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue