mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
quick fix for AdisTS
This commit is contained in:
1 parent
c1905aa7e1
commit
c2a8f38ef5
4 files changed
+78
-6
No files matched your search
@@ -1615,8 +1615,11 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||
os.path.dirname(results),
|
||||
name=name
|
||||
)
|
||||
|
||||
dlg = ReadingResultsDialog(reading_fn=reading_fn, parent=self)
|
||||
dlg = WaitingDialog(
|
||||
payload_fn=reading_fn,
|
||||
title="waiting_result",
|
||||
parent=self
|
||||
)
|
||||
dlg.exec_()
|
||||
results = self._tmp_results
|
||||
|
||||
|
||||
@@ -45,6 +45,7 @@ from PyQt5.QtWidgets import (
|
||||
|
||||
from View.RunSolver.Log.Window import SolverLogFileWindow
|
||||
from View.Results.ReadingResultsDialog import ReadingResultsDialog
|
||||
from View.WaitingDialog import WaitingDialog
|
||||
|
||||
try:
|
||||
from signal import SIGTERM, SIGSTOP, SIGCONT
|
||||
@@ -82,7 +83,8 @@ class SelectSolverWindowAdisTS(PamhyrDialog):
|
||||
# solvers = self._config.solvers
|
||||
# solvers mage
|
||||
solvers = list(filter(
|
||||
lambda x: "mage" not in x._type, self._config.solvers
|
||||
lambda x: "mage" not in x._type and "rubar" not in x._type,
|
||||
self._config.solvers
|
||||
))
|
||||
solvers_name = list(
|
||||
map(
|
||||
@@ -425,7 +427,9 @@ class SolverLogWindowAdisTS(PamhyrWindow):
|
||||
self._study, dir_path, qlog=self._output
|
||||
)
|
||||
|
||||
dlg = ReadingResultsDialog(reading_fn=reading_fn, parent=self)
|
||||
dlg = WaitingDialog(payload_fn=reading_fn,
|
||||
title="waiting_result",
|
||||
parent=self)
|
||||
dlg.exec_()
|
||||
|
||||
self._parent.set_results(self._solver, self._results)
|
||||
|
||||
Reference in new issue
Block a user