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

Scenario: Fix workdir path for last result opening.

scenarios
Pierre-Antoine 2025-10-27 09:29:33 +01:00
parent 002ebc5928
commit 05e039011a
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Scenario.py
View File

@ -276,7 +276,7 @@ class Scenario(SQLSubModel):
if self.id != 0: if self.id != 0:
srep = os.path.join( srep = os.path.join(
self.parent.workdir(), self.parent.workdir(),
"senario_" + str(self.id) "scenario_" + str(self.id)
) )
return srep return srep

1
src/Solver/Mage.py
View File

@ -1375,6 +1375,7 @@ class Mage8(Mage):
results = super(Mage8, self).results(study, repertory, qlog, name=name) results = super(Mage8, self).results(study, repertory, qlog, name=name)
if results is None: if results is None:
return None return None
if with_gra: if with_gra:
self.read_gra(study, repertory, results, qlog, name=name) self.read_gra(study, repertory, results, qlog, name=name)

4
src/View/MainWindow.py
View File

@ -1511,7 +1511,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
return False return False
def open_solver_results(self, solver, results=None): def open_solver_results(self, solver, results=None):
logger.info(f"{solver} {results}") logger.info(f"Open results for '{solver}' ({results})")
def reading_fn(): def reading_fn():
self._tmp_results = results self._tmp_results = results
@ -1647,6 +1647,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
"_PAMHYR_", "_PAMHYR_",
self._study.name.replace(" ", "_"), self._study.name.replace(" ", "_"),
solver.name.replace(" ", "_"), solver.name.replace(" ", "_"),
self._study.status.scenario.workdir(),
) )
return workdir return workdir
@ -1870,6 +1871,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
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)
logger.info(f"Select results: {dir_path}") logger.info(f"Select results: {dir_path}")
if len(bin_list) >= 2 and ("total_sediment.bin" in bin_list): if len(bin_list) >= 2 and ("total_sediment.bin" in bin_list):
self.open_solver_results_adists( self.open_solver_results_adists(