mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Solver: revamp Rubar parameter interface and export validation
This commit is contained in:
1 parent
33ad91d1a6
commit
2a699f46ca
7 files changed
+966
-110
No files matched your search
+6
-1
@@ -25,6 +25,7 @@ from PyQt5.QtCore import QProcess
|
||||
|
||||
from Scripts.AScript import AScript
|
||||
from Model.Study import Study
|
||||
from View.RunSolver.Translate import RunSolverTranslate
|
||||
|
||||
logger = logging.getLogger()
|
||||
|
||||
@@ -89,12 +90,16 @@ class ScriptRun(AScript):
|
||||
|
||||
# Export and Run
|
||||
logger.info(f"~Export~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
|
||||
solver.export(study, workdir, qlog=self._q)
|
||||
ok = solver.export(study, workdir, qlog=self._q)
|
||||
|
||||
while self._q.qsize() != 0:
|
||||
s = self._q.get()
|
||||
logger.info(s)
|
||||
|
||||
if not ok:
|
||||
logger.warning(RunSolverTranslate()["export_failed"])
|
||||
return
|
||||
|
||||
if command == "run":
|
||||
logger.info(f"~Run~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
|
||||
solver.run(
|
||||
|
||||
Reference in new issue
Block a user